aboutsummaryrefslogtreecommitdiff
path: root/philo_one
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-01-01 14:46:13 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-01-01 14:46:13 +0100
commitb9d93edf40f228fcc6e18e9e6d0a1c5db498c004 (patch)
tree5abb172c43b54adcf4caef33ede04f64c957246f /philo_one
parent83df2b3a49bd3f627ae304bb1529e27d9b2d988c (diff)
downloadphilosophers-b9d93edf40f228fcc6e18e9e6d0a1c5db498c004.tar.gz
philosophers-b9d93edf40f228fcc6e18e9e6d0a1c5db498c004.tar.bz2
philosophers-b9d93edf40f228fcc6e18e9e6d0a1c5db498c004.zip
Added meal counter to philo_two (still segfault 10% of the time)
Diffstat (limited to 'philo_one')
-rw-r--r--philo_one/src/routine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/philo_one/src/routine.c b/philo_one/src/routine.c
index e9775cc..d8fa3a0 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: 2021/01/01 13:57:11 by charles ### ########.fr */
+/* Updated: 2021/01/01 14:24:05 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -29,14 +29,14 @@ void *routine_philo(t_philo *arg)
arg->time_last_eat = h_time_now();
if (pthread_create(&thread_death, NULL, (t_routine)routine_death, arg) != 0)
return (NULL);
- event_think(arg);
eat_counter = 0;
+ event_think(arg);
while (!philo_finished(arg->conf))
{
event_take_fork(arg, arg->fork_left);
event_take_fork(arg, arg->fork_right);
- arg->time_last_eat = h_time_now();
event_eat(arg);
+ arg->time_last_eat = h_time_now();
eat_counter++;
if (!philo_finished(arg->conf) && arg->conf->meal_num != -1 &&
eat_counter == arg->conf->meal_num)