From bc40b571e9facee351c650647915bdd104aeeed0 Mon Sep 17 00:00:00 2001 From: hugogogo Date: Thu, 13 Jan 2022 08:53:27 +0100 Subject: [PATCH] correction loop chained list --- headers/philo_proto.h | 2 +- headers/philo_struct.h | 9 +++-- srcs/exec.c | 72 +++++++++++++++++++++++++------------- srcs/init.c | 79 +++++++++++++++++++++--------------------- srcs/main.c | 4 +-- 5 files changed, 96 insertions(+), 70 deletions(-) diff --git a/headers/philo_proto.h b/headers/philo_proto.h index c007515..4a26d36 100644 --- a/headers/philo_proto.h +++ b/headers/philo_proto.h @@ -1,7 +1,7 @@ #ifndef PHILO_PROTO_H # define PHILO_PROTO_H -pthread_mutex_t mutex; +// t_mtx mutex; // init.c t_philo *init(int ac, char **av, pthread_t **id); diff --git a/headers/philo_struct.h b/headers/philo_struct.h index dc2c9cb..a57aa78 100644 --- a/headers/philo_struct.h +++ b/headers/philo_struct.h @@ -1,20 +1,23 @@ #ifndef PHILO_STRUCT_H # define PHILO_STRUCT_H -typedef struct s_conditions +typedef pthread_mutex_t t_mtx; + +typedef struct s_params { int n_phi; // number_of_philosophers int t_die; // time_to_die int t_eat; // time_to_eat int t_slp; // time_to_sleep int n_eat; // [number_of_times_each_philosopher_must_eat] -} t_conditions; +} t_params; typedef struct s_philo { - t_conditions *conditions; + t_params *params; int philo_nbr; int fork; + t_mtx *msg_mtx; struct s_philo *prev; struct s_philo *next; } t_philo; diff --git a/srcs/exec.c b/srcs/exec.c index f4a385d..481c335 100644 --- a/srcs/exec.c +++ b/srcs/exec.c @@ -1,5 +1,21 @@ #include "philo.h" +int take_forks(t_philo *philo) +{ +// pthread_mutex_lock(&mutex); + while (philo->fork == 0 || philo->next->fork == 0) + continue ; + if (philo->fork == 1 && philo->next->fork == 1) + { + philo->fork = 0; + philo->next->fork = 0; + ft_printf("%i has taken a fork\n", philo->philo_nbr); + return (1); + } +// pthread_mutex_unlock(&mutex); + return (0); +} + void *philo_exec(void *arg) { t_philo *philo; @@ -8,6 +24,12 @@ void *philo_exec(void *arg) philo = (t_philo*)arg; nbr = philo->philo_nbr; + pthread_mutex_lock(philo->msg_mtx); +// pthread_mutex_lock(&mutex); + ft_printf("%i is thinking\n", philo->philo_nbr); + pthread_mutex_unlock(philo->msg_mtx); +// pthread_mutex_unlock(&mutex); + // eat // "has taken a fork" // "is eating" @@ -17,30 +39,32 @@ void *philo_exec(void *arg) // "is thinking" // die // "died" -int i = 0; - while (i < 2) - { - pthread_mutex_lock(&mutex); - if (philo->fork == 1 && philo->next->fork == 1) - { - philo->fork = 0; - philo->next->fork = 0; - ft_putnbr_fd(philo->philo_nbr, 1); - ft_putstr_fd(" has taken a fork\n", 1); - } - pthread_mutex_unlock(&mutex); +//int i = 0; +// while (i < 2) +// { +// if (!take_forks(philo)) +// continue ; +// +// usleep(philo->params->t_eat); +// +// pthread_mutex_lock(&mutex); +// philo->fork = 1; +// philo->next->fork = 1; +// ft_printf("%i is sleeping\n", philo->philo_nbr); +// pthread_mutex_unlock(&mutex); +// +// usleep(philo->params->t_slp); +// +// pthread_mutex_lock(&mutex); +// ft_printf("%i is thinking\n", philo->philo_nbr); +// pthread_mutex_unlock(&mutex); - usleep(philo->conditions->t_eat); - - pthread_mutex_lock(&mutex); - philo->fork = 1; - philo->next->fork = 1; - ft_printf("%i is sleeping\n", philo->philo_nbr); - pthread_mutex_unlock(&mutex); - - usleep(philo->conditions->t_slp); -i++; - } +// pthread_mutex_lock(philo->mutex); +// pthread_mutex_lock(&mutex); +// ft_printf("%i is thinking\n", philo->philo_nbr); +// pthread_mutex_unlock(philo->mutex); +// pthread_mutex_unlock(&mutex); +// i++; +// } return (NULL); } - diff --git a/srcs/init.c b/srcs/init.c index 6c26bbd..7fe9698 100644 --- a/srcs/init.c +++ b/srcs/init.c @@ -1,78 +1,77 @@ #include "philo.h" -t_philo *init_struc_philo(t_philo *new, t_conditions *conditions, int i) +t_philo *create_each_philo(t_philo *philo, t_params *params, t_mtx *mtx, int i) { - new->conditions = conditions; + t_philo *new; + + new = malloc(sizeof(t_philo) * 1); + if (new == NULL) + return (NULL); + new->params = params; new->philo_nbr = i + 1; new->fork = 1; + new->msg_mtx = mtx; + if (philo) + philo->next = new; + new->prev = philo; return (new); } -// it's just because init_chain_philo was too long -void put_prev_n_next(t_philo *new, t_philo *philo) +// looping chained list +t_philo *init_chain_philo(t_params *params, t_mtx *mutex) { - new->prev = philo; - philo->next = new; -} - -t_philo *init_chain_philo(t_conditions *conditions, int n) -{ - t_philo *start; + t_philo *end; t_philo *philo; - t_philo *new; int i; i = 0; - while (i < n) + philo = NULL; + while (i < params->n_phi) { - new = malloc(sizeof(t_philo) * 1); - if (new == NULL) - return (NULL); - new = init_struc_philo(new, conditions, i); - if (i == 0) - start = new; - else - put_prev_n_next(new, philo); - philo = new; + philo = create_each_philo(philo, params, mutex, i); i++; } - philo = start; - philo->prev = new; - new->next = philo; + end = philo; + while (philo->prev != NULL) + philo = philo->prev; + philo->prev = end; + end->next = philo; return (philo); } -t_conditions *init_conditions(int ac, char **av) +t_params *init_params(int ac, char **av) { - t_conditions *conditions; + t_params *params; if (ac == 5 || ac == 6) { - conditions = malloc(sizeof(t_conditions)); - conditions->n_phi = ft_atoi(av[1]); - conditions->t_die = ft_atoi(av[2]); - conditions->t_eat = ft_atoi(av[3]); - conditions->t_slp = ft_atoi(av[4]); + params = malloc(sizeof(t_params)); + params->n_phi = ft_atoi(av[1]); + params->t_die = ft_atoi(av[2]); + params->t_eat = ft_atoi(av[3]); + params->t_slp = ft_atoi(av[4]); if (ac == 6) - conditions->n_eat = ft_atoi(av[5]); + params->n_eat = ft_atoi(av[5]); } else return (NULL); - return (conditions); + return (params); } t_philo *init(int ac, char **av, pthread_t **id) { - t_philo *philo; - t_conditions *conditions; + t_philo *philo; + t_params *params; + t_mtx msg_mtx; - conditions = init_conditions(ac, av); - if (conditions == NULL) + params = init_params(ac, av); + if (params == NULL) return (NULL); - *id = malloc(sizeof(int) * conditions->n_phi); + *id = malloc(sizeof(int) * params->n_phi); if (*id == NULL) return (NULL); - philo = init_chain_philo(conditions, conditions->n_phi); + pthread_mutex_init(&msg_mtx, NULL); + philo = init_chain_philo(params, &msg_mtx); if (philo == NULL) return (NULL); return (philo); diff --git a/srcs/main.c b/srcs/main.c index 10e3d78..1794140 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -23,8 +23,8 @@ int main(int ac, char **av) philo = init(ac, av, &id); if (philo == NULL) return (0); - n = philo->conditions->n_phi; - pthread_mutex_init(&mutex, NULL); + n = philo->params->n_phi; +// pthread_mutex_init(&mutex, NULL); create_threads(philo, id, n); i = 0; while (i < n)