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

ajout static, renames, pere fouettard tweaks

Browse Source
This commit is contained in:
Hugo LAMY
2022-01-26 16:31:36 +01:00
parent 6d3280631c
commit 77f2e6b978
9 changed files with 130 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
srcs/exec.c
View File

@@ -3,29 +3,29 @@
/* ::: :::::::: */
/* exec.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/26 15:30:28 by hulamy #+# #+# */
/* Updated: 2022/01/26 15:32:57 by hulamy ### ########.fr */
/* Updated: 2022/01/26 16:29:49 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "philo.h"
void action_delay(t_philo *philo, int action_time)
static void action_delay(t_philo *philo, int action_time)
{
struct timeval stime;
int time_to_death;
int death_time;
gettimeofday(&stime, NULL);
time_to_death = philo->params->t_die - diff_time(philo->t_last_meal, stime);
if (time_to_death > action_time)
death_time = philo->params->t_die - diff_time(&philo->t_last_meal, &stime);
if (death_time > action_time)
usleep(action_time * 1000);
else if (time_to_death > 0)
else if (death_time > 0)
usleep(philo->params->t_die * 1000);
}
int ret_err_unlock(t_philo *philo, int nbr_fork)
static int ret_err_unlock(t_philo *philo, int nbr_fork)
{
pthread_mutex_unlock(&philo->m_fork);
if (nbr_fork == 2)
@@ -33,7 +33,7 @@ int ret_err_unlock(t_philo *philo, int nbr_fork)
return (1);
}
int eat(t_philo *philo)
static int eat(t_philo *philo)
{
pthread_mutex_lock(&(philo->m_fork));
if (print_message(philo, WHITE, "has taken a fork"))
@@ -44,9 +44,9 @@ int eat(t_philo *philo)
update_time(philo);
if (print_message(philo, B_YELLOW, "is eating"))
return (ret_err_unlock(philo, 2));
philo->eat++;
if (philo->eat == philo->params->n_eat)
philo->global->n_eat++;
philo->eat_count++;
if (philo->eat_count == philo->params->n_eat)
philo->global->satiated_count++;
action_delay(philo, philo->params->t_eat);
pthread_mutex_unlock(&(philo->next->m_fork));
pthread_mutex_unlock(&(philo->m_fork));