Handle philo errors better, fix philo "leaks"

diff --git a/philo_bonus/main.c b/philo_bonus/main.c
index 3b7687fa2970a83455ac1b10688e4e12a8d5fec0..477aba35aab8a8f51451ff10e0b1cd1f28200bf8 100644 (file)
--- a/philo_bonus/main.c
+++ b/philo_bonus/main.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/22 11:19:48 by ljiriste          #+#    #+#             */
-/*   Updated: 2024/05/30 11:41:40 by ljiriste         ###   ########.fr       */
+/*   Updated: 2024/05/30 12:05:00 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-static int     seat_philosophers(t_settings *settings, pid_t *philo_pids)
+static int     seat_philosophers(t_settings *settings, pid_t *philo_pids, t_sems *semaphores)
 {
        t_philo philo;
 
@@ -34,6 +34,7 @@ static int    seat_philosophers(t_settings *settings, pid_t *philo_pids)
                philo_pids[philo.id - 1] = fork();
                if (philo_pids[philo.id - 1] == 0)
                {
+                       close_semaphores(semaphores);
                        free(philo_pids);
                        be_a_philosopher(&philo);
                }
@@ -121,7 +122,7 @@ int main(int argc, char **argv)
                cleanup(philo_pids, &semaphores);
                return (2);
        }
-       if (seat_philosophers(&settings, philo_pids))
+       if (seat_philosophers(&settings, philo_pids, &semaphores))
        {
                kill_philosophers(settings.philo_count, philo_pids);
                cleanup(philo_pids, &semaphores);

diff --git a/philo_bonus/philo.c b/philo_bonus/philo.c
index 40bc31022e6a34f80c052b3d5309939bbc068be1..30f92290b2bfaa92599ad78ef5a8a709c1f02e5e 100644 (file)
--- a/philo_bonus/philo.c
+++ b/philo_bonus/philo.c
@@ -6,7 +6,7 @@
 /*   By: ljiriste <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 08:45:21 by ljiriste          #+#    #+#             */
-/*   Updated: 2024/05/30 11:40:22 by ljiriste         ###   ########.fr       */
+/*   Updated: 2024/05/30 12:08:48 by ljiriste         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,20 +20,22 @@ static char *open_semaphores(t_philo *philo)
 {
        char    *sem_name;
 
+       sem_name = create_philo_sem_name(philo->id);
+       if (!sem_name)
+               return (NULL);
+       philo->philo_sem = sem_open(sem_name, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR, 1);
        philo->semaphores.forks = sem_open(FORKS_SEM, 0);
        philo->semaphores.fed = sem_open(WELL_FED_SEM, 0);
        philo->semaphores.death = sem_open(DEATH_SEM, 0);
        philo->semaphores.term = sem_open(TERM_SEM, 0);
        philo->semaphores.end = sem_open(END_SEM, 0);
-       sem_name = create_philo_sem_name(philo->id);
-       if (!sem_name)
-               return (NULL);
-       philo->philo_sem = sem_open(sem_name, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR, 1);
-       if (philo->philo_sem == SEM_FAILED)
+       if (philo->philo_sem == SEM_FAILED
+                       || philo->semaphores.forks == SEM_FAILED
+                       || philo->semaphores.fed == SEM_FAILED
+                       || philo->semaphores.death == SEM_FAILED
+                       || philo->semaphores.term == SEM_FAILED
+                       || philo->semaphores.end == SEM_FAILED)
        {
-               sem_wait(philo->semaphores.term);
-               printf("An error has occured.\n");
-               sem_wait(philo->semaphores.death);
                free(sem_name);
                return (NULL);
        }
@@ -73,6 +75,16 @@ static void  philo_sleep(t_philo *philo)
        return ;
 }
 
+static void    error_exit(t_philo *philo, int exit_code)
+{
+       sem_wait(philo->semaphores.term);
+       printf("An error as occured.\n");
+       sem_post(philo->semaphores.death);
+       sem_post(philo->semaphores.end);
+       close_semaphores(&philo->semaphores);
+       exit(exit_code);
+}
+
 void   be_a_philosopher(t_philo *philo)
 {
        pthread_t       watchers[2];
@@ -80,9 +92,13 @@ void be_a_philosopher(t_philo *philo)
 
        philo_sem_name = open_semaphores(philo);
        if (!philo_sem_name)
-               exit(2);
+               error_exit(philo, 2);
        if (create_watchers(philo, watchers))
-               exit(3);
+       {
+               sem_unlink(philo_sem_name);
+               free(philo_sem_name);
+               error_exit(philo, 3);
+       }
        while (is_alive(philo))
        {
                philo_think(philo);