philo_two working (again with the hack?)

5 files changed, 237 insertions, 8 deletions

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);
+}