Merge pull request #207 from insertinterestingnamehere/syncvar_lock

Fix Syncvar and FEB Lock/Unlock In Different Threads

Author: insertinterestingnamehere

src/feb.c

@@ -61,6 +61,8 @@ typedef enum bt {
 } blocker_type;
 typedef struct {
     pthread_mutex_t lock;
+    pthread_cond_t condition;
+    uint32_t completed;
     void           *a;
     void           *b;
     blocker_type    type;
@@ -230,20 +232,24 @@ static aligned_t qthread_feb_blocker_thread(void *arg)
             a->retval = qthread_empty(a->a);
             break;
     }
-    pthread_mutex_unlock(&(a->lock));
+    pthread_mutex_lock(&a->lock);
+    a->completed = 1;
+    pthread_cond_signal(&a->condition);
+    pthread_mutex_unlock(&a->lock);
     return 0;
 }                                      /*}}} */
 
 static int qthread_feb_blocker_func(void        *dest,
                                     void        *src,
                                     blocker_type t)
 {   /*{{{*/
-    qthread_feb_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, dest, src, t, QTHREAD_SUCCESS };
+    qthread_feb_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0u, dest, src, t, QTHREAD_SUCCESS };
 
     pthread_mutex_lock(&args.lock);
     qthread_fork(qthread_feb_blocker_thread, &args, NULL);
-    pthread_mutex_lock(&args.lock);
+    while(!args.completed) pthread_cond_wait(&args.condition, &args.lock);
     pthread_mutex_unlock(&args.lock);
+    pthread_cond_destroy(&args.condition);
     pthread_mutex_destroy(&args.lock);
     return args.retval;
 } /*}}}*/

src/syncvar.c

@@ -64,6 +64,8 @@ typedef enum bt {
 } blocker_type;
 typedef struct {
     pthread_mutex_t lock;
+    pthread_cond_t condition;
+    uint32_t completed;
     void           *a;
     void           *b;
     blocker_type    type;
@@ -293,15 +295,18 @@ static aligned_t qthread_syncvar_blocker_thread(void *arg)
         case EMPTY: a->retval      = qthread_syncvar_empty(a->a); break;
         case INCR: a->retval       = qthread_syncvar_incrF(a->a, *(int64_t *)a->b); break;
     }
-    pthread_mutex_unlock(&(a->lock));
+    pthread_mutex_lock(&a->lock);
+    a->completed = 1u;
+    pthread_cond_signal(&a->condition);
+    pthread_mutex_unlock(&a->lock);
     return 0;
 }                                      /*}}} */
 
 static int qthread_syncvar_nonblocker_func(void        *dest,
                                         void        *src,
                                         blocker_type t)
 {   /*{{{*/
-    qthread_syncvar_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, dest, src, t, QTHREAD_SUCCESS };
+    qthread_syncvar_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0u, dest, src, t, QTHREAD_SUCCESS };
 
     qthread_fork(qthread_syncvar_nonblocker_thread, &args, NULL);
     return args.retval;
@@ -311,12 +316,13 @@ static int qthread_syncvar_blocker_func(void        *dest,
                                         void        *src,
                                         blocker_type t)
 {   /*{{{*/
-    qthread_syncvar_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, dest, src, t, QTHREAD_SUCCESS };
+    qthread_syncvar_blocker_t args = { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0u, dest, src, t, QTHREAD_SUCCESS };
 
     pthread_mutex_lock(&args.lock);
     qthread_fork(qthread_syncvar_blocker_thread, &args, NULL);
-    pthread_mutex_lock(&args.lock);
+    while (!args.completed) pthread_cond_wait(&args.condition, &args.lock);
     pthread_mutex_unlock(&args.lock);
+    pthread_cond_destroy(&args.condition);
     pthread_mutex_destroy(&args.lock);
     return args.retval;
 } /*}}}*/