resolved unexpected additionnal call to the chained list

This commit is contained in:
hugogogo
2022-01-09 11:10:04 +01:00
parent 4b37e5392e
commit 48118ae3ab
3 changed files with 24 additions and 10 deletions

View File

@@ -2,7 +2,7 @@
# define PHILO_PROTO_H # define PHILO_PROTO_H
// init.c // init.c
t_philo *init(char **av, pthread_t *id); t_philo *init(char **av, pthread_t **id);
#endif #endif

View File

@@ -35,7 +35,7 @@ t_philo *init_chain_philo(t_conditions *conditions, int n)
return (philo); return (philo);
} }
t_philo *init(char **av, pthread_t *id) t_philo *init(char **av, pthread_t **id)
{ {
t_philo *philo; t_philo *philo;
t_conditions *conditions; t_conditions *conditions;
@@ -44,7 +44,7 @@ t_philo *init(char **av, pthread_t *id)
n = ft_atoi(av[1]); n = ft_atoi(av[1]);
conditions = malloc(sizeof(t_conditions)); conditions = malloc(sizeof(t_conditions));
conditions->n_phi = n; conditions->n_phi = n;
id = malloc(sizeof(int) * n); *id = malloc(sizeof(int) * n);
philo = init_chain_philo(conditions, n); philo = init_chain_philo(conditions, n);
return (philo); return (philo);
} }

View File

@@ -1,5 +1,7 @@
#include "philo.h" #include "philo.h"
pthread_mutex_t mutex;
void *philo_exec(void *arg) void *philo_exec(void *arg)
{ {
t_philo *philo; t_philo *philo;
@@ -7,29 +9,41 @@ void *philo_exec(void *arg)
philo = (t_philo*)arg; philo = (t_philo*)arg;
nbr = philo->philo_nbr; nbr = philo->philo_nbr;
pthread_mutex_lock(&mutex);
write(1, "-", 1);
ft_putnbr_fd(nbr, 1); ft_putnbr_fd(nbr, 1);
write(1, "\n", 1); write(1, "\n", 1);
pthread_mutex_unlock(&mutex);
return (NULL); return (NULL);
} }
int main(int ac, char **av) int main(int ac, char **av)
{ {
pthread_t id; pthread_t *id;
t_philo *philo; t_philo *philo;
int i;
int n; int n;
if (ac == 1) if (ac == 1)
return (0); return (0);
philo = init(av, &id); philo = init(av, &id);
i = 0;
n = philo->conditions->n_phi; n = philo->conditions->n_phi;
while (n) pthread_mutex_init(&mutex, NULL);
while (i < n)
{ {
pthread_create(&id, NULL, &philo_exec, philo); pthread_create(&id[i], NULL, &philo_exec, philo);
philo = philo->next; philo = philo->next;
n--; i++;
} }
// while (1) i = 0;
write(1, "main function\n", 14); while (i < n)
{
pthread_join(id[i], NULL);
i++;
}
write(1, "main function\n", 14);
return 0; return 0;
} }