diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-01-09 16:07:01 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-01-09 16:07:01 +0100 |
| commit | 802ea8347d1ceb7a02cf279359b3b101106fab94 (patch) | |
| tree | 3f8b38056e29d94a813351fb99cc911d89f8df3d /philo_two/src/event.c | |
| parent | ebbd81e4312d945b359d2761acfeb613da1f98c8 (diff) | |
| download | philosophers-802ea8347d1ceb7a02cf279359b3b101106fab94.tar.gz philosophers-802ea8347d1ceb7a02cf279359b3b101106fab94.tar.bz2 philosophers-802ea8347d1ceb7a02cf279359b3b101106fab94.zip | |
Added separate thread to check if max meal num is reached independent from philosopher death
Diffstat (limited to 'philo_two/src/event.c')
| -rw-r--r-- | philo_two/src/event.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/philo_two/src/event.c b/philo_two/src/event.c index 3ce471e..2fc1249 100644 --- a/philo_two/src/event.c +++ b/philo_two/src/event.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2021/01/08 19:54:40 by charles ### ########.fr */ +/* Updated: 2021/01/09 15:18:24 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ void event_take_fork(t_philo *arg) { - sem_wait(arg->forks); + sem_wait(arg->conf->sem_forks); sem_wait(arg->conf->sem_stdout); philo_put(arg->id, EVENT_FORK, arg->conf->initial_time); sem_post(arg->conf->sem_stdout); @@ -40,23 +40,14 @@ void event_sleep(t_philo *arg) sem_wait(arg->conf->sem_stdout); philo_put(arg->id, EVENT_SLEEP, arg->conf->initial_time); sem_post(arg->conf->sem_stdout); - sem_post(arg->forks); - sem_post(arg->forks); + sem_post(arg->conf->sem_forks); + sem_post(arg->conf->sem_forks); h_sleep(arg->conf->timeout_sleep); } void event_die(t_philo *arg) { - long int i; - sem_wait(arg->conf->sem_stdout); philo_put(arg->id, EVENT_DIE, arg->conf->initial_time); - if (arg->conf->meal_num == -1) - sem_post(arg->conf->sem_finish); - else - { - i = -1; - while (++i < arg->conf->philo_num) - sem_post(arg->conf->sem_finish); - } + sem_post(arg->conf->sem_finish); } |