diff options
Diffstat (limited to 'philo_one/routine.c')
| -rw-r--r-- | philo_one/routine.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/philo_one/routine.c b/philo_one/routine.c index 89fe95e..69952b1 100644 --- a/philo_one/routine.c +++ b/philo_one/routine.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/10 01:11:27 by cacharle #+# #+# */ -/* Updated: 2020/02/15 01:25:41 by cacharle ### ########.fr */ +/* Updated: 2020/04/22 13:39:48 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,16 +18,17 @@ void *routine_philo(void *void_arg) pthread_t thread_death; arg = (t_routine_arg*)void_arg; - if (!arg->args->all_alive) + if (!arg->conf->all_alive) return (NULL); arg->philo->time_last_eat = h_time_now(); if (pthread_create(&thread_death, NULL, routine_death, arg) != 0) return (NULL); io_think(arg); - while (arg->args->all_alive) + while (arg->conf->all_alive) { pthread_mutex_lock(arg->fork_left); pthread_mutex_lock(arg->fork_right); + arg->philo->time_last_eat = h_time_now(); io_eat(arg); pthread_mutex_unlock(arg->fork_right); pthread_mutex_unlock(arg->fork_left); @@ -45,12 +46,12 @@ void *routine_death(void *void_arg) arg = (t_routine_arg*)void_arg; current = h_time_now(); - while (arg->args->all_alive && - current - arg->philo->time_last_eat < arg->args->timeout_death) + while (arg->conf->all_alive && + current - arg->philo->time_last_eat < arg->conf->timeout_death) current = h_time_now(); io_die(arg); - pthread_mutex_lock(&arg->args->mutex_all_alive); - arg->args->all_alive = FALSE; - pthread_mutex_unlock(&arg->args->mutex_all_alive); + pthread_mutex_lock(&arg->conf->mutex_all_alive); + arg->conf->all_alive = false; + pthread_mutex_unlock(&arg->conf->mutex_all_alive); return (NULL); } |