diff options
Diffstat (limited to 'philo_three/src/main.c')
| -rw-r--r-- | philo_three/src/main.c | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/philo_three/src/main.c b/philo_three/src/main.c index d6749d8..e5e8dd2 100644 --- a/philo_three/src/main.c +++ b/philo_three/src/main.c @@ -6,21 +6,16 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/15 00:45:24 by cacharle #+# #+# */ -/* Updated: 2020/10/05 16:59:54 by cacharle ### ########.fr */ +/* Updated: 2021/01/01 16:30:33 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #include "philo_three.h" -static sem_t *st_sem_create(char *name, int value) +static sem_t *st_sem_create(char *name, unsigned int value) { - sem_t *sem; - sem_unlink(name); - sem = sem_open(name, O_CREAT | O_EXCL, 0700, value); - if (sem == SEM_FAILED) - return (SEM_FAILED); - return (sem); + return (sem_open(name, O_CREAT | O_EXCL, 0700, value)); } static int st_destroy(t_sems *sems, pid_t *pids, int philo_num) @@ -35,11 +30,11 @@ static int st_destroy(t_sems *sems, pid_t *pids, int philo_num) free(pids); } sem_close(sems->forks); - sem_close(sems->sem_stdout); - sem_close(sems->sem_dead); sem_unlink(PHILO_SEM_NAME); + sem_close(sems->sem_stdout); sem_unlink(PHILO_SEM_STDOUT_NAME); - sem_unlink(PHILO_SEM_DEAD_NAME); + sem_close(sems->sem_finish); + sem_unlink(PHILO_SEM_FINISH_NAME); return (1); } @@ -49,14 +44,14 @@ static int st_setup(t_philo_args *args, t_sems *sems, pid_t **pids) int i; sems->sem_stdout = SEM_FAILED; - sems->sem_dead = SEM_FAILED; + sems->sem_finish = SEM_FAILED; *pids = NULL; if ((sems->forks = st_sem_create(PHILO_SEM_NAME, args->philo_num)) == SEM_FAILED || (sems->sem_stdout = st_sem_create(PHILO_SEM_STDOUT_NAME, 1)) == SEM_FAILED - || (sems->sem_dead = - st_sem_create(PHILO_SEM_DEAD_NAME, 1)) == SEM_FAILED + || (sems->sem_finish = + st_sem_create(PHILO_SEM_FINISH_NAME, args->meal_num == -1 ? 1 : args->philo_num)) == SEM_FAILED || (*pids = malloc(sizeof(pid_t) * args->philo_num)) == NULL) return (st_destroy(sems, *pids, 0)); i = -1; @@ -66,6 +61,7 @@ static int st_setup(t_philo_args *args, t_sems *sems, pid_t **pids) philo.id = i + 1; if (((*pids)[i] = child_start(&philo)) == -1) return (st_destroy(sems, *pids, i)); + usleep(200); } return (0); } @@ -75,15 +71,30 @@ int main(int argc, char **argv) t_philo_args args; t_sems sems; pid_t *pids; + long int i; if (!parse_args(&args, argc, argv)) return (1); - if (args.philo_num == 0) + if (args.philo_num == 0 || args.meal_num == 0) return (0); if (st_setup(&args, &sems, &pids) != 0) return (1); - sem_wait(sems.sem_dead); - sem_wait(sems.sem_dead); + if (args.meal_num == -1) + { + sem_wait(sems.sem_finish); + sem_wait(sems.sem_finish); + } + else + { + /* printf("eat %d\n", args.meal_num); */ + i = -1; + while (++i < args.philo_num) + sem_wait(sems.sem_finish); + i = -1; + while (++i < args.philo_num) + sem_wait(sems.sem_finish); + sem_wait(sems.sem_stdout); + } st_destroy(&sems, pids, args.philo_num); return (0); } |