correction to compile with warning and th indentation in my files

[simgrid.git] / src / simix / smx_network.c

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 91c9626..5e3bf6f 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -159,6 +159,7 @@ smx_comm_t SIMIX_communication_new(smx_comm_type_t type)
  */
 void SIMIX_communication_destroy(smx_comm_t comm)
 {
+  VERB2("Destroy communication %p; refcount initially %d",comm,comm->refcount);
   comm->refcount--;
   if(comm->refcount > 0)
     return;
@@ -435,6 +436,23 @@ XBT_INLINE void *SIMIX_communication_get_data(smx_comm_t comm)
   return comm->data;
 }
 
+XBT_PUBLIC(void *) SIMIX_communication_get_src_buf(smx_comm_t comm)
+{
+  return comm->src_buff;
+}
+XBT_PUBLIC(void *) SIMIX_communication_get_dst_buf(smx_comm_t comm)
+{
+  return comm->dst_buff;
+}
+XBT_PUBLIC(size_t) SIMIX_communication_get_src_buf_size(smx_comm_t comm)
+{
+  return (void *)comm->src_buff_size;
+}
+XBT_PUBLIC(size_t *) SIMIX_communication_get_dst_buf_size(smx_comm_t comm)
+{
+  return comm->dst_buff_size;
+}
+
 /******************************************************************************/
 /*                        Synchronous Communication                           */
 /******************************************************************************/
@@ -478,7 +496,7 @@ XBT_INLINE void SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate,
 XBT_INLINE void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff,
                         size_t *dst_buff_size, smx_comm_t *comm_ref)
 {
-  *comm_ref = SIMIX_network_irecv(rdv,dst_buff,dst_buff_size);
+  *comm_ref = (smx_comm_t) SIMIX_network_irecv(rdv,dst_buff,dst_buff_size);
   SIMIX_network_wait(*comm_ref,timeout);
 }
 
@@ -599,7 +617,11 @@ unsigned int SIMIX_network_waitany(xbt_dynar_t comms)
   xbt_assert0(found_comm!=-1,"Cannot find which communication finished");
   xbt_dynar_get_cpy(comms,found_comm,&comm_finished);
 
-  /* Check for errors and cleanup the comm */
-  SIMIX_communication_cleanup(comm_finished);
+  DEBUG2("Communication %p of communication set %p finished", comm_finished, comms);
+
+  /* let the regular code deal with the communication end (errors checking and cleanup).
+   * A bit of useless work will be done, but that's good for source factorization */
+  SIMIX_sem_release_forever(comm_finished->sem);
+  SIMIX_communication_wait_for_completion(comm_finished, -1);
   return found_comm;
 }