From 3d54b2cdc9f9a29920f9343f461e66444d40c1c9 Mon Sep 17 00:00:00 2001 From: lpaucot_uclouvain <laurent.paucot@student.uclouvain.be> Date: Tue, 21 Apr 2020 09:36:32 +0200 Subject: [PATCH] test --- Projet_M2/run.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Projet_M2/run.c b/Projet_M2/run.c index 88887b6..f86baa6 100755 --- a/Projet_M2/run.c +++ b/Projet_M2/run.c @@ -85,7 +85,7 @@ char *get_from_buffer_1(struct buffer_rc *ptr){ // chercher dans le buffer 1 } void put_in_buffer_2(struct queue *ptr, struct buffer_cw *buf){ //ajouter un element dans le buffer 2 - + printf("check24\n"); buf->tab[buf->head] = malloc(sizeof(ptr)); buf->tab[buf->head] = ptr; buf->len++; //augmenté l'espace occupé par le buffer @@ -274,7 +274,7 @@ void *calculating(void *param){ if (pr_divs == NULL){return NULL;} pr_divs = prime_divs(strtoll(chaine,NULL,0)); - printf("check24\n"); + sem_wait(&empty2); pthread_mutex_lock(&mutex2); put_in_buffer_2(pr_divs,buffer_2); @@ -355,7 +355,7 @@ struct buffer_rc * buff_init_1(FILE *file1){ free(ptr1); return NULL;} ptr1->tab = malloc(2*N*sizeof(char*)); - ptr1->size = 8; + ptr1->size = 2*N; ptr1->len = 0; ptr1->head = 0; ptr1->tail = 0; @@ -373,7 +373,7 @@ struct buffer_cw * buff_init_2(FILE *file2){ return NULL;} ptr2->tab = malloc(2*N*sizeof(struct queue*)); - ptr2->size = 8; + ptr2->size = 2*N; ptr2->len = 0; ptr2->head = 0; ptr2->tail = 0; -- GitLab