Update simulation and fix norme errors

1 files changed, 30 insertions, 27 deletions

diff --git a/philo/include/philo.h b/philo/include/philo.h
index fbcf53f..bbc1bc2 100644
--- a/philo/include/philo.h
+++ b/philo/include/philo.h
@@ -6,51 +6,54 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/17 10:23:19 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/18 17:09:50 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/26 12:05:33 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef PHILO_H
 # define PHILO_H
 
-# include <unistd.h>
-# include <stdlib.h>
-# include <stdio.h>
-# include <pthread.h>
 # include "ft_utils.h"
+# include <pthread.h>
+# include <stdio.h>
+# include <stdlib.h>
+# include <unistd.h>
 
 # define ERR_USAGE "Usage: <nbr_of_philos> <ttd> <tte> <tts> [times_must_eat]"
 # define ERR_MALLOC "Memory allocation failed"
 
 typedef struct s_fork
 {
-    int available;
-    pthread_mutex_t mutex;
-} t_fork;
+	int				owner;
+	pthread_mutex_t	mutex;
+}					t_fork;
 
 typedef struct s_phdata
 {
-    int nbr_of_philos;
-    int time_to_die;
-    int time_to_eat;
-    int time_to_sleep;
-    int times_must_eat;
-    int philos_must_eat;
-    pthread_mutex_t pme_mutex;
-    int simulation_running;
-    t_fork *forks;
-} t_phdata;
+	int				nbr_of_philos;
+	int				time_to_die;
+	int				time_to_eat;
+	int				time_to_sleep;
+	int				times_must_eat;
+	int				philos_must_eat;
+	pthread_mutex_t	pme_mutex;
+	int				simulation_running;
+	t_fork			*forks;
+}					t_phdata;
 
 typedef struct s_philo
 {
-    int id;
-    int last_time_eaten;
-    int times_must_eat;
-    int is_alive;
-    pthread_t thread;
-    t_phdata *data;
-} t_philo;
-
-int run_simulation(int nbr_of_philos, t_philo *philos, t_phdata *data);
+	int				id;
+	int				last_time_eaten;
+	int				times_must_eat;
+	int				is_alive;
+	pthread_t		thread;
+	t_phdata		*data;
+}					t_philo;
+
+int					run_simulation(int nbr_of_philos, t_philo *philos,
+						t_phdata *data);
+int					philo_die(t_philo *philo);
+void				philo_eat(t_philo *philo);
 
 #endif