diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2021-01-08 17:57:23 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2021-01-08 17:57:23 +0100 |
| commit | 36c5e3a81de8b910bc04a37994b53296c1540353 (patch) | |
| tree | ed8ff37d914606ba3b4d6921956bd9b29cac0f17 /philo_two/src | |
| parent | ad7ed73c124c8fcda6629350307f0f4f41b87fe3 (diff) | |
| download | philosophers-36c5e3a81de8b910bc04a37994b53296c1540353.tar.gz philosophers-36c5e3a81de8b910bc04a37994b53296c1540353.tar.bz2 philosophers-36c5e3a81de8b910bc04a37994b53296c1540353.zip | |
Added separate thread to flush buffer in philo_one and philo_two
Diffstat (limited to 'philo_two/src')
| -rw-r--r-- | philo_two/src/main.c | 16 | ||||
| -rw-r--r-- | philo_two/src/routine.c | 10 |
2 files changed, 22 insertions, 4 deletions
diff --git a/philo_two/src/main.c b/philo_two/src/main.c index 61f0410..2d5c003 100644 --- a/philo_two/src/main.c +++ b/philo_two/src/main.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 22:45:23 by cacharle #+# #+# */ -/* Updated: 2021/01/04 12:14:57 by cacharle ### ########.fr */ +/* Updated: 2021/01/08 16:32:15 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,6 +37,17 @@ static bool st_sem_create(const char *name, unsigned int value, sem_t **sem) != SEM_FAILED); } +void *routine_flush(t_philo_conf *conf) +{ + while (true) + { + sem_wait(conf->sem_stdout); + philo_put_flush(); + sem_post(conf->sem_stdout); + usleep(250000); + } +} + static int st_setup( t_philo_conf *conf, t_philo **philos, @@ -105,6 +116,9 @@ int main(int argc, char **argv) return (0); if (st_setup(&conf, &philos, &forks, &threads) != 0) return (1); + pthread_t thread_flush; + pthread_create(&thread_flush, NULL, (t_routine)routine_flush, (void*)&conf); + pthread_detach(thread_flush); i = -1; while (++i < conf.philo_num) sem_post(conf.sem_start); diff --git a/philo_two/src/routine.c b/philo_two/src/routine.c index d6e1df3..d69488d 100644 --- a/philo_two/src/routine.c +++ b/philo_two/src/routine.c @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/14 23:00:07 by cacharle #+# #+# */ -/* Updated: 2021/01/04 12:17:48 by cacharle ### ########.fr */ +/* Updated: 2021/01/08 16:31:27 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,8 +19,12 @@ void *routine_philo(t_philo *arg) eat_counter = 0; sem_wait(arg->conf->sem_start); - if (arg->id % 2 == 0) - usleep(500); + /* if (arg->conf->philo_num % 2 == 0 && arg->id % 2 == 0) */ + /* usleep(1000); */ + /* if (arg->conf->philo_num % 2 == 1 && arg->id % 3 == 0) */ + /* usleep(1000); */ + /* if (arg->conf->philo_num % 2 == 1 && arg->id % 3 == 1) */ + /* usleep(500); */ arg->time_last_eat = h_time_now(); if (pthread_create(&thread_death, NULL, (t_routine)routine_death, arg) != 0) return (NULL); |