locks19

sujaypat · Oct 5, 2016 · e8d8dd6 · e8d8dd6
1 parent c6a8927
commit e8d8dd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/luscious_locks/barrier.c b/luscious_locks/barrier.c
@@ -24,9 +24,10 @@ int barrier_wait(barrier_t *barrier) {
 	pthread_mutex_lock(&(barrier -> mtx));
 	barrier -> count++;
 	if(barrier -> count == barrier -> n_threads) pthread_cond_broadcast(&(barrier -> cv));
-	else{
-		while(barrier -> count < barrier -> n_threads) pthread_cond_wait(&(barrier -> cv), &(barrier -> mtx));
-	}
+	else while(barrier -> count < barrier -> n_threads) pthread_cond_wait(&(barrier -> cv), &(barrier -> mtx));
 	pthread_mutex_unlock(&(barrier -> mtx));
+
+
+
 	return 0;
 }
diff --git a/luscious_locks/semamore.c b/luscious_locks/semamore.c
@@ -27,10 +27,12 @@ void semm_init(Semamore *s, int value, int max_val) {
 */
 void semm_wait(Semamore *s) {
 	pthread_mutex_lock(&s -> m);
-	s -> value--;
+
 	while(s -> value == 0){
 		pthread_cond_wait(&s -> cv, &s -> m);
 	}
+	s -> value--;
+	pthread_cond_broadcast(&s -> cv);
 	pthread_mutex_unlock(&s -> m);
 }
 
@@ -41,10 +43,12 @@ void semm_wait(Semamore *s) {
 */
 void semm_post(Semamore *s) {
 	pthread_mutex_lock(&s -> m);
-	s -> value++;
+
 	while(s -> value == s -> max_val){
 		pthread_cond_wait(&(s -> cv), &(s -> m));
 	}
+	s -> value++;
+	pthread_cond_broadcast(&s -> cv);
 	pthread_mutex_unlock(&s -> m);
 }