Ticket #204: rwlock_deadlock_tight_loop.diff

rwlock.c

@@ -91 +91 @@
   }
 
   lock->mutex = 0;
+  lock->cond = 0;
   lock->num_active = 0;
   //lock->exclusive_waiters = 0;
   lock->num_shared_waiters = 0;
@@ -99 +100 @@
   rc = pthread_mutex_init(&lock->mutex, NULL);
   if (rc != 0) return rc;
 
+  rc = pthread_cond_init(&lock->cond, NULL);
+  if (rc != 0 ) {
+      pthread_mutex_destroy(&lock->mutex);
+
+      return rc;
+  }
+
   //lock->exclusive_waiters = mksem(0);
   //if (lock->exclusive_waiters < 0) return errno;
 
@@ -114 +122 @@
 {
   pthread_rwlock_t lock = *_lock;
   if (!lock) return EINVAL;
+  pthread_cond_destroy(&lock->cond);
   pthread_mutex_destroy(&lock->mutex);
   //if (close(lock->exclusive_waiters) < 0) return errno;
   //if (close(lock->shared_waiters) < 0) return errno;
@@ -224 +235 @@
       lock->num_active++;
       break;
     }
+
+    pthread_cond_wait(&lock->cond, &lock->mutex);
   }
 
   pthread_mutex_unlock(&lock->mutex);
@@ -273 +286 @@
     //pthread_mutex_unlock(&lock->mutex);
     //if (waitone(lock->exclusive_waiters, __abstime2timeout(abstime)) < 0) return errno;
     //pthread_mutex_lock(&lock->mutex);
+
+    pthread_cond_wait(&lock->cond, &lock->mutex);
   }
 
   pthread_mutex_unlock(&lock->mutex);
@@ -326 +341 @@
     }
   }
 
+  pthread_cond_broadcast(&lock->cond);
   pthread_mutex_unlock(&lock->mutex);
   return 0;
 }

pthread_private.h

@@ -78 +78 @@
 struct pthread_rwlock_t_
 {
   pthread_mutex_t mutex;
+  pthread_cond_t cond;
   //handle_t shared_waiters;
   //handle_t exclusive_waiters;
   int num_shared_waiters;