42/42_INT_08_philosophers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check died dans un autre thread et reorganisation fichiers avec main thread

Browse Source
This commit is contained in:
hugogogo
2022-01-26 10:52:06 +01:00
parent 03633fa5b2
commit 6561340fb9
8 changed files with 75 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
srcs/exec.c
View File

@@ -25,16 +25,18 @@ int ret_err_unlock(t_philo *philo, int nbr_fork)
int eat(t_philo *philo)
{
pthread_mutex_lock(&(philo->m_fork));
if (print_message(philo, WHITE, "has taken a fork") == 1)
if (print_message(philo, WHITE, "has taken a fork", philo->global->dead))
return (ret_err_unlock(philo, 1));
pthread_mutex_lock(&(philo->next->m_fork));
if (print_message(philo, WHITE, "has taken a fork") == 1)
if (print_message(philo, WHITE, "has taken a fork", philo->global->dead))
return (ret_err_unlock(philo, 2));
update_time(philo);
if (print_message(philo, B_YELLOW, "is eating") == 1)
if (print_message(philo, B_YELLOW, "is eating", philo->global->dead))
return (ret_err_unlock(philo, 2));
philo->eat++;
if (philo->eat == philo->params->n_eat)
philo->global->n_eat++;
go_sleep(philo, philo->params->t_eat);
pthread_mutex_unlock(&(philo->next->m_fork));
@@ -49,15 +51,15 @@ void *philo_exec(void *arg)
philo = (t_philo*)arg;
init_time(philo);
if (philo->p_nbr % 2 == 0)
usleep(10 * 1000);
usleep(10);
while (1)
{
if (eat(philo) != 0)
break ;
if (print_message(philo, B_BLUE, "is sleeping") == 1)
if (print_message(philo, B_BLUE, "is sleeping", philo->global->dead))
break ;
go_sleep(philo, philo->params->t_slp);
if (print_message(philo, B_GREEN, "is thinking") == 1)
if (print_message(philo, B_GREEN, "is thinking", philo->global->dead))
break ;
}
return (NULL);