diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-01-09 14:40:23 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-01-09 14:40:23 +0100 |
| commit | ebbd81e4312d945b359d2761acfeb613da1f98c8 (patch) | |
| tree | 5ac8f109d8f840e57f001b4739a1b2472a0a2df2 /philo_one/src/routine.c | |
| parent | a69a877b3a2758aafe3de0db87a56063b28ed00f (diff) | |
| download | philosophers-ebbd81e4312d945b359d2761acfeb613da1f98c8.tar.gz philosophers-ebbd81e4312d945b359d2761acfeb613da1f98c8.tar.bz2 philosophers-ebbd81e4312d945b359d2761acfeb613da1f98c8.zip | |
Added antidead lock in philo_one
Diffstat (limited to 'philo_one/src/routine.c')
| -rw-r--r-- | philo_one/src/routine.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/philo_one/src/routine.c b/philo_one/src/routine.c index 05304fe..340f3b7 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/08 18:52:48 by charles ### ########.fr */ +/* Updated: 2021/01/09 14:32:33 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -39,20 +39,22 @@ void *routine_philo(t_philo *arg) pthread_mutex_lock(&arg->mutex_start); if (philo_finished(arg->conf)) return (NULL); - /* if (arg->conf->philo_num % 2 == 0 && arg->id % 2 == 0) */ - /* usleep(1000); */ - /* if (arg->conf->philo_num % 2 == 1 && arg->id % 3 == 0) */ - /* usleep(1000); */ - /* if (arg->conf->philo_num % 2 == 1 && arg->id % 3 == 1) */ - /* usleep(2000); */ arg->time_last_eat = h_time_now(); if (pthread_create(&thread_death, NULL, (t_routine)routine_death, arg) != 0) return (NULL); arg->time_last_eat = h_time_now(); while (!philo_finished(arg->conf)) { - event_take_fork(arg); - /* arg->time_last_eat = h_time_now(); */ + if (arg->id % 2 == 0) + { + event_take_fork(arg, arg->fork_left); + event_take_fork(arg, arg->fork_right); + } + else + { + event_take_fork(arg, arg->fork_right); + event_take_fork(arg, arg->fork_left); + } event_eat(arg); eat_counter++; st_check_meal_num_finished(arg, eat_counter); @@ -67,7 +69,7 @@ void *routine_death(t_philo *arg) { while (!philo_finished(arg->conf) && h_time_now() - arg->time_last_eat < arg->conf->timeout_death) - usleep(500); + usleep(1000); event_die(arg); return (NULL); } |