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

nimp dans timestamp

Browse Source
This commit is contained in:
Hugo LAMY
2022-01-25 18:48:49 +01:00
parent b998de9340
commit d8475537e0
6 changed files with 115 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
srcs/generic.c
View File

@@ -4,11 +4,11 @@ void init_time(t_philo *philo)
{
struct timeval stime;
if (philo->global->t_start_s == 0)
if (philo->global->t_start.ts == 0)
{
gettimeofday(&stime, NULL);
philo->global->t_start_s = stime.tv_sec;
philo->global->t_start_u = stime.tv_usec;
philo->global->t_start.ts = stime.tv_sec;
philo->global->t_start.tu = stime.tv_usec;
}
}
@@ -17,8 +17,31 @@ void update_time(t_philo *philo)
struct timeval stime;
gettimeofday(&stime, NULL);
philo->t_last_meal_s = stime.tv_sec;
philo->t_last_meal_u = stime.tv_usec;
philo->t_last_meal.ts = stime.tv_sec;
philo->t_last_meal.tu = stime.tv_usec;
}
int diff_time(t_time old, struct timeval new)
{
return ((new.tv_sec - old.ts) * 1000 + (new.tv_usec - old.tu) / 1000);
}
int is_dead(t_philo *philo)
{
struct timeval stime;
int time;
if (philo->global->dead)
return (1);
gettimeofday(&stime, NULL);
time = diff_time(philo->t_last_meal, stime);
if (time >= philo->params->t_die)
{
philo->global->dead = 1;
print_message(philo, "died");
return (1);
}
return (0);
}
void print_message(t_philo *philo, char *msg)
@@ -28,8 +51,8 @@ void print_message(t_philo *philo, char *msg)
char *color;
gettimeofday(&stime, NULL);
time_stamp = (stime.tv_sec - philo->global->t_start_s) * 1000;
time_stamp += (stime.tv_usec - philo->global->t_start_u) / 1000;
time_stamp = (stime.tv_sec - philo->global->t_start.ts) * 1000;
time_stamp += (stime.tv_usec - philo->global->t_start.tu) / 1000;
color = WHITE;
if (ft_strnstr(msg, "eating", ft_strlen(msg)))
color = B_YELLOW;