aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile8
-rw-r--r--philo_one/Makefile19
-rw-r--r--philo_one/fork.c9
-rw-r--r--philo_one/io.c45
-rw-r--r--philo_one/philo_one.h12
-rw-r--r--philo_one/routine.c63
-rw-r--r--philo_two/Makefile27
-rw-r--r--philo_two/io.c45
-rw-r--r--philo_two/main.c54
-rw-r--r--philo_two/philo_two.h45
-rw-r--r--philo_two/routine.c74
11 files changed, 328 insertions, 73 deletions
diff --git a/Makefile b/Makefile
index 24e240b..3a9fd90 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# By: cacharle <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2020/02/09 03:31:28 by cacharle #+# #+# #
-# Updated: 2020/02/14 00:48:59 by cacharle ### ########.fr #
+# Updated: 2020/02/14 22:44:40 by cacharle ### ########.fr #
# #
# **************************************************************************** #
@@ -29,13 +29,13 @@ common:
$(MAKE) $(MAKE_ARGS) -C $(COMMON_DIR)
.PHONY: philo_one
-philo_one: common
+philo_one:
$(MAKE) $(MAKE_ARGS) -C $(PHILO_ONE_DIR)
.PHONY: philo_two
-philo_two: common
+philo_two:
$(MAKE) $(MAKE_ARGS) -C $(PHILO_TWO_DIR)
.PHONY: philo_three
-philo_three: common
+philo_three:
$(MAKE) $(MAKE_ARGS) -C $(PHILO_THREE_DIR)
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 <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# 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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* 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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}
diff --git a/philo_two/Makefile b/philo_two/Makefile
index 8845406..53c06f4 100644
--- a/philo_two/Makefile
+++ b/philo_two/Makefile
@@ -6,33 +6,44 @@
# By: cacharle <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/11/24 05:50:15 by cacharle #+# #+# #
-# Updated: 2019/11/24 07:07:05 by cacharle ### ########.fr #
+# Updated: 2020/02/14 23:37:39 by cacharle ### ########.fr #
# #
# **************************************************************************** #
RM = rm -f
+COMMON_DIR = ../common
+
CC = gcc
-CCFLAGS = -Wall -Wextra #-Werror
-LDFLAGS = -lpthread
+CCFLAGS = -I$(COMMON_DIR) -Wall -Wextra #-Werror
+LDFLAGS = -lpthread -L$(COMMON_DIR) -lphilocommon
NAME = philo_two
-SRC = main.c
-OBJ = $(SRC:.c=.o)
+SRC = main.c \
+ io.c \
+ routine.c
+
+OBJ = $(SRC:.c=.o)
all: $(NAME)
-$(NAME): $(OBJ)
+$(NAME): common_all $(OBJ)
$(CC) $(LDFLAGS) -o $@ $(OBJ)
%.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_two/io.c b/philo_two/io.c
new file mode 100644
index 0000000..20aec03
--- /dev/null
+++ b/philo_two/io.c
@@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* io.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/14 23:37:50 by cacharle #+# #+# */
+/* Updated: 2020/02/14 23:50:10 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "philo_two.h"
+
+void io_eat(t_routine_arg *arg)
+{
+ pthread_mutex_lock(&arg->args->mutex_stdout);
+ if (arg->args->all_alive)
+ philo_eat(arg->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->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->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->id);
+ pthread_mutex_unlock(&arg->args->mutex_stdout);
+}
diff --git a/philo_two/main.c b/philo_two/main.c
new file mode 100644
index 0000000..17f5ab2
--- /dev/null
+++ b/philo_two/main.c
@@ -0,0 +1,54 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* main.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/14 22:45:23 by cacharle #+# #+# */
+/* Updated: 2020/02/15 00:34:26 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "philo_two.h"
+
+int main(int argc, char **argv)
+{
+ int i;
+ t_philo_args philo_args;
+ t_routine_arg *routine_args;
+ sem_t *forks;
+ pthread_t *threads;
+
+ if (!parse_args(&philo_args, argc, argv))
+ return (1);
+ forks = sem_open("philo_two", O_CREAT, 0700, philo_args.philo_num);
+ if (forks == SEM_FAILED)
+ return (1);
+ if ((routine_args = routine_args_create(&philo_args, forks)) == NULL)
+ return (1);
+ if ((threads = malloc(sizeof(pthread_t) * philo_args.philo_num)) == NULL)
+ return (1);
+ philo_args.all_alive = TRUE;
+ pthread_mutex_init(&philo_args.mutex_all_alive, NULL);
+ pthread_mutex_init(&philo_args.mutex_stdout, NULL);
+
+ i = -1;
+ while (++i < philo_args.philo_num)
+ if (pthread_create(threads + i, NULL, routine_philo, routine_args + i) < 0)
+ return (1);
+ while (philo_args.all_alive)
+ ;
+
+ i = -1;
+ while (++i < philo_args.philo_num)
+ pthread_join(threads[i], NULL);
+ sem_close(forks);
+ sem_unlink("philo_two");
+
+ pthread_mutex_destroy(&philo_args.mutex_stdout);
+ pthread_mutex_destroy(&philo_args.mutex_all_alive);
+ free(threads);
+ free(routine_args);
+ return (0);
+}
diff --git a/philo_two/philo_two.h b/philo_two/philo_two.h
new file mode 100644
index 0000000..d239e34
--- /dev/null
+++ b/philo_two/philo_two.h
@@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* philo_two.h :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/14 22:47:23 by cacharle #+# #+# */
+/* Updated: 2020/02/14 23:55:04 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#ifndef PHILO_TWO_H
+# define PHILO_TWO_H
+
+# include <pthread.h>
+# include <semaphore.h>
+# include "common.h"
+
+typedef struct
+{
+ int id;
+ t_philo_args *args;
+ t_time time_last_eat;
+ sem_t *forks;
+} t_routine_arg;
+
+/*
+** routine.c
+*/
+
+void *routine_philo(void *void_arg);
+void *routine_death(void *void_arg);
+t_routine_arg *routine_args_create(t_philo_args *philo_args, sem_t *forks);
+
+/*
+** 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_two/routine.c b/philo_two/routine.c
new file mode 100644
index 0000000..fefeb34
--- /dev/null
+++ b/philo_two/routine.c
@@ -0,0 +1,74 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* routine.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2020/02/14 23:00:07 by cacharle #+# #+# */
+/* Updated: 2020/02/15 00:35:26 by cacharle ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "philo_two.h"
+
+void *routine_philo(void *void_arg)
+{
+ t_routine_arg *arg;
+ pthread_t thread_death;
+
+ arg = (t_routine_arg*)void_arg;
+ io_think(arg);
+ if (!arg->args->all_alive)
+ return (NULL);
+ arg->time_last_eat = h_time_now();
+ if (pthread_create(&thread_death, NULL, routine_death, arg) != 0)
+ return (NULL);
+ while (arg->args->all_alive)
+ {
+ sem_wait(arg->forks);
+ sem_wait(arg->forks);
+ io_eat(arg);
+ sem_post(arg->forks);
+ sem_post(arg->forks);
+ arg->time_last_eat = h_time_now();
+ io_sleep(arg);
+ io_think(arg);
+ }
+ pthread_join(thread_death, NULL);
+ return (NULL);
+}
+
+void *routine_death(void *void_arg)
+{
+ t_routine_arg *arg;
+ t_time current;
+
+ arg = (t_routine_arg*)void_arg;
+ current = h_time_now();
+ while (arg->args->all_alive &&
+ current - arg->time_last_eat < arg->args->timeout_death)
+ current = h_time_now();
+ io_die(arg);
+ pthread_mutex_lock(&arg->args->mutex_all_alive);
+ arg->args->all_alive = FALSE;
+ pthread_mutex_unlock(&arg->args->mutex_all_alive);
+ return (NULL);
+}
+
+t_routine_arg *routine_args_create(t_philo_args *philo_args, sem_t *forks)
+{
+ int i;
+ t_routine_arg *routine_args;
+
+ if ((routine_args = malloc(sizeof(t_routine_arg) * philo_args->philo_num)) == NULL)
+ return (NULL);
+ i = -1;
+ while (++i < philo_args->philo_num)
+ {
+ routine_args[i].id = i + 1;
+ routine_args[i].forks = forks;
+ routine_args[i].args = philo_args;
+ }
+ return (routine_args);
+}
generated by cgit (git 2.34.1) at 2026-05-16 04:07:56 +0000