1 files changed, 34 insertions, 68 deletions

diff --git a/philo_two/src/main.c b/philo_two/src/main.c
index 197ee5c..2861536 100644
--- a/philo_two/src/main.c
+++ b/philo_two/src/main.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/14 22:45:23 by cacharle          #+#    #+#             */
-/*   Updated: 2021/01/10 10:18:12 by cacharle         ###   ########.fr       */
+/*   Updated: 2021/01/10 13:39:54 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,23 +19,18 @@
 #define PHILO_SEM_GRAB_NAME     "semaphore_philo_two_grab"
 #define PHILO_SEM_MEAL_NUM_NAME "semaphore_philo_two_meal_num"
 
-static int	st_destroy(
-	t_philo *philos,
-	pthread_t *threads)
+static int	st_destroy(t_philo *philos, long int philo_num)
 {
-	/* 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)); */
+	while (philo_num-- > 0)
+		sem_unlink(philo_sem_eat_name(
+				PHILO_SEM_EAT_PREFIX, philos[philo_num].id));
 	free(philos);
-	free(threads);
 	return (1);
 }
 
@@ -46,48 +41,37 @@ static bool	st_sem_create(const char *name, unsigned int value, sem_t **sem)
 			!= SEM_FAILED);
 }
 
-void		*routine_flush(t_philo_conf *conf)
+static int	st_setup(t_philo_conf *conf, t_philo **philos)
 {
-	while (true)
-	{
-		sem_wait(conf->sem_stdout);
-		philo_put_flush();
-		sem_post(conf->sem_stdout);
-		usleep(250000);
-	}
+	if (!st_sem_create(PHILO_SEM_NAME, conf->philo_num, &conf->sem_forks) ||
+		!st_sem_create(PHILO_SEM_STDOUT_NAME, 1, &conf->sem_stdout) ||
+		!st_sem_create(PHILO_SEM_FINISH_NAME, 1, &conf->sem_finish) ||
+		!st_sem_create(PHILO_SEM_START_NAME,
+			conf->philo_num, &conf->sem_start) ||
+		!st_sem_create(PHILO_SEM_GRAB_NAME, 1, &conf->sem_grab) ||
+		!st_sem_create(PHILO_SEM_MEAL_NUM_NAME,
+			conf->philo_num, &conf->sem_meal_num))
+		return (st_destroy(NULL, 0));
+	if ((*philos = routine_create_philos(conf)) == NULL)
+		return (st_destroy(NULL, 0));
+	return (0);
 }
 
-static int	st_setup(
-	t_philo_conf *conf,
-	t_philo **philos,
-	pthread_t **threads)
+static int	st_start(t_philo_conf *conf, t_philo *philos)
 {
 	long int	i;
+	pthread_t	thread;
 
-	if (!st_sem_create(PHILO_SEM_NAME, conf->philo_num, &conf->sem_forks) ||
-		!st_sem_create(PHILO_SEM_STDOUT_NAME, 1, &conf->sem_stdout) ||
-		!st_sem_create(PHILO_SEM_FINISH_NAME, 1, &conf->sem_finish) ||
-		!st_sem_create(PHILO_SEM_MEAL_NUM_NAME, conf->philo_num, &conf->sem_meal_num) ||
-		!st_sem_create(PHILO_SEM_START_NAME, conf->philo_num, &conf->sem_start) ||
-		!st_sem_create(PHILO_SEM_GRAB_NAME, 1, &conf->sem_grab))
-		return (1);
-	*threads = NULL;
-	if ((*philos = routine_create_philos(conf)) == NULL ||
-		(*threads = malloc(sizeof(pthread_t) * conf->philo_num)) == NULL)
-		return (st_destroy(*philos, *threads));
 	i = -1;
 	while (++i < conf->philo_num)
 		sem_wait(conf->sem_start);
 	i = -1;
 	while (++i < conf->philo_num)
 	{
-		if (pthread_create(*threads + i, NULL,
-				(t_routine)routine_philo, *philos + i) != 0)
-		{
-			while (--i >= 0)
-				pthread_detach((*threads)[i]);
-			return (st_destroy(*philos, *threads));
-		}
+		if (pthread_create(&thread, NULL,
+				(t_routine)routine_philo, philos + i) != 0)
+			return (st_destroy(philos, conf->philo_num));
+		pthread_detach(thread);
 	}
 	conf->initial_time = h_time_now();
 	i = -1;
@@ -96,48 +80,30 @@ static int	st_setup(
 	return (0);
 }
 
-static void	*st_routine_meal_num(t_philo_conf *conf)
-{
-	long int	i;
-
-	if (conf->meal_num == -1)
-		return (NULL);
-	i = -1;
-	while (++i < conf->philo_num)
-		sem_wait(conf->sem_meal_num);
-	i = -1;
-	while (++i < conf->philo_num)
-		sem_wait(conf->sem_meal_num);
-	sem_wait(conf->sem_stdout);
-	sem_post(conf->sem_finish);
-	return (NULL);
-}
-
 int			main(int argc, char **argv)
 {
-	long int		i;
 	t_philo_conf	conf;
 	t_philo			*philos;
-	pthread_t		*threads;
+	pthread_t		thread_flush;
+	pthread_t		thread_meal_num;
 
 	if (!parse_args((t_philo_args *)&conf, argc, argv))
 		return (1);
 	if (conf.philo_num == 0 || conf.meal_num == 0)
 		return (0);
-	if (st_setup(&conf, &philos, &threads) != 0)
+	if (st_setup(&conf, &philos) != 0 || st_start(&conf, philos) != 0)
 		return (1);
-	pthread_t thread_flush;
-	pthread_create(&thread_flush, NULL, (t_routine)routine_flush, (void*)&conf);
+	if (pthread_create(&thread_flush, NULL,
+			(t_routine)routine_flush, &conf) != 0)
+		return (st_destroy(philos, conf.philo_num));
 	pthread_detach(thread_flush);
-	pthread_t thread_meal_num;
-	pthread_create(&thread_meal_num, NULL, (t_routine)st_routine_meal_num, (void*)&conf);
+	if (pthread_create(&thread_meal_num, NULL,
+			(t_routine)routine_meal_num, &conf) != 0)
+		return (st_destroy(philos, conf.philo_num));
 	pthread_detach(thread_meal_num);
 	sem_wait(conf.sem_finish);
 	sem_wait(conf.sem_finish);
 	philo_put_flush();
-	i = -1;
-	while (++i < conf.philo_num)
-		pthread_detach(threads[i]);
-	st_destroy(philos, threads);
+	st_destroy(philos, conf.philo_num);
 	return (0);
 }