From 6a1e91750ee43fccb6160af0f44139698c8dfdc3 Mon Sep 17 00:00:00 2001 From: Charles Date: Sat, 15 Feb 2020 00:36:04 +0100 Subject: philo_two working (again with the hack?) --- philo_one/Makefile | 19 +++++++++++----- philo_one/fork.c | 9 +++++++- philo_one/io.c | 45 ++++++++++++++++++++++++++++++++++++ philo_one/philo_one.h | 12 +++++++++- philo_one/routine.c | 63 ++++++++------------------------------------------- 5 files changed, 87 insertions(+), 61 deletions(-) create mode 100644 philo_one/io.c (limited to 'philo_one') diff --git a/philo_one/Makefile b/philo_one/Makefile index b630f40..1bab8d6 100644 --- a/philo_one/Makefile +++ b/philo_one/Makefile @@ -6,7 +6,7 @@ # By: cacharle +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/11/24 05:50:15 by cacharle #+# #+# # -# Updated: 2020/02/14 19:53:14 by cacharle ### ########.fr # +# Updated: 2020/02/14 22:48:10 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -15,7 +15,7 @@ RM = rm -f COMMON_DIR = ../common CC = gcc -CCFLAGS = -g -I$(COMMON_DIR) -Wall -Wextra #-Werror +CCFLAGS = -I$(COMMON_DIR) -Wall -Wextra #-Werror LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon NAME = philo_one @@ -23,22 +23,29 @@ NAME = philo_one SRC = main.c \ philo.c \ fork.c \ - routine.c + routine.c \ + io.c OBJ = $(SRC:.c=.o) all: $(NAME) -$(NAME): $(OBJ) +$(NAME): common_all $(OBJ) $(CC) -o $@ $(OBJ) $(LDFLAGS) %.o: %.c - $(CC) $(CCFLAGS) -c -o $@ $^ + $(CC) $(CCFLAGS) -c -o $@ $< -clean: +clean: common_fclean $(RM) $(OBJ) fclean: clean $(RM) $(NAME) re: fclean all + +common_all: + make -C $(COMMON_DIR) all + +common_fclean: + make -C $(COMMON_DIR) fclean diff --git a/philo_one/fork.c b/philo_one/fork.c index fd7ee90..ed1d642 100644 --- a/philo_one/fork.c +++ b/philo_one/fork.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/09 23:46:40 by cacharle #+# #+# */ -/* Updated: 2020/02/14 21:18:02 by cacharle ### ########.fr */ +/* Updated: 2020/02/14 21:31:40 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -58,3 +58,10 @@ t_routine_arg *forks_dispatch(t_philo *philos, t_fork *forks, t_philo_args *args } return (routine_args); } + +void fork_switch(t_fork *fork) +{ + pthread_mutex_lock(&fork->mutex); + fork->used = !fork->used; + pthread_mutex_unlock(&fork->mutex); +} diff --git a/philo_one/io.c b/philo_one/io.c new file mode 100644 index 0000000..846c830 --- /dev/null +++ b/philo_one/io.c @@ -0,0 +1,45 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* io.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */ +/* Updated: 2020/02/14 21:42:30 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "philo_one.h" + +void io_eat(t_routine_arg *arg) +{ + pthread_mutex_lock(&arg->args->mutex_stdout); + if (arg->args->all_alive) + philo_eat(arg->philo->id, arg->args->timeout_eat); + pthread_mutex_unlock(&arg->args->mutex_stdout); +} + +void io_think(t_routine_arg *arg) +{ + pthread_mutex_lock(&arg->args->mutex_stdout); + if (arg->args->all_alive) + philo_think(arg->philo->id); + pthread_mutex_unlock(&arg->args->mutex_stdout); +} + +void io_sleep(t_routine_arg *arg) +{ + pthread_mutex_lock(&arg->args->mutex_stdout); + if (arg->args->all_alive) + philo_sleep(arg->philo->id, arg->args->timeout_sleep); + pthread_mutex_unlock(&arg->args->mutex_stdout); +} + +void io_die(t_routine_arg *arg) +{ + pthread_mutex_lock(&arg->args->mutex_stdout); + if (arg->args->all_alive) + philo_die(arg->philo->id); + pthread_mutex_unlock(&arg->args->mutex_stdout); +} diff --git a/philo_one/philo_one.h b/philo_one/philo_one.h index 486cfeb..d7c1aef 100644 --- a/philo_one/philo_one.h +++ b/philo_one/philo_one.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/24 06:11:16 by cacharle #+# #+# */ -/* Updated: 2020/02/14 20:23:15 by cacharle ### ########.fr */ +/* Updated: 2020/02/14 21:37:45 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -65,6 +65,7 @@ typedef struct t_fork *forks_new(int num); void forks_destroy(t_fork *forks, int num); t_routine_arg *forks_dispatch(t_philo *philos, t_fork *forks, t_philo_args *args); +void fork_switch(t_fork *fork); /* ** philo.c @@ -83,4 +84,13 @@ t_bool philos_starved(t_philo *philos, int num); void *routine_philo(void *void_arg); void *routine_death(void *void_arg); +/* +** io.c +*/ + +void io_eat(t_routine_arg *arg); +void io_think(t_routine_arg *arg); +void io_sleep(t_routine_arg *arg); +void io_die(t_routine_arg *arg); + #endif diff --git a/philo_one/routine.c b/philo_one/routine.c index c9e2339..7954174 100644 --- a/philo_one/routine.c +++ b/philo_one/routine.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/10 01:11:27 by cacharle #+# #+# */ -/* Updated: 2020/02/14 21:22:52 by cacharle ### ########.fr */ +/* Updated: 2020/02/14 21:43:37 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,53 +18,23 @@ void *routine_philo(void *void_arg) pthread_t thread_death; arg = (t_routine_arg*)void_arg; - if (!arg->args->all_alive) return (NULL); arg->philo->time_last_eat = h_time_now(); if (pthread_create(&thread_death, NULL, routine_death, arg) != 0) return (NULL); - if (!arg->args->all_alive) - return (NULL); - pthread_mutex_lock(&arg->args->mutex_stdout); - if (arg->args->all_alive) - philo_think(arg->philo->id); - pthread_mutex_unlock(&arg->args->mutex_stdout); + io_think(arg); while (arg->args->all_alive) - { if (!arg->fork_left->used && !arg->fork_right->used) { - pthread_mutex_lock(&arg->fork_left->mutex); - pthread_mutex_lock(&arg->fork_right->mutex); - arg->fork_left->used = TRUE; - arg->fork_right->used = TRUE; - pthread_mutex_unlock(&arg->fork_left->mutex); - pthread_mutex_unlock(&arg->fork_right->mutex); - - arg->philo->time_last_eat = h_time_now(); - pthread_mutex_lock(&arg->args->mutex_stdout); - if (arg->args->all_alive) - philo_eat(arg->philo->id, arg->args->timeout_eat); - pthread_mutex_unlock(&arg->args->mutex_stdout); - - pthread_mutex_lock(&arg->fork_left->mutex); - pthread_mutex_lock(&arg->fork_right->mutex); - arg->fork_left->used = FALSE; - arg->fork_right->used = FALSE; - pthread_mutex_unlock(&arg->fork_left->mutex); - pthread_mutex_unlock(&arg->fork_right->mutex); - - pthread_mutex_lock(&arg->args->mutex_stdout); - if (arg->args->all_alive) - philo_sleep(arg->philo->id, arg->args->timeout_sleep); - pthread_mutex_unlock(&arg->args->mutex_stdout); - - pthread_mutex_lock(&arg->args->mutex_stdout); - if (arg->args->all_alive) - philo_think(arg->philo->id); - pthread_mutex_unlock(&arg->args->mutex_stdout); + fork_switch(arg->fork_left); + fork_switch(arg->fork_right); + io_eat(arg); + fork_switch(arg->fork_left); + fork_switch(arg->fork_right); + io_sleep(arg); + io_think(arg); } - } pthread_join(thread_death, NULL); return (NULL); } @@ -74,27 +44,14 @@ void *routine_death(void *void_arg) t_routine_arg *arg; t_time current; - /* if (!arg->args->all_alive) */ - /* return (NULL); */ arg = (t_routine_arg*)void_arg; - current = h_time_now(); - /* pthread_mutex_lock(&arg->args->mutex_stdout); */ - /* printf("===\n"); */ - /* printf("%d crr %ld\n", arg->philo->id, current); */ - /* printf("%d lst %ld\n", arg->philo->id, arg->philo->time_last_eat); */ - /* printf("%d dif %ld\n", arg->philo->id, current - arg->philo->time_last_eat); */ - /* printf("===\n"); */ - /* pthread_mutex_unlock(&arg->args->mutex_stdout); */ while (arg->args->all_alive && current - arg->philo->time_last_eat < arg->args->timeout_death) current = h_time_now(); - pthread_mutex_lock(&arg->args->mutex_stdout); + io_die(arg); pthread_mutex_lock(&arg->args->mutex_all_alive); - if (arg->args->all_alive) - philo_die(arg->philo->id); arg->args->all_alive = FALSE; pthread_mutex_unlock(&arg->args->mutex_all_alive); - pthread_mutex_unlock(&arg->args->mutex_stdout); return (NULL); } -- cgit