View difference between Paste ID: BQFcnXeT and WrBPJ0iZ

 #include <stdio.h>
 #include <stdlib.h>
 #include "pthread.h"
 #include "semaphore.h"
 
 typedef struct GlobalState {
 	pthread_mutex_t   ActMutex;
 	int               iFanPerType[2];
-	int               MustJoinCaptain;
+	int               MustJoinCaptain;
 	int               FansRemaining;
-	pthread_t         aFanCarThread[4];
+	int               iWantPerType[2];
-	pthread_mutex_t   BeginNewCar;
+	pthread_t         aFanCarThread[4];
 	sem_t             WantFanType[2];
-	sem_t             QueueLimit;
+
 	sem_t             DoneSemaphore;
 } GlobalState;
 
 GlobalState g_tState;
 
 void *FanThread(void *arg) {
 	int n, iFan = (int)arg, iFansInCar;
 	pthread_t tid = pthread_self();
 
-	//limited exit from the event...
+
-	sem_wait( &g_tState.QueueLimit );
+	//pthread_mutex_lock(&g_tState.ActMutex);
   //printf("Thread ID: %014lli, Team: %c, I am looking for a car\n",tid,'A'+iFan);
 	//pthread_mutex_unlock(&g_tState.ActMutex);
-	pthread_mutex_lock(&g_tState.ActMutex);
+
-  printf("Thread ID: %lli, Team: %c, I am looking for a car\n",tid,'A'+iFan);
+	while (1) {
-	pthread_mutex_unlock(&g_tState.ActMutex);
+		sem_wait( &g_tState.WantFanType[iFan] );
 
-	while (1) {
+		pthread_mutex_lock(&g_tState.ActMutex);
-	  pthread_mutex_lock(&g_tState.ActMutex);
+		g_tState.iWantPerType[iFan]=0;
 
 	  //clean up last captain thread if any
 		if (g_tState.MustJoinCaptain) {
 		  pthread_join(g_tState.aFanCarThread[3], NULL );
 			g_tState.MustJoinCaptain = 0;
 	  }
 		//number of fans on car is #A + #B
 		iFansInCar = g_tState.iFanPerType[0]+g_tState.iFanPerType[1];
-		if ((iFansInCar < 3) || (g_tState.iFanPerType[iFan] & 1)) {
+
 		//allowed combinatios are 2:2 or 4:0
 		if ((iFansInCar < 3) || (g_tState.iFanPerType[iFan] & 1)) {
       //set the TID for this fan on a car slot (so we can wait & cleanup)
 			g_tState.aFanCarThread[iFansInCar] = tid;
-			//printf("Thread ID: %lli, Team: %c, I am looking for a car\n",tid,'A'+iFan);
+
 
 			//if there still not 3, then we still accept either
 			if (iFansInCar < 2 ) {
 			  if (!g_tState.iWantPerType[0]) { g_tState.iWantPerType[0]=1 ; sem_post( &g_tState.WantFanType[0] ); }
-			//pthread_mutex_trylock(&g_tState.BeginNewCar);
+			  if (!g_tState.iWantPerType[1]) { g_tState.iWantPerType[1]=1 ; sem_post( &g_tState.WantFanType[1] ); }
 			} else if (iFansInCar == 2) {
 				n = (g_tState.iFanPerType[0] & 1) ? 0 : 1;
-      pthread_mutex_trylock(&g_tState.BeginNewCar);
+				if (!g_tState.iWantPerType[n]) { g_tState.iWantPerType[n]=1 ; sem_post( &g_tState.WantFanType[n] ); }
-			printf("Thread ID: %lli, Team: %c, I have found a spot in a car\n",tid,'A'+iFan);
+				g_tState.iWantPerType[1-n]=0;
 		  }
 
 			printf("Thread ID: %014lli, Team: %c, I am looking for a car\n",tid,'A'+iFan);
 
 			// wait for 4 compatible fans to arrive before entering the car
-					pthread_join(g_tState.aFanCarThread[n], NULL );
+
 			pthread_barrier_wait( &g_tState.JoinTheCar );
 
-				printf("Thread ID: %lli, Team: %c, I am the captain and driving the car\n",tid,'A'+iFan);
+
 			printf("Thread ID: %014lli, Team: %c, I have found a spot in a car\n",tid,'A'+iFan);
-				g_tState.MustJoinCaptain = 1;
+
-				g_tState.FansRemaining -= 4;
+
 			//if this fan will fill a car, then it becomes the captain and a car is finished
-				pthread_mutex_unlock(&g_tState.ActMutex);
+
-				pthread_mutex_unlock(&g_tState.BeginNewCar);
+
-				//when finishing a car a new one can start...
+
 					pthread_join(g_tState.aFanCarThread[n], NULL );
 				}
 				pthread_mutex_lock(&g_tState.ActMutex);
 				printf("Thread ID: %014lli, Team: %c, I am the captain and driving the car\n",tid,'A'+iFan);
-			//printf("Thread ID: %lli, Team: %c, waiting for a new car...\n",tid,'A'+iFan);
+
 				g_tState.MustJoinCaptain = 1; g_tState.FansRemaining -= 4;
-			//wait for a new car
+
-			pthread_mutex_lock(&g_tState.BeginNewCar);
+
-			pthread_mutex_unlock(&g_tState.BeginNewCar);
+				// new car... accepts both
 				if (!g_tState.iWantPerType[0]) { g_tState.iWantPerType[0]=1 ; sem_post( &g_tState.WantFanType[0] ); }
 			  if (!g_tState.iWantPerType[1]) { g_tState.iWantPerType[1]=1 ; sem_post( &g_tState.WantFanType[1] ); }
 
-	//allow more people to exit.
+				pthread_mutex_unlock(&g_tState.ActMutex);
-	sem_post( &g_tState.QueueLimit );
+
 			}
 			//fan is inside a car so exit the thread
 			break;
 		} else {
 		  // spurious wake?
 			//if (!g_tState.iWantPerType[1-n]) { g_tState.iWantPerType[1-n]=1 ; sem_post( &g_tState.WantFanType[1-n] ); }
 			pthread_mutex_unlock(&g_tState.ActMutex);
 		}
 	}
 
 }
 
 void ManageThreads(int iNumA,int iNumB) {
 
-	g_tState.FansRemaining = iNumA+iNumB;
+
 	pthread_t tid;
-	pthread_mutex_init(&g_tState.ActMutex, NULL);
+
-	pthread_mutex_init(&g_tState.BeginNewCar, NULL);
+
-	//pthread_mutex_lock(&g_tState.BeginNewCar);
+
 	//total number must be a multiple of 4
 	if ((iNumA+iNumB) & 3) return;
-	sem_init(&g_tState.QueueLimit, 0, 6);
+
 	//initialize global state
 	g_tState.FansRemaining = iNumA+iNumB;
 	g_tState.MustJoinCaptain = 0;
-    pthread_create(&tid, NULL, &FanThread, (void*)0);
+	pthread_mutex_init(&g_tState.ActMutex, NULL);
 	sem_init(&g_tState.WantFanType[0],0,1);
 	sem_init(&g_tState.WantFanType[1],0,1);
 	g_tState.iWantPerType[0] = 1;
-    pthread_create(&tid, NULL, &FanThread, (void*)1);
+	g_tState.iWantPerType[1] = 1;
 
 	pthread_barrier_init(&g_tState.JoinTheCar, NULL, 4);
 	sem_init(&g_tState.DoneSemaphore, 0, 0);
 
 	// creating threads
 	for ( i=0 ; i<iNumA ; i++ ) {
     while (pthread_create(&tid, NULL, &FanThread, (void*)0)) { };
 	}
 
 	for ( i=0 ; i<iNumB ; i++ ) {
-	sem_destroy(&g_tState.QueueLimit);
+    while (pthread_create(&tid, NULL, &FanThread, (void*)1)) { };
-	pthread_mutex_destroy(&g_tState.ActMutex);
+
-	pthread_mutex_destroy(&g_tState.BeginNewCar);
+
 	//waiting for all fans to depart
 	sem_wait( &g_tState.DoneSemaphore );
 	//waiting for last thread to finish
 	pthread_join(g_tState.aFanCarThread[3], NULL );
 
 	//free resources
 	pthread_barrier_destroy(&g_tState.JoinTheCar);
 	sem_destroy(&g_tState.DoneSemaphore);
 	pthread_mutex_destroy(&g_tState.ActMutex);
 	sem_destroy(&g_tState.WantFanType[0]);
 	sem_destroy(&g_tState.WantFanType[1]);
 
 }
 
 int main(int argc, char *argv[]) {
 	int iNumA,iNumB;
 
 	//number of arguments must be 3...
 	//ProgramName , FansA , FansB
 	if (argc == 3) {
 		//fans of different members
 		iNumA = atoi(argv[1]);
 		iNumB = atoi(argv[2]);
 	  ManageThreads( iNumA , iNumB );
 	}
 
 	puts("main terminates");
 	getchar();
 	return 0;
 }