From 569d9462a08fd5d8b4cb0574c50e01bb31d97179 Mon Sep 17 00:00:00 2001 From: "doil.kwon" Date: Fri, 3 Jul 2015 17:21:23 +0900 Subject: [PATCH] Applied to "expiryTimer" for "ResourceBroker" - Header's name is changed(primitiveTimer->expiryTimer) - Added contents about expiryTimer in SConscript - Modified variable's name about ExpiryTimer class - Changed "relative path" to "absolute path" about included path Change-Id: I4f5b3c125a7450f332d333f761c4010048ff7838 Signed-off-by: doil.kwon Reviewed-on: https://gerrit.iotivity.org/gerrit/1505 Tested-by: jenkins-iotivity Reviewed-by: JungYong KIM Reviewed-by: Uze Choi --- service/resource-manipulation/SConscript | 4 ---- .../resource-manipulation/modules/resourceBroker/SConscript | 8 +++----- .../modules/resourceBroker/include/ResourcePresence.h | 4 ++-- .../modules/resourceBroker/src/ResourcePresence.cpp | 10 +++++----- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/service/resource-manipulation/SConscript b/service/resource-manipulation/SConscript index 8f13c5e..e1677c0 100644 --- a/service/resource-manipulation/SConscript +++ b/service/resource-manipulation/SConscript @@ -83,7 +83,3 @@ resourceClient_env.InstallTarget(ResourceClientsdk , 'libResourceClient') #Go to build sample apps SConscript('examples/SConscript') - - - - diff --git a/service/resource-manipulation/modules/resourceBroker/SConscript b/service/resource-manipulation/modules/resourceBroker/SConscript index ce90192..6107e36 100755 --- a/service/resource-manipulation/modules/resourceBroker/SConscript +++ b/service/resource-manipulation/modules/resourceBroker/SConscript @@ -43,9 +43,9 @@ target_os = env.get('TARGET_OS') ###################################################################### resourcebroker_env.AppendUnique(CPPPATH = ['include']) resourcebroker_env.AppendUnique(CPPPATH = ['../common/primitiveResource/include']) -resourcebroker_env.AppendUnique(CPPPATH = ['../common/primitiveTimer/include']) +resourcebroker_env.AppendUnique(CPPPATH = ['../common/expiryTimer/include']) resourcebroker_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -resourcebroker_env.PrependUnique(LIBS = ['service_common', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) +resourcebroker_env.PrependUnique(LIBS = ['service_common', 'ExpiryTimer', 'oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'libcoap']) if target_os not in ['windows', 'winrt']: @@ -62,9 +62,7 @@ resourcebroker_src = [ BROKER_SRC_DIR + 'DeviceAssociation.cpp', BROKER_SRC_DIR + 'DevicePresence.cpp', BROKER_SRC_DIR + 'ResourcePresence.cpp', - BROKER_SRC_DIR + 'ResourceBroker.cpp', - BROKER_SRC_DIR + '../../common/primitiveTimer/src/PrimitiveTimer.cpp', - BROKER_SRC_DIR + '../../common/primitiveTimer/src/PrimitiveTimer_Impl.cpp' + BROKER_SRC_DIR + 'ResourceBroker.cpp' ] diff --git a/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h b/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h index 81cbf85..f3e21be 100755 --- a/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h +++ b/service/resource-manipulation/modules/resourceBroker/include/ResourcePresence.h @@ -29,7 +29,7 @@ #include #include "BrokerTypes.h" -#include "PrimitiveTimer.h" +#include "ExpiryTimer.h" namespace OIC { @@ -58,7 +58,7 @@ namespace OIC private: std::unique_ptr> requesterList; PrimitiveResourcePtr primitiveResource; - PrimitiveTimer primitiveTimer; + ExpiryTimer expiryTimer; BROKER_STATE state; BROKER_MODE mode; diff --git a/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp b/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp index 4f30037..a64d5ee 100755 --- a/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp +++ b/service/resource-manipulation/modules/resourceBroker/src/ResourcePresence.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "../include/ResourcePresence.h" +#include "ResourcePresence.h" #include #include @@ -61,7 +61,7 @@ namespace OIC = std::unique_ptr> (new std::list); - timeoutHandle = primitiveTimer.requestTimer(SAFE_TIME, pTimeoutCB); + timeoutHandle = expiryTimer.requestTimer(SAFE_TIME, pTimeoutCB); primitiveResource->requestGet(pGetCB); @@ -200,7 +200,7 @@ namespace OIC void * ResourcePresence::pollingCB(unsigned int msg) { this->requestResourceState(); - timeoutHandle = primitiveTimer.requestTimer(SAFE_TIME,pTimeoutCB); + timeoutHandle = expiryTimer.requestTimer(SAFE_TIME,pTimeoutCB); return NULL; } @@ -224,14 +224,14 @@ namespace OIC if(isWithinTime) { - primitiveTimer.cancelTimer(timeoutHandle); + expiryTimer.cancelTimer(timeoutHandle); isWithinTime = true; } if(mode == BROKER_MODE::NON_PRESENCE_MODE) { // TODO set timer & request get - primitiveTimer.requestTimer(SAFE_TIME,pPollingCB); + expiryTimer.requestTimer(SAFE_TIME,pPollingCB); } } -- 2.7.4