Merge branch 'master' of https://forge.uclouvain.be/clingier/lepl1503-2020-groupe-k4

prime_divs/data/include/data.h

@@ -36,7 +36,7 @@ typedef struct s_Data
     int small_factors_size; /**< The size of the allocated buffer Data#small_factors */ 
     int small_factors_count; /**< The number of factors smaller than 2**16 found */
     
-    pthread_mutex_t busy; /**< The mutex used if there is multiple producer threads */
+    
 
     struct s_Data *next; /**< Link to the next @c Data struct or NULL if it's the end of the list*/
 

prime_divs/data/src/data.c

@@ -74,8 +74,8 @@ Data *Data__init(void)
     mpz_init(self->N);
     mpz_init(self->remainder);
 
-    // Initialize the busy mutex
-    pthread_mutex_init(&(self->busy), NULL);
+    
+    
 
     self->next = NULL;
     return self;
@@ -123,7 +123,7 @@ Data *__Data__destroy(Data *self, void *a __attribute__((unused))) //correction
     for(int i=0; i < self->big_factors_size; i++)
         mpz_clear(self->big_factors[i]);
 
-    pthread_mutex_destroy(&self->busy);
+    
     free(self->big_factors);
     free(self);
     

prime_divs/multithreading/src/multithreading.c

@@ -46,15 +46,14 @@ void *produce(void *args)
     Data *head = (Data*) args;
     while(head)
     {
-        if(pthread_mutex_trylock(&(head->busy)) != EBUSY)
-        {
+        
             //Wait for empty slot lock and insert a node
             sem_wait(&(threads_buffer->empty));
             pthread_mutex_lock(&(threads_buffer->buffer_mutex));
             ThreadBuffer__insert(head);
             pthread_mutex_unlock(&(threads_buffer->buffer_mutex));
             sem_post(&(threads_buffer->full));
-        }
+        
         head = head->next;
     }