From 94d33564ee659d2fd0b084a4b4046e7b69ee0d9b Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 30 Sep 2020 09:52:21 +0200 Subject: Refactoring philo_one, removing mutex_all_alive and t_routine_args bloat --- philo_one/src/io.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'philo_one/src/io.c') diff --git a/philo_one/src/io.c b/philo_one/src/io.c index 43ae3e6..b5bf82e 100644 --- a/philo_one/src/io.c +++ b/philo_one/src/io.c @@ -6,73 +6,66 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2020/09/30 08:16:54 by cacharle ### ########.fr */ +/* Updated: 2020/09/30 09:43:31 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "philo_one.h" -void io_take_fork(t_routine_arg *arg, pthread_mutex_t *fork) +void io_take_fork(t_philo *arg, pthread_mutex_t *fork) { pthread_mutex_lock(fork); - pthread_mutex_lock(&arg->conf->mutex_all_alive); + pthread_mutex_lock(&arg->conf->mutex_stdout); if (!arg->conf->all_alive) return ; - pthread_mutex_lock(&arg->conf->mutex_stdout); - philo_put(arg->philo->id, EVENT_FORK); + philo_put(arg->id, EVENT_FORK); pthread_mutex_unlock(&arg->conf->mutex_stdout); - pthread_mutex_unlock(&arg->conf->mutex_all_alive); } -void io_eat(t_routine_arg *arg) +void io_eat(t_philo *arg) { int eat_counter; eat_counter = 0; while (eat_counter < arg->conf->meal_num) { - pthread_mutex_lock(&arg->conf->mutex_all_alive); + pthread_mutex_lock(&arg->conf->mutex_stdout); if (!arg->conf->all_alive) return ; - pthread_mutex_lock(&arg->conf->mutex_stdout); - philo_put(arg->philo->id, EVENT_EAT); + philo_put(arg->id, EVENT_EAT); pthread_mutex_unlock(&arg->conf->mutex_stdout); - pthread_mutex_unlock(&arg->conf->mutex_all_alive); usleep(arg->conf->timeout_eat * 1000); eat_counter++; } } -void io_think(t_routine_arg *arg) +void io_think(t_philo *arg) { - pthread_mutex_lock(&arg->conf->mutex_all_alive); + pthread_mutex_lock(&arg->conf->mutex_stdout); if (!arg->conf->all_alive) return ; - pthread_mutex_lock(&arg->conf->mutex_stdout); - philo_put(arg->philo->id, EVENT_THINK); + philo_put(arg->id, EVENT_THINK); pthread_mutex_unlock(&arg->conf->mutex_stdout); - pthread_mutex_unlock(&arg->conf->mutex_all_alive); } -void io_sleep(t_routine_arg *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left) +void io_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left) { - pthread_mutex_lock(&arg->conf->mutex_all_alive); + pthread_mutex_lock(&arg->conf->mutex_stdout); if (!arg->conf->all_alive) return ; - pthread_mutex_lock(&arg->conf->mutex_stdout); - philo_put(arg->philo->id, EVENT_SLEEP); + philo_put(arg->id, EVENT_SLEEP); pthread_mutex_unlock(&arg->conf->mutex_stdout); - pthread_mutex_unlock(&arg->conf->mutex_all_alive); pthread_mutex_unlock(fork_right); pthread_mutex_unlock(fork_left); usleep(arg->conf->timeout_sleep * 1000); } -void io_die(t_routine_arg *arg) +void io_die(t_philo *arg) { + pthread_mutex_lock(&arg->conf->mutex_stdout); if (!arg->conf->all_alive) return ; - pthread_mutex_lock(&arg->conf->mutex_stdout); - philo_put(arg->philo->id, EVENT_DIE); + arg->conf->all_alive = false; + philo_put(arg->id, EVENT_DIE); pthread_mutex_unlock(&arg->conf->mutex_stdout); } -- cgit