Format to comply with the 42 Norm
authorLukas Jiriste <ljiriste@student.42prague.com>
Thu, 9 May 2024 09:59:59 +0000 (11:59 +0200)
committerLukas Jiriste <ljiriste@student.42prague.com>
Thu, 9 May 2024 09:59:59 +0000 (11:59 +0200)
philo/helpers.c
philo/main.c
philo/mem_management.c

index 05f3f05482046f09ab30d39fe71118234e79869b..35f974a05f09d1c8b1b62470a97055aae3e5796c 100644 (file)
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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 ;
 }
index c19c92aa44286b9dc81029a42604189c13a43a69..3f2151d46f6bd02b1775ca9fa4475b143f7cf8b0 100644 (file)
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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);
index 0b245b484ae4b9879eb5e7aac5b2ae00bc2ed084..ea3c851f5ef3f1713f3d06a8dd94499c6e08c169 100644 (file)
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   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)