Cosmetics in SMPI and bugfix for a nasty bug in SIMIX (failed to destroy surf actions).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7227 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 04403d5..0fa9ca3 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -517,6 +517,7 @@ unsigned int SIMIX_network_waitany(xbt_dynar_t comms) {
     SIMIX_communication_destroy(comm_finished);
     THROW0(network_error, 0, "Link failure");
   }
+  SIMIX_communication_destroy(comm_finished);
 
   return found_comm;
 }

diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c
index 21a4134..a5d1232 100644 (file)
--- a/src/smpi/smpi_coll.c
+++ b/src/smpi/smpi_coll.c
@@ -102,7 +102,7 @@ static void tree_bcast(void* buf, int count, MPI_Datatype datatype, int root, MP
     smpi_mpi_recv(buf, count, datatype, tree->parent, system_tag + rank, comm, MPI_STATUS_IGNORE);
   }
   requests = xbt_new(MPI_Request, tree->numChildren);
-  DEBUG2("<%d> creates %d requests (1 per child)\n", rank, tree->numChildren);
+  DEBUG2("<%d> creates %d requests (1 per child)", rank, tree->numChildren);
   /* iniates sends to ranks lower in the tree */
   for(i = 0; i < tree->numChildren; i++) {
     if(tree->child[i] == -1) {
@@ -133,7 +133,7 @@ static void tree_antibcast(void* buf, int count, MPI_Datatype datatype, int root
   }
   //every one receives as many messages as it has children
   requests = xbt_new(MPI_Request, tree->numChildren);
-  DEBUG2("<%d> creates %d requests (1 per child)\n", rank, tree->numChildren);
+  DEBUG2("<%d> creates %d requests (1 per child)", rank, tree->numChildren);
   for(i = 0; i < tree->numChildren; i++) {
     if(tree->child[i] == -1) {
       requests[i] = MPI_REQUEST_NULL;