Bugfix. There where two condition races that could happen if the main thread...

Bugfix. There where two condition races that could happen if the main thread terminated earlier than the auxiliary thread when using the merge shrink.

Codes/malleability/spawn_methods/GenericSpawn.c

@@ -290,7 +290,7 @@ void deallocate_spawn_data() {
  * Cuando termina, modifica la variable global para indicar este cambio
  */
 void generic_spawn(MPI_Comm *child, int data_stage) {
-  int local_state;
+  int local_state, aux_state;
 
   // WORK
   if(spawn_data->myId == spawn_data->root && spawn_data->spawn_qty > 0) { //SET MAPPING FOR NEW PROCESSES
@@ -306,7 +306,10 @@ void generic_spawn(MPI_Comm *child, int data_stage) {
   }
   // END WORK
   end_time = MPI_Wtime();
+  aux_state = get_spawn_state(spawn_data->spawn_is_async);
+  if(!(aux_state == MALL_SPAWN_PENDING && local_state == MALL_SPAWN_ADAPT_POSTPONE)) {
     set_spawn_state(local_state, spawn_data->spawn_is_async);
+  }
 }
 
 
@@ -345,7 +348,7 @@ void* thread_work() {
   generic_spawn(returned_comm, MALL_NOT_STARTED);
 
   local_state = get_spawn_state(MALL_SPAWN_PTHREAD);
-  if(local_state == MALL_SPAWN_ADAPT_POSTPONE) {
+  if(local_state == MALL_SPAWN_ADAPT_POSTPONE || local_state == MALL_SPAWN_PENDING) {
     // El grupo de procesos se terminara de juntar tras la redistribucion de datos
 
     local_state = wait_wakeup();

Codes/malleability/spawn_methods/Spawn_state.c

 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
+#include "Spawn_state.h"
 
 pthread_mutex_t spawn_mutex;
 pthread_cond_t spawn_cond;
 int spawn_state;
+int waiting_redistribution=0;
 
 void init_spawn_state() {
   pthread_mutex_init(&spawn_mutex,NULL);
   pthread_cond_init(&spawn_cond,NULL);
+  set_spawn_state(1,0); //FIXME First parameter is a horrible magical number
 }
 
 void free_spawn_state() {
@@ -40,13 +43,20 @@ void set_spawn_state(int value, int is_async) {
 
 int wait_wakeup() {
   pthread_mutex_lock(&spawn_mutex);
+  if(!waiting_redistribution) {
+    waiting_redistribution=1;
     pthread_cond_wait(&spawn_cond, &spawn_mutex);
+  }
+  waiting_redistribution=0;
   pthread_mutex_unlock(&spawn_mutex);
   return get_spawn_state(1);
 }
 
 void wakeup() {
   pthread_mutex_lock(&spawn_mutex);
+  if(waiting_redistribution) {
     pthread_cond_signal(&spawn_cond);
+  }
+  waiting_redistribution=1;
   pthread_mutex_unlock(&spawn_mutex);
 }