klmp200/LO41
1
0
Fork 0
mirror of https://gitlab.com/klmp200/LO41.git synced 2025-07-11 20:29:24 +00:00
Code Issues Releases Wiki Activity

Pthread KILL

Browse Source
This commit is contained in:
Antoine Bartuccio
2018-06-15 19:14:30 +02:00
parent 415ef4807c
commit 3126e57610
7 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Building/Building.c
View File

@ -122,8 +122,10 @@ void _free__Building(THIS(Building)){
DELETE(this->visitors);
for (i=0; i<ELEVATOR_NB; i++)
DELETE(this->elevators[i]);
for (i=0; i<FLOORS; i++)
for (i=0; i<FLOORS; i++) {
pthread_cond_destroy(this->condition_floors[i]);
free(this->condition_floors[i]);
}
free(this->condition_floors);
free(this->mutex_cond_get_inside_elevator);
free(this->mutex_cond_get_outside_elevator);
@ -156,7 +158,7 @@ void go_to_floor_Building(THIS(Building), int origin, int destination, Passenger
int elevator_number;
if (origin < 0 || origin >= FLOORS) {CRASH("You are trying to start from a non existing floor\n");}
if (destination < 0 || origin >= FLOORS) {CRASH("You are trying to reach a non existing floor\n");}
if (destination < 0 || destination >= FLOORS) {CRASH("You are trying to reach a non existing floor\n");}
pthread_cond_wait(this->condition_floors[origin], this->mutex_cond_get_inside_elevator);
elevator_number = this->get_inside_elevator(this, origin, passenger, type);