From d515ed3cf6fefb3e424fedb70691861281727ea5 Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Thu, 9 May 2024 11:59:59 +0200 Subject: [PATCH] Format to comply with the 42 Norm --- philo/helpers.c | 8 +++++--- philo/main.c | 8 +++++--- philo/mem_management.c | 4 +++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/philo/helpers.c b/philo/helpers.c index 05f3f05..35f974a 100644 --- a/philo/helpers.c +++ b/philo/helpers.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/09 09:13:40 by ljiriste #+# #+# */ -/* Updated: 2024/05/09 10:39:16 by ljiriste ### ########.fr */ +/* Updated: 2024/05/09 11:59:36 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -29,13 +29,15 @@ useconds_t usecs_since_start(struct timeval start) struct timeval time; gettimeofday(&time, NULL); - return ((time.tv_sec - start.tv_sec) * 1000000 + time.tv_usec - start.tv_usec); + return ((time.tv_sec - start.tv_sec) * 1000000 + + time.tv_usec - start.tv_usec); } void print_timestamp(t_philo *philo, const char *str) { mutex_lock(&philo->settings->terminal_lock); - printf("%u %lu %s\n", usecs_since_start(philo->settings->start) / 1000 , philo->id, str); + printf("%u %lu %s\n", usecs_since_start(philo->settings->start) + / 1000, philo->id, str); mutex_unlock(&philo->settings->terminal_lock); return ; } diff --git a/philo/main.c b/philo/main.c index c19c92a..3f2151d 100644 --- a/philo/main.c +++ b/philo/main.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/22 11:19:48 by ljiriste #+# #+# */ -/* Updated: 2024/05/09 11:15:59 by ljiriste ### ########.fr */ +/* Updated: 2024/05/09 11:58:04 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,7 +22,8 @@ int seat_philosophers(t_diner *diner, pthread_t *threads) i = 0; while (i < diner->setting.philo_count) { - if (pthread_create(threads + i, NULL, be_a_philosopher, diner->philos + i)) + if (pthread_create(threads + i, NULL, + be_a_philosopher, diner->philos + i)) { mutex_lock(&diner->setting.end_lock); diner->setting.end = 1; @@ -41,7 +42,8 @@ int seat_philosophers(t_diner *diner, pthread_t *threads) int is_dead(t_philo *philo) { mutex_lock(&philo->philo_lock); - if (usecs_since_start(philo->settings->start) - philo->last_eaten > philo->settings->time_to_die) + if (usecs_since_start(philo->settings->start) - philo->last_eaten + > philo->settings->time_to_die) { mutex_unlock(&philo->philo_lock); return (1); diff --git a/philo/mem_management.c b/philo/mem_management.c index 0b245b4..ea3c851 100644 --- a/philo/mem_management.c +++ b/philo/mem_management.c @@ -6,7 +6,7 @@ /* By: ljiriste +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 09:39:55 by ljiriste #+# #+# */ -/* Updated: 2024/05/09 11:18:43 by ljiriste ### ########.fr */ +/* Updated: 2024/05/09 11:56:50 by ljiriste ### ########.fr */ /* */ /* ************************************************************************** */ @@ -55,11 +55,13 @@ void cleanup(t_diner *diner, pthread_t *threads) destroy_mutex(&diner->setting.end_lock); i = 0; if (diner->philos) + { while (i < count) { pthread_join(threads[i], NULL); destroy_mutex(&diner->philos[i++].philo_lock); } + } i = 0; if (diner->forks) while (i < count) -- 2.30.2