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

Compare commits

base: starnakin:7e5d4af478d554166aa399cded2b9a462ebaddd3
Branches Tags
starnakin:master
..
compare: starnakin:550851a5c87c6684f63b2dc21d09e9c63f5b446e
Branches Tags
starnakin:master

2 Commits
7e5d4af478 ... 550851a5c8

Author SHA1 Message Date
Camille Chauvet
550851a5c8 Merge branch 'master' of git.chauvet.pro:starnakin/42_Philosopher 2023-05-24 13:55:43 +00:00
Camille Chauvet
0956af87ca fix: data race 2023-05-24 15:55:19 +02:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
philo/philo_routine.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/27 11:44:14 by cchauvet #+# #+# */ /* Created: 2023/04/27 11:44:14 by cchauvet #+# #+# */
/* Updated: 2023/05/16 13:13:13 by cchauvet ### ########.fr */ /* Updated: 2023/05/24 13:38:11 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -71,15 +71,15 @@ bool philo_eat(t_philo *philo, t_data *data)
{ {
if (philo_take_forks(philo, data)) if (philo_take_forks(philo, data))
return (1); return (1);
pthread_mutex_lock(&philo->last_eat_mutex);
philo->last_eat = get_time(); philo->last_eat = get_time();
pthread_mutex_unlock(&philo->last_eat_mutex);
print_eating(philo); print_eating(philo);
usleep(get_time_eat(philo, data) * 1000); usleep(get_time_eat(philo, data) * 1000);
pthread_mutex_unlock(&data->forks[philo->id]); pthread_mutex_unlock(&data->forks[philo->id]);
pthread_mutex_unlock(&data->forks[(philo->id + 1) % data->nb_philos]); pthread_mutex_unlock(&data->forks[(philo->id + 1) % data->nb_philos]);
if (check(philo, data)) if (check(philo, data))
return (1); return (1);
pthread_mutex_lock(&philo->last_eat_mutex);
pthread_mutex_unlock(&philo->last_eat_mutex);
pthread_mutex_lock(&philo->nb_meal_mutex); pthread_mutex_lock(&philo->nb_meal_mutex);
philo->nb_meal++; philo->nb_meal++;
pthread_mutex_unlock(&philo->nb_meal_mutex); pthread_mutex_unlock(&philo->nb_meal_mutex);