Fixed a pair of deadlocks on shutdown

In the event where a condition variable was signaled before it
was waited on, the thread would fail to exit properly and be
deadlocked.

This fix correctly checks the stop value before locking, and ensures
that signalling is done in a locked context as well.

Change-Id: Iab19adcee854a1ca1531deea29fa3bb6c82d042f
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/874
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/resource/csdk/connectivity/src/caqueueingthread.c b/resource/csdk/connectivity/src/caqueueingthread.c
index 9f8a97a..01bed4b 100644 (file)
--- a/resource/csdk/connectivity/src/caqueueingthread.c
+++ b/resource/csdk/connectivity/src/caqueueingthread.c
@@ -50,7 +50,7 @@ static void CAQueueingThreadBaseRoutine(void *threadValue)
         ca_mutex_lock(thread->threadMutex);
 
         // if queue is empty, thread will wait
-        if (u_queue_get_size(thread->dataQueue) <= 0)
+        if (!thread->isStop && u_queue_get_size(thread->dataQueue) <= 0)
         {
             OIC_LOG(DEBUG, TAG, "wait..");
 
@@ -114,7 +114,9 @@ static void CAQueueingThreadBaseRoutine(void *threadValue)
         }
     }
 
+    ca_mutex_lock(thread->threadMutex);
     ca_cond_signal(thread->threadCond);
+    ca_mutex_unlock(thread->threadMutex);
 
     OIC_LOG(DEBUG, TAG, "message handler main thread end..");
 }

diff --git a/resource/csdk/connectivity/src/caretransmission.c b/resource/csdk/connectivity/src/caretransmission.c
index e10fa17..e4938f5 100644 (file)
--- a/resource/csdk/connectivity/src/caretransmission.c
+++ b/resource/csdk/connectivity/src/caretransmission.c
@@ -214,7 +214,7 @@ static void CARetransmissionBaseRoutine(void *threadValue)
         // mutex lock
         ca_mutex_lock(context->threadMutex);
 
-        if (u_arraylist_length(context->dataList) <= 0)
+        if (!context->isStop && u_arraylist_length(context->dataList) <= 0)
         {
             // if list is empty, thread will wait
             OIC_LOG(DEBUG, TAG, "wait..there is no retransmission data.");
@@ -247,7 +247,9 @@ static void CARetransmissionBaseRoutine(void *threadValue)
         CACheckRetransmissionList(context);
     }
 
+    ca_mutex_lock(context->threadMutex);
     ca_cond_signal(context->threadCond);
+    ca_mutex_unlock(context->threadMutex);
 
     OIC_LOG(DEBUG, TAG, "retransmission main thread end..");