From 40357b94a218ae7ba75db595e96a0eff7ccab4b1 Mon Sep 17 00:00:00 2001
From: Alexandre POMMIER <apommier@e2r3p6.clusters.42paris.fr>
Date: Wed, 2 Mar 2022 19:26:22 +0100
Subject: [PATCH] school

---
 main.c         | 24 ++++++++++++++----------
 philosophers.h | 16 ++++++++++------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/main.c b/main.c
index 7b40ca2..0838a7a 100644
--- a/main.c
+++ b/main.c
@@ -16,6 +16,7 @@ s_arg	*create_data(int argc, char **argv)
 {
 	s_arg	*data;
 
+	usleep(1500000);
 	data = malloc(sizeof(s_arg));
 	*data->death = 1;
 	data->nb_full_philo = 0;
@@ -40,7 +41,6 @@ void	exit_philo(s_philo *philo, s_arg *data)
 	{
 		pthread_mutex_destroy(philo[i].left_fork);
 		free(philo[i].left_fork);
-		//pthread_
 		i++;
 	}
 	pthread_mutex_destroy(philo[i].left_fork);
@@ -89,17 +89,19 @@ void	*death_checker(s_philo *philo, s_arg *data)
 	int i;
 
 	i = 0;
-	while (1)
+	while (*data->death)
 	{
 		i = -1;
-		while (i++ < data->nb_philo - 1 && philo[i].data->death)
+		while (i++ < data->nb_philo - 1 && *data->death && *philo[i].last_eat)
 		{
-			if (get_time() - *philo[i].last_eat > data->time_to_die && philo[i].must_eat)
+			if ((get_time() - *philo[i].last_eat) > data->time_to_die && philo[i].must_eat)
 			{
 				*philo[i].data->death = 0;
 				pthread_mutex_lock(philo->display);
-				printf("%ldms Philo N°%d is died\n", get_time() - data->time_start, philo[i].philo_id);
+				printf("%ldms Philo N°%d is died\n",
+					get_time() - data->time_start, philo[i].philo_id);
 				printf("End: one philo died\n");
+				printf("time_to_die: %d TIME: %ld start: %ld philo.start: %ld last_eat: %ld condition: %ld\n", data->time_to_die ,get_time(), data->time_start , philo[i].data->time_start, get_time() - *philo[i].last_eat ,get_time() - *philo[i].last_eat);
 				exit_philo(philo, data);
 			}
 			else if (data->nb_full_philo == data->nb_philo)
@@ -116,20 +118,21 @@ void	*death_checker(s_philo *philo, s_arg *data)
 void	*routine(void *tmp)
 {
 	s_philo *philo;
-	pthread_t	death;
 
 	philo = (s_philo *)tmp;
 	*philo->last_eat = get_time();
-	//if (philo->philo_id % 2)
-	//	usleep(15000);
-	while (1 && *philo->data->death && philo->must_eat && philo->data->nb_full_philo != philo->data->nb_philo)
+	if (philo->philo_id % 2)
+		usleep(15000);
+	while (*philo->data->death && philo->must_eat
+		&& philo->data->nb_full_philo != philo->data->nb_philo)
 	{
 		philo_eat(philo);
 		philo->must_eat--;
 		if (!philo->must_eat)
 			philo->data->nb_full_philo++;
 	}
-	return (0); 
+	printf("philo n%d return\n", philo->philo_id);
+	return (0);
 }
 
 s_philo *create_philo(s_arg *data)
@@ -148,6 +151,7 @@ s_philo *create_philo(s_arg *data)
 	pthread_mutex_init(display, 0);
 	while (i < data->nb_philo)
 	{
+		*philo[i].last_eat = 0; 
 		philo[i].display = display;
 		philo[i].philo_id = i + 1;
 		philo[i].data = data;
diff --git a/philosophers.h b/philosophers.h
index 09a7f55..f7cfbc6 100644
--- a/philosophers.h
+++ b/philosophers.h
@@ -10,12 +10,14 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <unistd.h>
+#ifndef PHILOSOPHERS_H
+# define PHILOSOPHERS_H
 
+# include <pthread.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <sys/time.h>
+# include <unistd.h>
 
 typedef struct s_list
 {
@@ -44,4 +46,6 @@ typedef struct t_list
 
 //utils fonctions
 long	ft_atoi(const char *nptr);
-long	get_time(void);
\ No newline at end of file
+long	get_time(void);
+
+#endif
\ No newline at end of file