From cbce23f2b416d490e86b59fa123cde1f8d7a8b16 Mon Sep 17 00:00:00 2001
From: "remi.greub" <remi.greub@hes-so.ch>
Date: Fri, 11 Apr 2025 00:14:12 +0200
Subject: [PATCH] traduction nb_trajets -> travels
---
G17_bykes/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/G17_bykes/main.c b/G17_bykes/main.c
index 8770b22..7428bcd 100644
--- a/G17_bykes/main.c
+++ b/G17_bykes/main.c
@@ -24,7 +24,7 @@ int personsFinished=0;
struct civilian{
int num_thread;
- int nb_trajet;
+ int nb_travels;
int max_trajets;
int i_cities;
int nbcities;
@@ -106,7 +106,7 @@ int main(int argc, char **argv){
Civilians[i].nslotss = nbslots;
Civilians[i].nbcities = nbcities;
Civilians[i].num_thread = i;
- Civilians[i].nb_trajet = 0;
+ Civilians[i].nb_travels = 0;
Civilians[i].i_cities = (rand()%(Civilians[i].nbcities - 1))+1;
if(pthread_create(&threadCivilians[i], NULL, civilians, (void*)&Civilians[i])!=0){
perror("thread creation error");
@@ -158,7 +158,7 @@ void *civilians(void *arg){
int j=0;
int val;
// inside a Mtrajets loop for each civilians
- while(hab->nb_trajet < hab->max_trajets){
+ while(hab->nb_travels < hab->max_trajets){
//waits for a bike in cities i
//if(hab->i_cities==4){
sem_getvalue(&sem_FreeSlot[hab->i_cities],&val);
@@ -233,14 +233,14 @@ void *civilians(void *arg){
#endif
//changes his position from cities i = j (j is the new cities)
hab->i_cities = j;
- hab->nb_trajet += 1;
+ hab->nb_travels += 1;
}
printf("person %d stops\n", hab->num_thread);
pthread_mutex_lock(&mutex[hab->i_cities]);
personsFinished += 1;
pthread_mutex_unlock(&mutex[hab->i_cities]);
pthread_barrier_wait(&b);
- //printf("machin bidule a passé la barriere !!!! : %d, tot_trajets = %d\n", hab->num_thread, hab->nb_trajet);
+ //printf("machin bidule a passé la barriere !!!! : %d, tot_trajets = %d\n", hab->num_thread, hab->nb_travels);
return NULL;
}
--
GitLab