correction loop chained list

This commit is contained in:
hugogogo
2022-01-13 08:53:27 +01:00
parent 81f0ded5e3
commit bc40b571e9
5 changed files with 96 additions and 70 deletions

View File

@@ -1,5 +1,21 @@
#include "philo.h"
int take_forks(t_philo *philo)
{
// pthread_mutex_lock(&mutex);
while (philo->fork == 0 || philo->next->fork == 0)
continue ;
if (philo->fork == 1 && philo->next->fork == 1)
{
philo->fork = 0;
philo->next->fork = 0;
ft_printf("%i has taken a fork\n", philo->philo_nbr);
return (1);
}
// pthread_mutex_unlock(&mutex);
return (0);
}
void *philo_exec(void *arg)
{
t_philo *philo;
@@ -8,6 +24,12 @@ void *philo_exec(void *arg)
philo = (t_philo*)arg;
nbr = philo->philo_nbr;
pthread_mutex_lock(philo->msg_mtx);
// pthread_mutex_lock(&mutex);
ft_printf("%i is thinking\n", philo->philo_nbr);
pthread_mutex_unlock(philo->msg_mtx);
// pthread_mutex_unlock(&mutex);
// eat
// "has taken a fork"
// "is eating"
@@ -17,30 +39,32 @@ void *philo_exec(void *arg)
// "is thinking"
// die
// "died"
int i = 0;
while (i < 2)
{
pthread_mutex_lock(&mutex);
if (philo->fork == 1 && philo->next->fork == 1)
{
philo->fork = 0;
philo->next->fork = 0;
ft_putnbr_fd(philo->philo_nbr, 1);
ft_putstr_fd(" has taken a fork\n", 1);
}
pthread_mutex_unlock(&mutex);
//int i = 0;
// while (i < 2)
// {
// if (!take_forks(philo))
// continue ;
//
// usleep(philo->params->t_eat);
//
// pthread_mutex_lock(&mutex);
// philo->fork = 1;
// philo->next->fork = 1;
// ft_printf("%i is sleeping\n", philo->philo_nbr);
// pthread_mutex_unlock(&mutex);
//
// usleep(philo->params->t_slp);
//
// pthread_mutex_lock(&mutex);
// ft_printf("%i is thinking\n", philo->philo_nbr);
// pthread_mutex_unlock(&mutex);
usleep(philo->conditions->t_eat);
pthread_mutex_lock(&mutex);
philo->fork = 1;
philo->next->fork = 1;
ft_printf("%i is sleeping\n", philo->philo_nbr);
pthread_mutex_unlock(&mutex);
usleep(philo->conditions->t_slp);
i++;
}
// pthread_mutex_lock(philo->mutex);
// pthread_mutex_lock(&mutex);
// ft_printf("%i is thinking\n", philo->philo_nbr);
// pthread_mutex_unlock(philo->mutex);
// pthread_mutex_unlock(&mutex);
// i++;
// }
return (NULL);
}