From 99f67bde096ad84dad5b41bc779ae2ad2d807e6f Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 30 Sep 2020 10:35:23 +0200 Subject: Renaming io_* -> event_*, Changed philo_put with only 1 write call --- philo_one/src/event.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++ philo_one/src/io.c | 71 ----------------------------------------------- philo_one/src/philo_one.h | 10 +++---- philo_one/src/routine.c | 14 +++++----- 4 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 philo_one/src/event.c delete mode 100644 philo_one/src/io.c (limited to 'philo_one/src') diff --git a/philo_one/src/event.c b/philo_one/src/event.c new file mode 100644 index 0000000..8952212 --- /dev/null +++ b/philo_one/src/event.c @@ -0,0 +1,71 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* io.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ +/* Updated: 2020/09/30 09:43:31 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "philo_one.h" + +void event_take_fork(t_philo *arg, pthread_mutex_t *fork) +{ + pthread_mutex_lock(fork); + pthread_mutex_lock(&arg->conf->mutex_stdout); + if (!arg->conf->all_alive) + return ; + philo_put(arg->id, EVENT_FORK); + pthread_mutex_unlock(&arg->conf->mutex_stdout); +} + +void event_eat(t_philo *arg) +{ + int eat_counter; + + eat_counter = 0; + while (eat_counter < arg->conf->meal_num) + { + pthread_mutex_lock(&arg->conf->mutex_stdout); + if (!arg->conf->all_alive) + return ; + philo_put(arg->id, EVENT_EAT); + pthread_mutex_unlock(&arg->conf->mutex_stdout); + usleep(arg->conf->timeout_eat * 1000); + eat_counter++; + } +} + +void event_think(t_philo *arg) +{ + pthread_mutex_lock(&arg->conf->mutex_stdout); + if (!arg->conf->all_alive) + return ; + philo_put(arg->id, EVENT_THINK); + pthread_mutex_unlock(&arg->conf->mutex_stdout); +} + +void event_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left) +{ + pthread_mutex_lock(&arg->conf->mutex_stdout); + if (!arg->conf->all_alive) + return ; + philo_put(arg->id, EVENT_SLEEP); + pthread_mutex_unlock(&arg->conf->mutex_stdout); + pthread_mutex_unlock(fork_right); + pthread_mutex_unlock(fork_left); + usleep(arg->conf->timeout_sleep * 1000); +} + +void event_die(t_philo *arg) +{ + pthread_mutex_lock(&arg->conf->mutex_stdout); + if (!arg->conf->all_alive) + return ; + arg->conf->all_alive = false; + philo_put(arg->id, EVENT_DIE); + pthread_mutex_unlock(&arg->conf->mutex_stdout); +} diff --git a/philo_one/src/io.c b/philo_one/src/io.c deleted file mode 100644 index b5bf82e..0000000 --- a/philo_one/src/io.c +++ /dev/null @@ -1,71 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* io.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2020/09/30 09:43:31 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "philo_one.h" - -void io_take_fork(t_philo *arg, pthread_mutex_t *fork) -{ - pthread_mutex_lock(fork); - pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) - return ; - philo_put(arg->id, EVENT_FORK); - pthread_mutex_unlock(&arg->conf->mutex_stdout); -} - -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_stdout); - if (!arg->conf->all_alive) - return ; - philo_put(arg->id, EVENT_EAT); - pthread_mutex_unlock(&arg->conf->mutex_stdout); - usleep(arg->conf->timeout_eat * 1000); - eat_counter++; - } -} - -void io_think(t_philo *arg) -{ - pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) - return ; - philo_put(arg->id, EVENT_THINK); - pthread_mutex_unlock(&arg->conf->mutex_stdout); -} - -void io_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left) -{ - pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) - return ; - philo_put(arg->id, EVENT_SLEEP); - pthread_mutex_unlock(&arg->conf->mutex_stdout); - pthread_mutex_unlock(fork_right); - pthread_mutex_unlock(fork_left); - usleep(arg->conf->timeout_sleep * 1000); -} - -void io_die(t_philo *arg) -{ - pthread_mutex_lock(&arg->conf->mutex_stdout); - if (!arg->conf->all_alive) - return ; - arg->conf->all_alive = false; - philo_put(arg->id, EVENT_DIE); - pthread_mutex_unlock(&arg->conf->mutex_stdout); -} diff --git a/philo_one/src/philo_one.h b/philo_one/src/philo_one.h index 9fc5e5f..cb41b77 100644 --- a/philo_one/src/philo_one.h +++ b/philo_one/src/philo_one.h @@ -76,10 +76,10 @@ void *routine_death(t_philo *arg); ** io.c */ -void io_take_fork(t_philo *arg, pthread_mutex_t *fork); -void io_eat(t_philo *arg); -void io_think(t_philo *arg); -void io_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left); -void io_die(t_philo *arg); +void event_take_fork(t_philo *arg, pthread_mutex_t *fork); +void event_eat(t_philo *arg); +void event_think(t_philo *arg); +void event_sleep(t_philo *arg, pthread_mutex_t *fork_right, pthread_mutex_t *fork_left); +void event_die(t_philo *arg); #endif diff --git a/philo_one/src/routine.c b/philo_one/src/routine.c index 5f76a26..c1a7a4f 100644 --- a/philo_one/src/routine.c +++ b/philo_one/src/routine.c @@ -21,15 +21,15 @@ 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); - io_think(arg); + event_think(arg); while (arg->conf->all_alive) { - io_take_fork(arg, arg->fork_left); - io_take_fork(arg, arg->fork_right); + event_take_fork(arg, arg->fork_left); + event_take_fork(arg, arg->fork_right); arg->time_last_eat = h_time_now(); - io_eat(arg); - io_sleep(arg, arg->fork_right, arg->fork_left); - io_think(arg); + event_eat(arg); + event_sleep(arg, arg->fork_right, arg->fork_left); + event_think(arg); } pthread_join(thread_death, NULL); return (NULL); @@ -45,6 +45,6 @@ void *routine_death(t_philo *arg) current = h_time_now(); if (!arg->conf->all_alive) return (NULL); - io_die(arg); + event_die(arg); return (NULL); } -- cgit