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

Encore des mutex, le début des threads aussi

Browse Source
This commit is contained in:
Antoine Bartuccio
2018-06-08 00:08:18 +02:00
parent de64ae4902
commit 048017a1ba
3 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Elevator/Elevator.c
View File

@ -5,37 +5,61 @@
#include <string.h>
#include "Elevator.h"
SYNCHRONIZED_GETTER(Elevator, ELEVATOR_STATE, state)
SYNCHRONIZED_SETTER(Elevator, ELEVATOR_STATE, state)
void _free__Elevator(THIS(Elevator)){
DELETE(this->passenger_ids);
if (this->name != NULL)
free(this->name);
pthread_mutex_unlock(&this->passenger_mutex);
pthread_mutex_destroy(&this->passenger_mutex);
pthread_mutex_unlock(&this->mutex_passenger);
pthread_mutex_destroy(&this->mutex_passenger);
pthread_mutex_unlock(&this->mutex_state);
pthread_mutex_destroy(&this->mutex_state);
free(this);
}
int get_number_of_passengers_Elevator(THIS(Elevator)){
int num;
pthread_mutex_lock(&this->passenger_mutex);
pthread_mutex_lock(&this->mutex_passenger);
num = this->passenger_ids->get_size(this->passenger_ids);
pthread_mutex_lock(&this->passenger_mutex);
pthread_mutex_lock(&this->mutex_passenger);
return num;
}
int can_get_more_passengers_Elevator(_THIS(Elevator)){
int can_get_more_passengers_Elevator(THIS(Elevator)){
return (this->get_number_of_passengers(this) < MAX_ELEVATOR_CAPACITY);
}
void repair_Elevator(THIS(Elevator)){
this->set_state(this, running);
}
void *runnable_Elevator(void * void_this){
/* This is where the thread logic will be implemented */
Elevator * this = (Elevator*) void_this;
/* Returning this to keep gcc and clang quiet while developing, will return NULL */
return this;
}
Elevator *_init_Elevator(char * name){
Elevator * new_elevator = malloc_or_die(sizeof(Elevator));
new_elevator->state = waiting;
new_elevator->name = strdup(name);
new_elevator->passenger_ids = NEW(List);
pthread_mutex_init(&new_elevator->passenger_mutex, NULL);
pthread_mutex_init(&new_elevator->mutex_passenger, NULL);
pthread_mutex_init(&new_elevator->mutex_state, NULL);
LINK_ALL(Elevator, new_elevator,
runnable,
get_number_of_passengers,
can_get_more_passengers
can_get_more_passengers,
get_state,
set_state,
repair
);
return new_elevator;

12
Elevator/Elevator.h
View File

@ -11,17 +11,25 @@
#define MAX_ELEVATOR_CAPACITY 10
typedef enum {running, waiting, sleeping} ELEVATOR_STATE;
typedef enum {running, waiting, sleeping, broken} ELEVATOR_STATE;
typedef struct o_Elevator {
PRIVATE ELEVATOR_STATE state;
PRIVATE List * passenger_ids;
PRIVATE char * name;
PRIVATE pthread_mutex_t passenger_mutex;
PRIVATE pthread_mutex_t mutex_passenger;
PRIVATE pthread_mutex_t mutex_state;
PUBLIC void * (*runnable)(void * void_this);
SYNCHRONIZE PRIVATE void (*set_state)(_THIS(Elevator), ELEVATOR_STATE var);
SYNCHRONIZE PUBLIC void (*repair)(_THIS(Elevator));
SYNCHRONIZE PUBLIC int (*get_number_of_passengers)(_THIS(Elevator));
SYNCHRONIZE PUBLIC ELEVATOR_STATE (*get_state)(_THIS(Elevator));
SYNCHRONIZE PUBLIC int (*can_get_more_passengers)(_THIS(Elevator));
DESTRUCTOR(Elevator);
} Elevator;
FRIENDLY(state, Building)