diff options
Diffstat (limited to 'philo_one/src/event.c')
| -rw-r--r-- | philo_one/src/event.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/philo_one/src/event.c b/philo_one/src/event.c index ef3d7a5..ab8da0b 100644 --- a/philo_one/src/event.c +++ b/philo_one/src/event.c @@ -6,48 +6,53 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2020/12/30 13:39:56 by charles ### ########.fr */ +/* Updated: 2021/01/01 13:46:50 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #include "philo_one.h" -void event_take_fork(t_philo *arg, pthread_mutex_t *fork) +void event_take_fork(t_philo *arg, pthread_mutex_t *fork) { + if (philo_finished(arg->conf)) + return ; pthread_mutex_lock(fork); pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) + if (philo_finished(arg->conf)) return ; philo_put(arg->id, EVENT_FORK); pthread_mutex_unlock(&arg->conf->mutex_stdout); } -void event_eat(t_philo *arg) +void event_eat(t_philo *arg) { + if (philo_finished(arg->conf)) + return ; pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) + if (philo_finished(arg->conf)) return ; philo_put(arg->id, EVENT_EAT); pthread_mutex_unlock(&arg->conf->mutex_stdout); usleep(arg->conf->timeout_eat * 1000); } -void event_think(t_philo *arg) +void event_think(t_philo *arg) { + if (philo_finished(arg->conf)) + return ; pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) + if (philo_finished(arg->conf)) return ; philo_put(arg->id, EVENT_THINK); pthread_mutex_unlock(&arg->conf->mutex_stdout); } -void event_sleep( - t_philo *arg, - pthread_mutex_t *fork_right, - pthread_mutex_t *fork_left) +void event_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left) { + if (philo_finished(arg->conf)) + return ; pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) + if (philo_finished(arg->conf)) return ; philo_put(arg->id, EVENT_SLEEP); pthread_mutex_unlock(&arg->conf->mutex_stdout); @@ -56,10 +61,12 @@ void event_sleep( usleep(arg->conf->timeout_sleep * 1000); } -void event_die(t_philo *arg) +void event_die(t_philo *arg) { + if (philo_finished(arg->conf)) + return ; pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) + if (philo_finished(arg->conf)) return ; arg->conf->all_alive = false; philo_put(arg->id, EVENT_DIE); |