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

Le réparateur, j'ai pas testé lol

Browse Source
This commit is contained in:
Antoine Bartuccio
2018-06-22 03:59:36 +02:00
parent 6b7bb7e119
commit 3334f77d22
10 changed files with 115 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SharedData/SharedData.c
View File

@ -46,8 +46,13 @@ void start_all_threads_SharedData(THIS(SharedData)){
pthread_mutex_lock(&this->mutex_active_passengers);
pthread_mutex_lock(&this->mutex_threads);
/* starting the elevator breaker */
this->start_thread(this, this->elevator_breaker->runnable, this->elevator_breaker, 0);
this->elevator_breaker->set_thread_number(this->elevator_breaker, 0);
/* starts threading elevators */
for (i=0; i<ELEVATOR_NB; i++) {
for (i=1; i<ELEVATOR_NB; i++) {
this->start_thread(this, this->main_building->elevators[i]->runnable,
this->main_building->elevators[i], i);
this->main_building->elevators[i]->set_thread_number(this->main_building->elevators[i], i);
@ -105,6 +110,8 @@ void _free__SharedData(THIS(SharedData)){
if (this->main_building != NULL)
DELETE(this->main_building);
DELETE(this->elevator_breaker);
pthread_mutex_unlock(&this->mutex_active_passengers);
pthread_mutex_destroy(&this->mutex_active_passengers);
pthread_mutex_unlock(&this->mutex_threads);
@ -143,6 +150,7 @@ SharedData *_get_instance_SharedData(){
new_shared_data->main_building = NULL; /* Should be set to NULL if freed before */
new_shared_data->threads_nb = 0;
new_shared_data->active_passengers = 0;
new_shared_data->elevator_breaker = NEW(ElevatorBreaker);
pthread_mutex_init(&new_shared_data->mutex_active_passengers, NULL);
pthread_mutex_init(&new_shared_data->mutex_threads, NULL);

2
SharedData/SharedData.h
View File

@ -8,10 +8,12 @@
#include <pthread.h>
#include "../Objects.h"
#include "../Building/Building.h"
#include "../ElevatorBreaker/ElevatorBreaker.h"
typedef struct o_SharedData {
PRIVATE int threads_nb;
PRIVATE int active_passengers;
PRIVATE ElevatorBreaker * elevator_breaker;
PRIVATE pthread_t ** threads;
PRIVATE Building * main_building;
PRIVATE pthread_mutex_t mutex_active_passengers;