fix: check if all threads is stopped before destroye data

This commit is contained in:
Camille Chauvet 2023-04-19 14:01:59 +00:00
parent 07a72c7f89
commit c674f68b2e
3 changed files with 37 additions and 10 deletions

19
data.c
View File

@ -2,6 +2,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include "./data.h" #include "./data.h"
#include "philo.h" #include "philo.h"
#include "philos.h" #include "philos.h"
@ -35,9 +36,23 @@ bool data_init(t_data *data)
void data_destroyer(t_data *data) void data_destroyer(t_data *data)
{ {
free(data->threads); size_t i;
free(data->forks); t_philo *philo;
bool stop;
i = 0;
while (i < data->nb_philos)
{
philo = data->philos[i];
pthread_mutex_lock(&philo->stop_mutex);
stop = philo->stop;
pthread_mutex_unlock(&philo->stop_mutex);
if (stop)
i++;
}
pthread_mutex_destroy(&data->forks_mutex); pthread_mutex_destroy(&data->forks_mutex);
pthread_mutex_destroy(&data->stop_mutex); pthread_mutex_destroy(&data->stop_mutex);
free(data->threads);
free(data->forks);
philos_destroyer(data); philos_destroyer(data);
} }

24
philo.c
View File

@ -17,13 +17,19 @@ void philo_destroyer(t_philo *philo)
free(philo); free(philo);
} }
bool check(t_data *data) bool check(t_philo *philo, t_data *data)
{ {
bool stop; bool stop;
pthread_mutex_lock(&data->stop_mutex); pthread_mutex_lock(&data->stop_mutex);
stop = data->stop; stop = data->stop;
pthread_mutex_unlock(&data->stop_mutex); pthread_mutex_unlock(&data->stop_mutex);
if (stop)
{
pthread_mutex_lock(&philo->stop_mutex);
philo->stop = 1;
pthread_mutex_unlock(&philo->stop_mutex);
}
return (stop); return (stop);
} }
@ -51,10 +57,11 @@ bool philo_eat(t_philo *philo, t_data *data)
right_fork = 0; right_fork = 0;
while (left_fork == 0 || right_fork == 0) while (left_fork == 0 || right_fork == 0)
{ {
if (check(data)) if (check(philo, data))
return (1); return (1);
pthread_mutex_lock(&data->forks_mutex); pthread_mutex_lock(&data->forks_mutex);
left_fork = data->forks[philo->id]; left_fork = data->forks[philo->id];
if (((philo->id + 1) % data->nb_philos) != philo->id)
right_fork = data->forks[(philo->id + 1) % data->nb_philos]; right_fork = data->forks[(philo->id + 1) % data->nb_philos];
if (right_fork && left_fork) if (right_fork && left_fork)
{ {
@ -85,18 +92,20 @@ void *philo_routine(void *arg)
philo = arg; philo = arg;
data = philo->data; data = philo->data;
if (philo->id % 2) print_thinking(philo);
usleep(data->sleep_time * 1000); usleep(philo->id * (data->life_expectency / data->nb_philos));
while (true) while (true)
{ {
print_thinking(philo); if (check(philo, data))
if (check(data))
return (NULL); return (NULL);
if (philo_eat(philo, data)) if (philo_eat(philo, data))
return (NULL); return (NULL);
if (check(data)) if (check(philo, data))
return (NULL); return (NULL);
philo_sleep(data, philo); philo_sleep(data, philo);
if (check(philo, data))
return (NULL);
print_thinking(philo);
} }
return (NULL); return (NULL);
} }
@ -116,5 +125,6 @@ t_philo *philo_init(t_data *data)
pthread_mutex_init(&philo->nb_meal_mutex, NULL); pthread_mutex_init(&philo->nb_meal_mutex, NULL);
pthread_mutex_init(&philo->last_eat_mutex, NULL); pthread_mutex_init(&philo->last_eat_mutex, NULL);
pthread_mutex_init(&philo->last_sleep_mutex, NULL); pthread_mutex_init(&philo->last_sleep_mutex, NULL);
pthread_mutex_init(&philo->stop_mutex, NULL);
return (philo); return (philo);
} }

View File

@ -28,6 +28,8 @@ typedef struct s_philo
size_t last_eat; size_t last_eat;
pthread_mutex_t last_sleep_mutex; pthread_mutex_t last_sleep_mutex;
size_t last_sleep; size_t last_sleep;
pthread_mutex_t stop_mutex;
bool stop;
t_data *data; t_data *data;
} t_philo; } t_philo;