Add Resource Cache feature that checks validation of the cached datas and if they...

Modify Get & Observe Callback function to check expired time.

Change-Id: I7282ad485cebbf8f5c66eac10d24f8aaeac4be83
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1450
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h b/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h
index d2228914e39851c178f2b081be119f4a62a3612f..50eb43eeccf7ac423577a930457b821876ed4718 100755 (executable)
--- a/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h
+++ b/service/resource-manipulation/modules/resourceCache/include/CacheTypes.h
@@ -34,6 +34,7 @@
 
 #define CACHE_TAG  PCF("CACHE")
 #define DEFAULT_REPORT_TIME 30
+#define DEFAULT_EXPIRED_TIME 15l
 
 using namespace OIC::Service;
 

diff --git a/service/resource-manipulation/modules/resourceCache/include/DataCache.h b/service/resource-manipulation/modules/resourceCache/include/DataCache.h
index 8029b245333b30c5309ea497849190ebd5bbadd3..1c53b31bd294ddf9be12aeed5e315c36e26d1723 100755 (executable)
--- a/service/resource-manipulation/modules/resourceCache/include/DataCache.h
+++ b/service/resource-manipulation/modules/resourceCache/include/DataCache.h
@@ -68,6 +68,7 @@ private:
     std::unique_ptr<SubscriberInfo> subscriberList;
 
     PrimitiveTimer *timerInstance;
+    TimerID expiredTimerId;
 
     // for requestCB from base
     void onObserve(const HeaderOptions& _hos,

diff --git a/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp b/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
index c7fcaced2834f723e89eacaf6d26a0d503d61a2b..61f6dd86d2532d5514cac245bebadaedea3b6c2b 100755 (executable)
--- a/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
+++ b/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
@@ -57,6 +57,7 @@ DataCache::DataCache(
     if(pResource->isObservable())
     {
         pResource->requestObserve(pObserveCB);
+        expiredTimerId = timerInstance->requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
     }
     else
     {
@@ -182,10 +183,20 @@ void DataCache::onGet(const HeaderOptions& _hos,
     {
         state = CACHE_STATE::READY;
         attributes = _rep.getAttributes();
+        if(sResource->isObservable())
+        {
+            timerInstance->cancelTimer(expiredTimerId);
+            expiredTimerId = timerInstance->requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+        }
     }
     else
     {
         attributes = _rep.getAttributes();
+        if(sResource->isObservable())
+        {
+            timerInstance->cancelTimer(expiredTimerId);
+            expiredTimerId = timerInstance->requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+        }
 
         ResourceAttributes retAtt = attributes;
         for(auto & i : * subscriberList)
@@ -206,5 +217,10 @@ CACHE_STATE DataCache::getCacheState() const
 void *DataCache::onTimer(const unsigned int timerID)
 {
     sResource->requestGet(pGetCB);
-    TimerID timerId = timerInstance->requestTimer(5l, pTimerCB);
+    if(sResource->isObservable())
+    {
+        expiredTimerId = timerInstance->requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+    }
+    else
+        TimerID timerId = timerInstance->requestTimer(5l, pTimerCB);
 }
\ No newline at end of file