Added meal counter to philo_two (still segfault 10% of the time)

1 files changed, 23 insertions, 18 deletions

diff --git a/philo_two/src/event.c b/philo_two/src/event.c
index 8060b2b..faf963b 100644
--- a/philo_two/src/event.c
+++ b/philo_two/src/event.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/14 21:37:50 by cacharle          #+#    #+#             */
-/*   Updated: 2020/10/24 13:02:01 by charles          ###   ########.fr       */
+/*   Updated: 2021/01/01 14:26:02 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,9 +14,13 @@
 
 void		event_take_fork(t_philo *arg)
 {
+	if (philo_finished(arg->conf))
+		return ;
 	sem_wait(arg->forks);
+	if (philo_finished(arg->conf))
+		return ;
 	sem_wait(arg->conf->sem_stdout);
-	if (!arg->conf->all_alive)
+	if (philo_finished(arg->conf))
 		return ;
 	philo_put(arg->id, EVENT_FORK);
 	sem_post(arg->conf->sem_stdout);
@@ -24,25 +28,22 @@ void		event_take_fork(t_philo *arg)
 
 void		event_eat(t_philo *arg)
 {
-	int	eat_counter;
-
-	eat_counter = 0;
-	while (eat_counter < arg->conf->meal_num)
-	{
-		sem_wait(arg->conf->sem_stdout);
-		if (!arg->conf->all_alive)
-			return ;
-		philo_put(arg->id, EVENT_EAT);
-		sem_post(arg->conf->sem_stdout);
-		usleep(arg->conf->timeout_eat * 1000);
-		eat_counter++;
-	}
+	if (philo_finished(arg->conf))
+		return ;
+	sem_wait(arg->conf->sem_stdout);
+	if (philo_finished(arg->conf))
+		return ;
+	philo_put(arg->id, EVENT_EAT);
+	sem_post(arg->conf->sem_stdout);
+	usleep(arg->conf->timeout_eat * 1000);
 }
 
 void		event_think(t_philo *arg)
 {
+	if (philo_finished(arg->conf))
+		return ;
 	sem_wait(arg->conf->sem_stdout);
-	if (!arg->conf->all_alive)
+	if (philo_finished(arg->conf))
 		return ;
 	philo_put(arg->id, EVENT_THINK);
 	sem_post(arg->conf->sem_stdout);
@@ -50,8 +51,10 @@ void		event_think(t_philo *arg)
 
 void		event_sleep(t_philo *arg)
 {
+	if (philo_finished(arg->conf))
+		return ;
 	sem_wait(arg->conf->sem_stdout);
-	if (!arg->conf->all_alive)
+	if (philo_finished(arg->conf))
 		return ;
 	philo_put(arg->id, EVENT_SLEEP);
 	sem_post(arg->conf->sem_stdout);
@@ -62,8 +65,10 @@ void		event_sleep(t_philo *arg)
 
 void		event_die(t_philo *arg)
 {
+	if (philo_finished(arg->conf))
+		return ;
 	sem_wait(arg->conf->sem_stdout);
-	if (!arg->conf->all_alive)
+	if (philo_finished(arg->conf))
 		return ;
 	philo_put(arg->id, EVENT_DIE);
 	arg->conf->all_alive = false;