From 8bf2b3358dfd1e01130745302d0440542e2f9157 Mon Sep 17 00:00:00 2001 From: klmp200 Date: Sun, 17 Jun 2018 18:49:00 +0200 Subject: [PATCH] Les doublons --- SharedData/SharedData.c | 7 ------- SharedData/SharedData.h | 1 - 2 files changed, 8 deletions(-) diff --git a/SharedData/SharedData.c b/SharedData/SharedData.c index 79ec5fa..2dc7482 100644 --- a/SharedData/SharedData.c +++ b/SharedData/SharedData.c @@ -7,12 +7,6 @@ GETTER(SharedData, Building *, main_building) SETTER(SharedData, Building *, main_building) -void wait_threads_SharedData(THIS(SharedData)){ - int i; - for (i=0; ithreads_nb; i++) - pthread_join(this->threads[i], NULL); -} - int call_elevator_SharedData(THIS(SharedData), int starting_floor, int destination_floor){ /* Make the thread wait for an elevator available and return the id of the elevator available */ if (this->main_building == NULL) @@ -103,7 +97,6 @@ SharedData *_get_instance_SharedData(){ new_shared_data->threads_nb = 0; LINK_ALL(SharedData, new_shared_data, - wait_threads, start_thread, start_all_threads, wait_all_threads, diff --git a/SharedData/SharedData.h b/SharedData/SharedData.h index 451b4c4..037b44f 100644 --- a/SharedData/SharedData.h +++ b/SharedData/SharedData.h @@ -20,7 +20,6 @@ typedef struct o_SharedData { PUBLIC void (*start_all_threads)(_THIS(SharedData)); PUBLIC void (*set_main_building)(_THIS(SharedData), Building * building); PUBLIC Building * (*get_main_building)(_THIS(SharedData)); - PUBLIC void (*wait_threads)(_THIS(SharedData)); PUBLIC int (*call_elevator)(_THIS(SharedData), int starting_floor, int destination_floor); PUBLIC int (*use_call_box)(_THIS(SharedData), char * resident_name);