diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-10-05 15:06:03 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-10-05 15:06:03 +0200 |
| commit | 473cf5d7576744b679b7a504232b5ebd4b5d689f (patch) | |
| tree | 6518e4fd26bf4584e5a2d72b9e1289473bce76da /philo_three/src/main.c | |
| parent | a237321ee53f44793ebc8b9db26b743f092b5e40 (diff) | |
| download | philosophers-473cf5d7576744b679b7a504232b5ebd4b5d689f.tar.gz philosophers-473cf5d7576744b679b7a504232b5ebd4b5d689f.tar.bz2 philosophers-473cf5d7576744b679b7a504232b5ebd4b5d689f.zip | |
Norming
Diffstat (limited to 'philo_three/src/main.c')
| -rw-r--r-- | philo_three/src/main.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/philo_three/src/main.c b/philo_three/src/main.c index a6c6370..04b1069 100644 --- a/philo_three/src/main.c +++ b/philo_three/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/15 00:45:24 by cacharle #+# #+# */ -/* Updated: 2020/10/01 09:34:55 by cacharle ### ########.fr */ +/* Updated: 2020/10/05 14:31:39 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -23,27 +23,25 @@ sem_t *philo_sem_create(char *name, int value) return (sem); } -int main(int argc, char **argv) +int main(int argc, char **argv) { t_philo_args args; t_philo philo; sem_t *forks; sem_t *sem_stdout; sem_t *sem_dead; + pid_t *pids; + int i; if (!parse_args(&args, argc, argv)) return (1); - - - if ((forks = philo_sem_create(PHILO_SEM_NAME, args.philo_num)) == NULL || - (sem_stdout = philo_sem_create(PHILO_SEM_STDOUT_NAME, 1)) == NULL || - (sem_dead = philo_sem_create(PHILO_SEM_DEAD_NAME, 1)) == NULL) + if ((forks = philo_sem_create(PHILO_SEM_NAME, args.philo_num)) == NULL + || (sem_stdout = philo_sem_create(PHILO_SEM_STDOUT_NAME, 1)) == NULL + || (sem_dead = philo_sem_create(PHILO_SEM_DEAD_NAME, 0)) == NULL) return (1); - - pid_t *pids; - pids = malloc(sizeof(pid_t) * args.philo_num); - - int i = -1; + if ((pids = malloc(sizeof(pid_t) * args.philo_num)) == NULL) + return (1); + i = -1; while (++i < args.philo_num) { philo.conf = &args; @@ -54,15 +52,11 @@ int main(int argc, char **argv) return (1); } } - - sem_wait(sem_dead); sem_wait(sem_dead); - i = -1; while (++i < args.philo_num) kill(pids[i], SIGKILL); free(pids); - sem_close(forks); sem_close(sem_stdout); sem_close(sem_dead); |