diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-12-30 14:06:17 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-12-30 14:06:17 +0100 |
| commit | cf2ef2c3901f3da524079a9ad912dfb99e115a7e (patch) | |
| tree | 7868f1f02a3fab1aa74606c1f9a3a00c0287976f /philo_one/src/routine.c | |
| parent | 2baa67fd7ad31fe53ab21d257a104478e787fb62 (diff) | |
| download | philosophers-cf2ef2c3901f3da524079a9ad912dfb99e115a7e.tar.gz philosophers-cf2ef2c3901f3da524079a9ad912dfb99e115a7e.tar.bz2 philosophers-cf2ef2c3901f3da524079a9ad912dfb99e115a7e.zip | |
Fixed meal_num args for philo_one
Diffstat (limited to 'philo_one/src/routine.c')
| -rw-r--r-- | philo_one/src/routine.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/philo_one/src/routine.c b/philo_one/src/routine.c index c1a7a4f..280f9d6 100644 --- a/philo_one/src/routine.c +++ b/philo_one/src/routine.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/10 01:11:27 by cacharle #+# #+# */ -/* Updated: 2020/09/30 09:43:16 by cacharle ### ########.fr */ +/* Updated: 2020/12/30 13:44:25 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,7 @@ void *routine_philo(t_philo *arg) { pthread_t thread_death; + long int eat_counter; if (!arg->conf->all_alive) return (NULL); @@ -22,12 +23,20 @@ void *routine_philo(t_philo *arg) if (pthread_create(&thread_death, NULL, (t_routine)routine_death, arg) != 0) return (NULL); event_think(arg); + eat_counter = 0; while (arg->conf->all_alive) { event_take_fork(arg, arg->fork_left); event_take_fork(arg, arg->fork_right); arg->time_last_eat = h_time_now(); event_eat(arg); + eat_counter++; + if (arg->conf->meal_num != -1 && eat_counter == arg->conf->meal_num) + { + pthread_mutex_lock(&arg->conf->mutex_meal_num_finished_counter); + arg->conf->meal_num_finished_counter++; + pthread_mutex_unlock(&arg->conf->mutex_meal_num_finished_counter); + } event_sleep(arg, arg->fork_right, arg->fork_left); event_think(arg); } @@ -42,7 +51,10 @@ void *routine_death(t_philo *arg) current = h_time_now(); while (arg->conf->all_alive && current - arg->time_last_eat < arg->conf->timeout_death) + { current = h_time_now(); + usleep(200); + } if (!arg->conf->all_alive) return (NULL); event_die(arg); |