Modify resourceCache/DataCache file

correct building errors
modify the function name from requestTimer to postTimer

Change-Id: I7ed1fb6656291ea1b3d863b27fae53b4a7ebf83d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1632
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript
index e1677c0..f44943b 100644 (file)
--- a/service/resource-manipulation/SConscript
+++ b/service/resource-manipulation/SConscript
@@ -26,11 +26,11 @@ import platform
 Import('env')
 
 SConscript('modules/common/SConscript')
-#SConscript('modules/resourceBroker/SConscript')
-#SConscript('modules/resourceCache/SConscript')
+SConscript('modules/resourceBroker/SConscript')
+SConscript('modules/resourceCache/SConscript')
 SConscript('modules/serverBuilder/SConscript')
 SConscript('modules/resourceContainer/SConscript')
-#SConscript('sdk/SConscript')
+SConscript('sdk/SConscript')
 
 ######################################################################
 #building Resource client

diff --git a/service/resource-manipulation/modules/resourceCache/include/DataCache.h b/service/resource-manipulation/modules/resourceCache/include/DataCache.h
index 8ca0824..4030727 100755 (executable)
--- a/service/resource-manipulation/modules/resourceCache/include/DataCache.h
+++ b/service/resource-manipulation/modules/resourceCache/include/DataCache.h
@@ -35,6 +35,10 @@ namespace OIC
         class DataCache
         {
         public:
+            using TimerID = unsigned int;
+            using TimerCB = std::function<void*(TimerID)>;
+
+        public:
             DataCache();
             ~DataCache();
 

diff --git a/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp b/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
index 4356c26..eb68466 100755 (executable)
--- a/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
+++ b/service/resource-manipulation/modules/resourceCache/src/DataCache.cpp
@@ -58,6 +58,8 @@ namespace OIC
         DataCache::~DataCache()
         {
             state = CACHE_STATE::DESTROYED;
+
+            sResource->cancelObserve();
             if(subscriberList != nullptr)
             {
                 subscriberList->clear();
@@ -74,7 +76,7 @@ namespace OIC
             {
                 sResource->requestObserve(pObserveCB);
             }
-            networkTimeOutHandle = networkTimer.requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+            networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
         }
 
         CacheID DataCache::addSubscriber(CacheCB func, REPORT_FREQUENCY rf, long repeatTime)
@@ -155,7 +157,7 @@ namespace OIC
             }
 
             networkTimer.cancelTimer(networkTimeOutHandle);
-            networkTimeOutHandle = networkTimer.requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+            networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
 
             notifyObservers(_rep.getAttributes());
         }
@@ -176,9 +178,9 @@ namespace OIC
             if(!sResource->isObservable())
             {
                 networkTimer.cancelTimer(networkTimeOutHandle);
-                networkTimeOutHandle = networkTimer.requestTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+                networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
 
-                pollingHandle = pollingTimer.requestTimer(DEFAULT_REPORT_TIME, pPollingCB);
+                pollingHandle = pollingTimer.postTimer(DEFAULT_REPORT_TIME, pPollingCB);
             }
 
             notifyObservers(_rep.getAttributes());