aboutsummaryrefslogtreecommitdiff
path: root/philo_three/src/event.c
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2021-01-01 16:39:36 +0100
committerCharles Cabergs <me@cacharle.xyz>2021-01-01 16:39:36 +0100
commita73b1e33ae3a4f55e3dd19defa1b853bc58f1eeb (patch)
treeee14275a0f1ad9b8ddfa8feee1ee77ce0de5f285 /philo_three/src/event.c
parentb9d93edf40f228fcc6e18e9e6d0a1c5db498c004 (diff)
downloadphilosophers-a73b1e33ae3a4f55e3dd19defa1b853bc58f1eeb.tar.gz
philosophers-a73b1e33ae3a4f55e3dd19defa1b853bc58f1eeb.tar.bz2
philosophers-a73b1e33ae3a4f55e3dd19defa1b853bc58f1eeb.zip
Fixing meal num for philo_three
Diffstat (limited to 'philo_three/src/event.c')
-rw-r--r--philo_three/src/event.c28
1 files changed, 15 insertions, 13 deletions
diff --git a/philo_three/src/event.c b/philo_three/src/event.c
index edeeb38..33b1e00 100644
--- a/philo_three/src/event.c
+++ b/philo_three/src/event.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/14 21:37:50 by cacharle #+# #+# */
-/* Updated: 2020/10/01 09:04:39 by cacharle ### ########.fr */
+/* Updated: 2021/01/01 16:29:31 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -22,17 +22,10 @@ void event_take_fork(t_philo *philo)
void event_eat(t_philo *philo)
{
- int eat_counter;
-
- eat_counter = 0;
- while (eat_counter < philo->conf->meal_num)
- {
- sem_wait(philo->sem_stdout);
- philo_put(philo->id, EVENT_EAT);
- sem_post(philo->sem_stdout);
- usleep(philo->conf->timeout_eat * 1000);
- eat_counter++;
- }
+ sem_wait(philo->sem_stdout);
+ philo_put(philo->id, EVENT_EAT);
+ sem_post(philo->sem_stdout);
+ usleep(philo->conf->timeout_eat * 1000);
}
void event_think(t_philo *philo)
@@ -54,7 +47,16 @@ void event_sleep(t_philo *philo)
void event_die(t_philo *philo)
{
+ long int i;
+
sem_wait(philo->sem_stdout);
philo_put(philo->id, EVENT_DIE);
- sem_post(philo->sem_dead);
+ if (philo->conf->meal_num == -1)
+ sem_post(philo->sem_finish);
+ else
+ {
+ i = -1;
+ while (++i < philo->conf->philo_num)
+ sem_post(philo->sem_finish);
+ }
}