Revert "[CONPRO-1337] Disabled Presence Feature"

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / resourceBroker / src / DevicePresence.cpp

diff --git a/service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp b/service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp
index 629ef14..7ebdf3f 100644 (file)
--- a/service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp
+++ b/service/resource-encapsulation/src/resourceBroker/src/DevicePresence.cpp
@@ -27,7 +27,7 @@ namespace OIC
     {
         DevicePresence::DevicePresence()
         {
-            state = DEVICE_STATE::REQUESTED;
+            setDeviceState(DEVICE_STATE::REQUESTED);
 
             presenceTimerHandle = 0;
             isRunningTimeOut = false;
@@ -41,59 +41,72 @@ namespace OIC
         {
             if(presenceSubscriber.isSubscribing())
             {
-                OC_LOG_V(DEBUG,BROKER_TAG,"unsubscribed presence.");
-                presenceSubscriber.unsubscribe();
+                OIC_LOG_V(DEBUG,BROKER_TAG,"unsubscribed presence.");
+                try
+                {
+                    presenceSubscriber.unsubscribe();
+                } catch (std::exception & e)
+                {
+                    OIC_LOG_V(DEBUG,BROKER_TAG,"unsubscribed presence : %s", e.what());
+                }
             }
             resourcePresenceList.clear();
-            OC_LOG_V(DEBUG,BROKER_TAG,"destroy Timer.");
+            OIC_LOG_V(DEBUG,BROKER_TAG,"destroy Timer.");
         }
 
         void DevicePresence::initializeDevicePresence(PrimitiveResourcePtr pResource)
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "initializeDevicePresence()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "initializeDevicePresence()");
             address = pResource->getHost();
 
-            OC_LOG_V(DEBUG, BROKER_TAG, "%s",address.c_str());
+            OIC_LOG_V(DEBUG, BROKER_TAG, "%s",address.c_str());
 
             try
             {
-                OC_LOG_V(DEBUG, BROKER_TAG, "subscribe Presence");
+                OIC_LOG_V(DEBUG, BROKER_TAG, "subscribe Presence");
                 presenceSubscriber
                 = PresenceSubscriber(address, BROKER_TRANSPORT, pSubscribeRequestCB);
-            } catch(PlatformException &e)
+            } catch(RCSPlatformException &e)
             {
-                OC_LOG_V(DEBUG, BROKER_TAG,
+                OIC_LOG_V(DEBUG, BROKER_TAG,
                         "exception in subscribe Presence %s", e.getReason().c_str());
                 throw;
             }
             presenceTimerHandle
             = presenceTimer.post(BROKER_DEVICE_PRESENCE_TIMEROUT, pTimeoutCB);
         }
-        DEVICE_STATE DevicePresence::getDeviceState() const
+
+        DEVICE_STATE DevicePresence::getDeviceState() const noexcept
         {
-            return state;
+            return static_cast< DEVICE_STATE >(state.load());
         }
+
+        void DevicePresence::setDeviceState(DEVICE_STATE newState)
+        {
+            state = static_cast< int >(newState);
+        }
+
         const std::string DevicePresence::getAddress() const
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "getAddress()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "getAddress()");
             return address;
         }
 
         void DevicePresence::addPresenceResource(ResourcePresence * rPresence)
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "addPresenceResource()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "addPresenceResource()");
             resourcePresenceList.push_back(rPresence);
         }
 
         void DevicePresence::removePresenceResource(ResourcePresence * rPresence)
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "removePresenceResource()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "removePresenceResource()");
             resourcePresenceList.remove(rPresence);
         }
 
         void DevicePresence::changeAllPresenceMode(BROKER_MODE mode)
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "changeAllPresenceMode()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "changeAllPresenceMode()");
             if(!resourcePresenceList.empty())
             {
                 for(auto it : resourcePresenceList)
@@ -105,16 +118,19 @@ namespace OIC
 
         bool DevicePresence::isEmptyResourcePresence() const
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "isEmptyResourcePresence()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "isEmptyResourcePresence()");
             return resourcePresenceList.empty();
         }
 
         void DevicePresence::subscribeCB(OCStackResult ret,
                 const unsigned int seq, const std::string & hostAddress)
         {
-            OC_LOG_V(DEBUG, BROKER_TAG, "subscribeCB()");
-            OC_LOG_V(DEBUG, BROKER_TAG, "Received presence CB from: %s",hostAddress.c_str());
-            OC_LOG_V(DEBUG, BROKER_TAG, "In subscribeCB: %d",ret);
+            OC_UNUSED(seq);
+            OC_UNUSED(hostAddress);
+
+            OIC_LOG_V(DEBUG, BROKER_TAG, "subscribeCB()");
+            OIC_LOG_V(DEBUG, BROKER_TAG, "Received presence CB from: %s",hostAddress.c_str());
+            OIC_LOG_V(DEBUG, BROKER_TAG, "In subscribeCB: %d",ret);
 
             if(isRunningTimeOut)
             {
@@ -129,10 +145,10 @@ namespace OIC
                 case OC_STACK_RESOURCE_CREATED:
                 case OC_STACK_CONTINUE:
                 {
-                    OC_LOG_V(DEBUG, BROKER_TAG, "SEQ# %d",seq);
-                    state = DEVICE_STATE::ALIVE;
-                    OC_LOG_V(DEBUG, BROKER_TAG, "device state : %d",
-                            (int)(state.load(boost::memory_order_consume)));
+                    OIC_LOG_V(DEBUG, BROKER_TAG, "SEQ# %d",seq);
+                    setDeviceState(DEVICE_STATE::ALIVE);
+                    OIC_LOG_V(DEBUG, BROKER_TAG, "device state : %d",
+                            (int)getDeviceState());
                     changeAllPresenceMode(BROKER_MODE::DEVICE_PRESENCE_MODE);
                     presenceTimerHandle
                     = presenceTimer.post(BROKER_DEVICE_PRESENCE_TIMEROUT, pTimeoutCB);
@@ -146,14 +162,14 @@ namespace OIC
                 case OC_STACK_PRESENCE_TIMEOUT:
                 case OC_STACK_PRESENCE_DO_NOT_HANDLE:
                 {
-                    state = DEVICE_STATE::LOST_SIGNAL;
+                    setDeviceState(DEVICE_STATE::LOST_SIGNAL);
                     changeAllPresenceMode(BROKER_MODE::NON_PRESENCE_MODE);
                     break;
                 }
                 default:
                 {
-                    OC_LOG_V(DEBUG, BROKER_TAG, "Presence Lost Signal because unknown type");
-                    state = DEVICE_STATE::LOST_SIGNAL;
+                    OIC_LOG_V(DEBUG, BROKER_TAG, "Presence Lost Signal because unknown type");
+                    setDeviceState(DEVICE_STATE::LOST_SIGNAL);
                     changeAllPresenceMode(BROKER_MODE::NON_PRESENCE_MODE);
                     break;
                 }
@@ -162,13 +178,13 @@ namespace OIC
 
         void DevicePresence::timeOutCB(TimerID /*id*/)
         {
-            OC_LOG_V(DEBUG,BROKER_TAG,"timeOutCB()");
+            OIC_LOG_V(DEBUG,BROKER_TAG,"timeOutCB()");
             std::unique_lock<std::mutex> lock(timeoutMutex);
             isRunningTimeOut = true;
 
-            OC_LOG_V(DEBUG, BROKER_TAG,
+            OIC_LOG_V(DEBUG, BROKER_TAG,
                     "Timeout execution. will be discard after receiving cb message");
-            state = DEVICE_STATE::LOST_SIGNAL;
+            setDeviceState(DEVICE_STATE::LOST_SIGNAL);
             changeAllPresenceMode(BROKER_MODE::NON_PRESENCE_MODE);
 
             isRunningTimeOut = false;