From eb2cfb574efafcf2c3c6200d1cd2de700ec8ddfb Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Sun, 10 Jan 2021 10:54:04 +0100 Subject: Fixing bad performance at school by adding more delay to the death checking loop, Added mutex/semaphore to protect against eating and dying at the same time --- philo_two/src/event.c | 5 ++++- philo_two/src/main.c | 7 ++++++- philo_two/src/philo_two.h | 3 ++- philo_two/src/routine.c | 30 ++++++++++++++++++++---------- 4 files changed, 32 insertions(+), 13 deletions(-) (limited to 'philo_two/src') diff --git a/philo_two/src/event.c b/philo_two/src/event.c index 2fc1249..4b86b15 100644 --- a/philo_two/src/event.c +++ b/philo_two/src/event.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ -/* Updated: 2021/01/09 15:18:24 by charles ### ########.fr */ +/* Updated: 2021/01/10 10:24:44 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,9 +22,12 @@ void event_take_fork(t_philo *arg) void event_eat(t_philo *arg) { + sem_wait(arg->sem_eat); sem_wait(arg->conf->sem_stdout); philo_put(arg->id, EVENT_EAT, arg->conf->initial_time); sem_post(arg->conf->sem_stdout); + arg->time_last_eat = h_time_now(); + sem_post(arg->sem_eat); h_sleep(arg->conf->timeout_eat); } diff --git a/philo_two/src/main.c b/philo_two/src/main.c index fb441dc..197ee5c 100644 --- a/philo_two/src/main.c +++ b/philo_two/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 22:45:23 by cacharle #+# #+# */ -/* Updated: 2021/01/09 15:35:47 by charles ### ########.fr */ +/* Updated: 2021/01/10 10:18:12 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,12 +23,17 @@ static int st_destroy( t_philo *philos, pthread_t *threads) { + /* long int i; */ + sem_unlink(PHILO_SEM_NAME); sem_unlink(PHILO_SEM_STDOUT_NAME); sem_unlink(PHILO_SEM_FINISH_NAME); sem_unlink(PHILO_SEM_MEAL_NUM_NAME); sem_unlink(PHILO_SEM_START_NAME); sem_unlink(PHILO_SEM_GRAB_NAME); + /* i = -1; */ + /* while (++i < philos[0].conf->philo_num) */ + /* sem_unlink(philo_sem_eat_name(philo[i].id)); */ free(philos); free(threads); return (1); diff --git a/philo_two/src/philo_two.h b/philo_two/src/philo_two.h index b2b723e..0126430 100644 --- a/philo_two/src/philo_two.h +++ b/philo_two/src/philo_two.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 22:47:23 by cacharle #+# #+# */ -/* Updated: 2021/01/09 15:17:40 by charles ### ########.fr */ +/* Updated: 2021/01/10 10:03:58 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,6 +43,7 @@ typedef struct long int id; t_philo_conf *conf; t_time time_last_eat; + sem_t *sem_eat; } t_philo; /* diff --git a/philo_two/src/routine.c b/philo_two/src/routine.c index c491a0a..ab01958 100644 --- a/philo_two/src/routine.c +++ b/philo_two/src/routine.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 23:00:07 by cacharle #+# #+# */ -/* Updated: 2021/01/09 15:17:32 by charles ### ########.fr */ +/* Updated: 2021/01/10 10:30:04 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,7 +28,6 @@ void *routine_philo(t_philo *arg) event_take_fork(arg); event_take_fork(arg); sem_post(arg->conf->sem_grab); - arg->time_last_eat = h_time_now(); event_eat(arg); if (arg->conf->meal_num != -1 && ++eat_counter == arg->conf->meal_num) { @@ -45,22 +44,25 @@ void *routine_philo(t_philo *arg) void *routine_death(t_philo *arg) { - t_time current; - - current = h_time_now(); - while (current - arg->time_last_eat < arg->conf->timeout_death) + while (true) { - current = h_time_now(); - usleep(1000); + sem_wait(arg->sem_eat); + if (h_time_now() - arg->time_last_eat > arg->conf->timeout_death) + break ; + sem_post(arg->sem_eat); + usleep(2000); } event_die(arg); return (NULL); } +#define PHILO_SEM_EAT_PREFIX "semaphore_philo_two_eat_" + t_philo *routine_create_philos(t_philo_conf *conf) { - int i; - t_philo *philos; + long int i; + t_philo *philos; + const char *name; if ((philos = malloc(sizeof(t_philo) * conf->philo_num)) == NULL) return (NULL); @@ -69,6 +71,14 @@ t_philo *routine_create_philos(t_philo_conf *conf) { philos[i].id = i + 1; philos[i].conf = conf; + name = philo_sem_eat_name(PHILO_SEM_EAT_PREFIX, philos[i].id); + sem_unlink(name); + philos[i].sem_eat = sem_open(name, O_CREAT | O_EXCL, 0700, 1); + if (philos[i].sem_eat == SEM_FAILED) + { + free(philos); + return (NULL); + } } return (philos); } -- cgit