From: Jihun Ha <jihun.ha@samsung.com>
Date: Wed, 15 Apr 2015 01:56:59 +0000 (+0900)
Subject: Fix an unexpected halt problem in con-client app.
X-Git-Tag: 1.2.0+RC1~1838
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdb025f1fc1045b88da31adb3f7f284c97baf1a1;p=platform%2Fupstream%2Fiotivity.git

Fix an unexpected halt problem in con-client app.

A problem in con-client app on receiving GET and PUT response was reported.
That problem was about a synchronization of global variable where two
different threads need to read/write the variable simultaneously.
With this commit, it has been resolved by using mutex.

Ref: IOT-461

Change-Id: If5ca53d937d6a8097c1f3599b27157963ca3d5cd
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/718
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/things-manager/sampleapp/linux/configuration/con-client.cpp b/service/things-manager/sampleapp/linux/configuration/con-client.cpp
index 5099ae1..7b43a3f 100755
--- a/service/things-manager/sampleapp/linux/configuration/con-client.cpp
+++ b/service/things-manager/sampleapp/linux/configuration/con-client.cpp
@@ -34,6 +34,7 @@ using namespace OIC;
 
 int g_Steps = 0;
 int isWaiting = 0; //0: none to wait, 1: wait for the response of "getConfigurationValue"
+pthread_mutex_t mutex_lock;
 
 const int SUCCESS_RESPONSE = 0;
 
@@ -67,12 +68,16 @@ typedef std::string ConfigurationValue;
 void timeCheck(int timeSec)
 {
     sleep(timeSec);
+    pthread_mutex_lock(&mutex_lock);
     isWaiting = 0;
+    pthread_mutex_unlock(&mutex_lock);
 }
 
 void onReboot(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode)
 {
+    pthread_mutex_lock(&mutex_lock);
     isWaiting = 0;
+    pthread_mutex_unlock(&mutex_lock);
 
     if (eCode != SUCCESS_RESPONSE)
     {
@@ -86,7 +91,9 @@ void onReboot(const HeaderOptions& headerOptions, const OCRepresentation& rep, c
 void onFactoryReset(const HeaderOptions& headerOptions, const OCRepresentation& rep,
         const int eCode)
 {
+    pthread_mutex_lock(&mutex_lock);
     isWaiting = 0;
+    pthread_mutex_unlock(&mutex_lock);
 
     if (eCode != SUCCESS_RESPONSE)
     {
@@ -99,7 +106,9 @@ void onFactoryReset(const HeaderOptions& headerOptions, const OCRepresentation&
 
 void onUpdate(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode)
 {
+    pthread_mutex_lock(&mutex_lock);
     isWaiting = 0;
+    pthread_mutex_unlock(&mutex_lock);
 
     if (eCode != SUCCESS_RESPONSE)
     {
@@ -120,7 +129,9 @@ void onUpdate(const HeaderOptions& headerOptions, const OCRepresentation& rep, c
 
 void onGet(const HeaderOptions& headerOptions, const OCRepresentation& rep, const int eCode)
 {
+    pthread_mutex_lock(&mutex_lock);
     isWaiting = 0;
+    pthread_mutex_unlock(&mutex_lock);
 
     if (eCode != SUCCESS_RESPONSE)
     {
@@ -184,7 +195,6 @@ void onFoundCollectionResource(std::vector< std::shared_ptr< OCResource > > reso
 // Callback to found resources
 void onFoundCandidateResource(std::vector< std::shared_ptr< OCResource > > resources)
 {
-
     std::string resourceURI;
     std::string hostAddress;
 
@@ -263,6 +273,7 @@ void onFoundCandidateResource(std::vector< std::shared_ptr< OCResource > > resou
 int main(int argc, char* argv[])
 {
     std::string str_steps;
+    pthread_mutex_init(&mutex_lock, NULL);
 
     //**************************************************************
     // STEP 0
@@ -276,11 +287,15 @@ int main(int argc, char* argv[])
 
     while (true)
     {
-
+        pthread_mutex_lock(&mutex_lock);
         if (isWaiting > 0)
+        {
+            pthread_mutex_unlock(&mutex_lock);
             continue;
+        }
 
         isWaiting = 0;
+        pthread_mutex_unlock(&mutex_lock);
 
         cout << endl << endl << "(0) Quit" << std::endl;
         cout << "(1) Find all resources(URI: /oic/con, /oic/diag, /factoryset)" << std::endl;
@@ -296,9 +311,13 @@ int main(int argc, char* argv[])
             std::getline (std::cin, str_steps);
 
             if(str_steps == "")
+            {
                 continue;
+            }
             else
+            {
                 g_Steps = std::stoi(str_steps);
+            }
         }
         catch(std::invalid_argument&)
         {
@@ -307,7 +326,9 @@ int main(int argc, char* argv[])
         }
 
         if (g_Steps == 0)
+        {
             break;
+        }
         else if (g_Steps == 1)
         {
             std::vector< std::string > types;
@@ -406,7 +427,11 @@ int main(int argc, char* argv[])
 
             if (g_thingsmanager->getConfigurations(g_configurationCollection, configurations, &onGet)
                     != OC_STACK_ERROR)
-                isWaiting = 1;
+            {
+                pthread_mutex_lock(&mutex_lock);
+                isWaiting = 0;
+                pthread_mutex_unlock(&mutex_lock);
+            }
         }
         else if (g_Steps == 4)
         {
@@ -428,7 +453,11 @@ int main(int argc, char* argv[])
 
             if (g_thingsmanager->updateConfigurations(g_configurationCollection, configurations,
                     &onUpdate) != OC_STACK_ERROR)
-                isWaiting = 1;
+            {
+                pthread_mutex_lock(&mutex_lock);
+                isWaiting = 0;
+                pthread_mutex_unlock(&mutex_lock);
+            }
         }
         else if (g_Steps == 5)
         {
@@ -441,7 +470,11 @@ int main(int argc, char* argv[])
 
             if (g_thingsmanager->factoryReset(g_diagnosticsCollection, &onFactoryReset)
                     != OC_STACK_ERROR)
-                isWaiting = 1;
+            {
+                pthread_mutex_lock(&mutex_lock);
+                isWaiting = 0;
+                pthread_mutex_unlock(&mutex_lock);
+            }
         }
         else if (g_Steps == 6)
         {
@@ -453,7 +486,11 @@ int main(int argc, char* argv[])
             }
 
             if (g_thingsmanager->reboot(g_diagnosticsCollection, &onReboot) != OC_STACK_ERROR)
-                isWaiting = 1;
+            {
+                pthread_mutex_lock(&mutex_lock);
+                isWaiting = 0;
+                pthread_mutex_unlock(&mutex_lock);
+            }
         }
         else if (g_Steps == 10)
         {