Removed commented code and test prints.
This commit is contained in:
parent
c8322811a2
commit
431dcb6aa6
@ -61,7 +61,6 @@ bool AllPhilosophersFull(PhilosopherData PhilosopherList[], int numPhilosophers)
|
|||||||
// Philosopher enters critical section.
|
// Philosopher enters critical section.
|
||||||
void PhilosopherWait()
|
void PhilosopherWait()
|
||||||
{
|
{
|
||||||
printf("A thread was put into waiting...\n");
|
|
||||||
sem_wait(&semaphore);
|
sem_wait(&semaphore);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -107,10 +106,6 @@ void PhilosopherInit(int philosopherTotal)
|
|||||||
sem_init(&semaphore, 0, 1);
|
sem_init(&semaphore, 0, 1);
|
||||||
while (!AllPhilosophersFull(PhilosopherList, philosopherTotal))
|
while (!AllPhilosophersFull(PhilosopherList, philosopherTotal))
|
||||||
{
|
{
|
||||||
for (int i = 0; i < philosopherTotal; i++)
|
|
||||||
{
|
|
||||||
printf("Philosopher %d state: %d\n", PhilosopherList[i].position, PhilosopherList[i].state);
|
|
||||||
}
|
|
||||||
AllowPhilosopher();
|
AllowPhilosopher();
|
||||||
sleep(1);
|
sleep(1);
|
||||||
}
|
}
|
||||||
@ -129,7 +124,6 @@ void PhilosopherListInit(PhilosopherData PhilosopherList[], int philosopherTotal
|
|||||||
PhilosopherList[i].eatingCount = 0;
|
PhilosopherList[i].eatingCount = 0;
|
||||||
PhilosopherList[i].state = THINKING;
|
PhilosopherList[i].state = THINKING;
|
||||||
pthread_create(&PhilosopherList[i].thread, NULL, &Philosopher, &PhilosopherList[i]);
|
pthread_create(&PhilosopherList[i].thread, NULL, &Philosopher, &PhilosopherList[i]);
|
||||||
// pthread_join(&PhilosopherList[i].thread, NULL);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,12 +148,6 @@ bool PhilosopherCanEat(PhilosopherData PhilosopherList[], int selectedPosition,
|
|||||||
{
|
{
|
||||||
if (PhilosopherList[selectedPosition].state != HUNGRY)
|
if (PhilosopherList[selectedPosition].state != HUNGRY)
|
||||||
return false;
|
return false;
|
||||||
// int leftPhilosopher = (selectedPosition + (philosopherTotal-1)) % philosopherTotal;
|
|
||||||
// int rightPhilosopher = (selectedPosition + 1) % philosopherTotal;
|
|
||||||
// if (PhilosopherList[leftPhilosopher].state == EATING)
|
|
||||||
// return false;
|
|
||||||
// if (PhilosopherList[rightPhilosopher].state == EATING)
|
|
||||||
// return false;
|
|
||||||
for (int i = 0; i < philosopherTotal; i++)
|
for (int i = 0; i < philosopherTotal; i++)
|
||||||
if (PhilosopherList[i].state == EATING)
|
if (PhilosopherList[i].state == EATING)
|
||||||
return false;
|
return false;
|
||||||
@ -177,5 +165,4 @@ void Think(PhilosopherData* philosopherSelected)
|
|||||||
void AllowPhilosopher()
|
void AllowPhilosopher()
|
||||||
{
|
{
|
||||||
sem_post(&semaphore);
|
sem_post(&semaphore);
|
||||||
printf("A thread was released...\n");
|
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user