diff options
Diffstat (limited to 'philo_two/src/event.c')
| -rw-r--r-- | philo_two/src/event.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/philo_two/src/event.c b/philo_two/src/event.c index d86f6aa..8060b2b 100644 --- a/philo_two/src/event.c +++ b/philo_two/src/event.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* io.c :+: :+: :+: */ +/* event.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2020/09/30 09:56:53 by cacharle ### ########.fr */ +/* Updated: 2020/10/24 13:02:01 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,11 +15,11 @@ void event_take_fork(t_philo *arg) { sem_wait(arg->forks); - pthread_mutex_lock(&arg->conf->mutex_stdout); + sem_wait(arg->conf->sem_stdout); if (!arg->conf->all_alive) return ; philo_put(arg->id, EVENT_FORK); - pthread_mutex_unlock(&arg->conf->mutex_stdout); + sem_post(arg->conf->sem_stdout); } void event_eat(t_philo *arg) @@ -29,11 +29,11 @@ void event_eat(t_philo *arg) eat_counter = 0; while (eat_counter < arg->conf->meal_num) { - pthread_mutex_lock(&arg->conf->mutex_stdout); + sem_wait(arg->conf->sem_stdout); if (!arg->conf->all_alive) return ; philo_put(arg->id, EVENT_EAT); - pthread_mutex_unlock(&arg->conf->mutex_stdout); + sem_post(arg->conf->sem_stdout); usleep(arg->conf->timeout_eat * 1000); eat_counter++; } @@ -41,20 +41,20 @@ void event_eat(t_philo *arg) void event_think(t_philo *arg) { - pthread_mutex_lock(&arg->conf->mutex_stdout); + sem_wait(arg->conf->sem_stdout); if (!arg->conf->all_alive) return ; philo_put(arg->id, EVENT_THINK); - pthread_mutex_unlock(&arg->conf->mutex_stdout); + sem_post(arg->conf->sem_stdout); } void event_sleep(t_philo *arg) { - pthread_mutex_lock(&arg->conf->mutex_stdout); + sem_wait(arg->conf->sem_stdout); if (!arg->conf->all_alive) return ; philo_put(arg->id, EVENT_SLEEP); - pthread_mutex_unlock(&arg->conf->mutex_stdout); + sem_post(arg->conf->sem_stdout); sem_post(arg->forks); sem_post(arg->forks); usleep(arg->conf->timeout_sleep * 1000); @@ -62,10 +62,10 @@ void event_sleep(t_philo *arg) void event_die(t_philo *arg) { - pthread_mutex_lock(&arg->conf->mutex_stdout); + sem_wait(arg->conf->sem_stdout); if (!arg->conf->all_alive) return ; philo_put(arg->id, EVENT_DIE); arg->conf->all_alive = false; - pthread_mutex_unlock(&arg->conf->mutex_stdout); + sem_post(arg->conf->sem_stdout); } |