starnakin/42_Philosopher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:f51039c735a4926ff5f4f970f2d8295913545568
Branches Tags
starnakin:master
...
compare: starnakin:531d3146e4da105ce1de39628a8160991b97ec78
Branches Tags
starnakin:master

2 Commits
f51039c735 ... 531d3146e4

Author SHA1 Message Date
Camille Chauvet
531d3146e4 merge 2023-04-25 11:30:55 +00:00
Camille Chauvet
b553e5af97 fix: stop when philo has enough eat 2023-04-20 13:16:02 +00:00
2 changed files with 7 additions and 8 deletions
Show Stats Expand all files Collapse all files

2
data.c
View File

@ -11,6 +11,7 @@
bool data_init(t_data *data) bool data_init(t_data *data)
{ {
data->stop = 0;
data->forks = malloc(sizeof(bool) * data->nb_philos); data->forks = malloc(sizeof(bool) * data->nb_philos);
if (data->forks == NULL) if (data->forks == NULL)
return (1); return (1);
@ -31,7 +32,6 @@ bool data_init(t_data *data)
pthread_mutex_init(&data->forks_mutex, NULL); pthread_mutex_init(&data->forks_mutex, NULL);
pthread_mutex_init(&data->stop_mutex, NULL); pthread_mutex_init(&data->stop_mutex, NULL);
pthread_mutex_init(&data->print_mutex, NULL); pthread_mutex_init(&data->print_mutex, NULL);
data->stop = 0;
return (0); return (0);
} }

13
main.c
View File

@ -52,12 +52,6 @@ void *check_routine(t_data *data)
while (true) while (true)
{ {
if ((ssize_t) get_min_meal(data) == data->nb_meals)
{
stop(data);
printf("g pu faim\n");
return (NULL);
}
i = 0; i = 0;
while (i < data->nb_philos) while (i < data->nb_philos)
{ {
@ -82,7 +76,12 @@ void *check_routine(t_data *data)
return (NULL); return (NULL);
} }
i++; i++;
usleep(10); if ((ssize_t) get_min_meal(data) >= data->nb_meals)
{
stop(data);
printf("g pu faim\n");
return (NULL);
}
} }
} }
} }