From f6e38aa3145682265c84487fb01ace835c8f17d0 Mon Sep 17 00:00:00 2001 From: Dominik Kaiser Date: Sat, 18 Jan 2025 11:21:35 +0100 Subject: [PATCH] Add structs and init --- philo/include/philo.h | 20 +++++++++++++++++++- philo/src/main.c | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/philo/include/philo.h b/philo/include/philo.h index 1ec9c3d..cfc832e 100644 --- a/philo/include/philo.h +++ b/philo/include/philo.h @@ -6,7 +6,7 @@ /* By: dkaiser [times_must_eat]" +# define ERR_MALLOC "Memory allocation failed" + +typedef struct s_fork +{ + int available; + pthread_mutex_t mutex; +} t_fork; typedef struct s_phdata { @@ -29,6 +36,17 @@ typedef struct s_phdata int time_to_eat; int time_to_sleep; int times_must_eat; + int simulation_running; + t_fork *forks; } t_phdata; +typedef struct s_philo +{ + int id; + int times_eaten; + int is_alive; + pthread_t thread; + t_phdata *data; +} t_philo; + #endif diff --git a/philo/src/main.c b/philo/src/main.c index e3b90ab..104f902 100644 --- a/philo/src/main.c +++ b/philo/src/main.c @@ -6,7 +6,7 @@ /* By: dkaiser times_must_eat = ft_atoi(argv[2]); else - data->times_must_eat = 0; + data->times_must_eat = -1; if (data->nbr_of_philos <= 0) return (ft_err("Must have at least one philosopher")); if (data->time_to_die < 0) @@ -31,14 +31,40 @@ int load_data(t_phdata *data, int argc, char *argv[]) return (ft_err("tte can't be negative")); if (data->time_to_sleep < 0) return (ft_err("tts can't be negative")); - if (data->times_must_eat < 0) - data->times_must_eat = 0; + return (EXIT_SUCCESS); +} + +int init(t_philo **philos, t_phdata *data) +{ + int i; + + *philos = (t_philo *)malloc(sizeof(t_philo) * data->nbr_of_philos); + if (*philos == NULL) + return (ft_err(ERR_MALLOC)); + data->forks = (t_fork *)malloc(sizeof(int) * data->nbr_of_philos); + if (data->forks == NULL) + { + free(*philos); + return (ft_err(ERR_MALLOC)); + } + i = 0; + while (i < data->nbr_of_philos) + { + (*philos)[i].id = i + 1; + (*philos)[i].is_alive = 1; + (*philos)[i].times_eaten = 0; + (*philos)[i].data = data; + data->forks[i].available = 1; + pthread_mutex_init(&(data->forks[i].mutex), NULL); + i++; + } return (EXIT_SUCCESS); } int main(int argc, char *argv[]) { t_phdata data; + t_philo *philos; int result; if (argc != 5 && argc != 6) @@ -46,5 +72,10 @@ int main(int argc, char *argv[]) result = load_data(&data, argc, argv); if (result != EXIT_SUCCESS) return (result); - return (EXIT_SUCCESS); + result = init(&philos, &data); + if (result != EXIT_SUCCESS) + return (result); + free(philos); + free(data.forks); + return (result); } -- 2.47.2