rparodi/philosophers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish thx to garfi the goat

Browse source
This commit is contained in:
Raphaël 2024-07-18 20:01:39 +02:00
parent d948c639ec
commit 501b45d763
7 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
philo/sources/ft_actions.c
View file

@ -6,11 +6,12 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/10 00:23:09 by rparodi #+# #+# */
/* Updated: 2024/07/18 18:42:02 by rparodi ### ########.fr */
/* Updated: 2024/07/18 19:29:14 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/philo.h"
#include <pthread.h>
void ft_logs(t_str msg, t_philo *philo)
{
@ -47,6 +48,8 @@ t_error ft_start_eating(t_philo *philo)
{
pthread_mutex_lock(philo->l_fork);
ft_logs("has taken a fork\n", philo);
if (philo->nb_philo == 1)
return ((void)pthread_mutex_unlock(philo->l_fork), NO_ERROR);
pthread_mutex_lock(philo->r_fork);
ft_logs("has taken a fork\n", philo);
}
@ -59,7 +62,9 @@ t_error ft_ending_eating(t_philo *philo)
philo->eating = true;
ft_logs("is eating\n", philo);
pthread_mutex_lock(philo->meal_lock);
philo->t_last_eat = time;
pthread_mutex_unlock(philo->meal_lock);
pthread_mutex_lock(philo->check_eating_count);
philo->eating_count++;
pthread_mutex_unlock(philo->check_eating_count);

4
philo/sources/main.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/04 11:30:25 by rparodi #+# #+# */
/* Updated: 2024/07/11 17:34:21 by rparodi ### ########.fr */
/* Updated: 2024/07/18 19:59:24 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -48,7 +48,7 @@ t_error ft_init_thread(t_program *prog, t_mutex *forks)
ERROR, prog, forks);
i++;
}
while (--i > 0)
while (i-- > 0)
pthread_join(prog->philos[i].thread, NULL);
pthread_join(watch_dogs, NULL);
return (NO_ERROR);

7
philo/sources/parsing_args.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/04 11:42:37 by rparodi #+# #+# */
/* Updated: 2024/07/18 18:37:43 by rparodi ### ########.fr */
/* Updated: 2024/07/18 20:00:09 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,6 +17,9 @@ t_error ft_parsing_args(t_i32 argc, t_str *argv, t_philo *philo)
t_usize tmp;
tmp = 0;
ft_atou(argv[1], &tmp);
if (tmp == 0)
return (ERROR);
if (argc == 6)
{
ft_atou(argv[5], &tmp);
@ -24,7 +27,6 @@ t_error ft_parsing_args(t_i32 argc, t_str *argv, t_philo *philo)
}
else
philo->nb_eat = -1;
ft_atou(argv[1], &tmp);
philo->nb_philo = tmp;
ft_atou(argv[2], &tmp);
philo->t_death = tmp;
@ -65,6 +67,7 @@ t_error ft_init_philo(t_i32 argc, t_str *argv, t_program *prog, t_mutex *forks)
{
prog->philos[i].id = i + 1;
prog->philos[i].eating = 0;
prog->philos[i].eating_count = 0;
ft_parsing_args(argc, argv, &prog->philos[i]);
prog->philos[i].start_time = ft_time();
prog->philos[i].t_last_eat = 0;

7
philo/sources/routine.c
View file

@ -29,15 +29,18 @@ t_bool check_dead(t_philo *philo)
i = 0;
while (i < philo[0].nb_philo)
{
pthread_mutex_lock(philo->meal_lock);
timecheck = ft_time() - philo[i].start_time - philo[i].t_last_eat;
if (philo[i].t_last_eat != 0 && timecheck >= philo[i].t_death)
if (timecheck >= philo[i].t_death)
{
pthread_mutex_lock(philo[i].dead_lock);
pthread_mutex_unlock(philo->meal_lock);
ft_logs("died\n", &philo[i]);
pthread_mutex_lock(philo[i].dead_lock);
philo[i].dead_check = true;
pthread_mutex_unlock(philo[i].dead_lock);
return (true);
}
pthread_mutex_unlock(philo->meal_lock);
i++;
}
return (false);