X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5aaf4dee2a063da0b9e1dc52672872a43a0a8e10..b08cf565e62c980d3fa23c031b341ca4f1427bd9:/src/simix/SynchroComm.cpp

diff --git a/src/simix/SynchroComm.cpp b/src/simix/SynchroComm.cpp
index 5a5ccb5a52..4342cb107e 100644
--- a/src/simix/SynchroComm.cpp
+++ b/src/simix/SynchroComm.cpp
@@ -14,12 +14,30 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_network);
 simgrid::simix::Comm::Comm(e_smx_comm_type_t _type) {
   state = SIMIX_WAITING;
   this->type = _type;
-  refcount = 1;
   src_data=NULL;
   dst_data=NULL;
 
   XBT_DEBUG("Create communicate synchro %p", this);
 }
+
+simgrid::simix::Comm::~Comm()
+{
+  XBT_DEBUG("Really free communication %p", this);
+
+  cleanupSurf();
+
+  if (detached && state != SIMIX_DONE) {
+    /* the communication has failed and was detached:
+     * we have to free the buffer */
+    if (clean_fun)
+      clean_fun(src_buff);
+    src_buff = NULL;
+  }
+
+  if(mbox)
+    SIMIX_mbox_remove(mbox, this);
+
+}
 void simgrid::simix::Comm::suspend()
 {
   /* FIXME: shall we suspend also the timeout synchro? */
@@ -73,34 +91,6 @@ double simgrid::simix::Comm::remains()
   }
 }
 
-void simgrid::simix::Comm::unref()
-{
-  XBT_DEBUG("Destroy synchro %p (refcount: %d), state: %d", this, refcount, (int)state);
-
-  xbt_assert(refcount > 0,
-      "This comm has a negative refcount! You must not call test() or wait() more than once on a given communication.");
-
-  refcount--;
-  if (refcount > 0)
-      return;
-  XBT_DEBUG("Really free communication %p; refcount is now %d", this, refcount);
-
-  cleanupSurf();
-
-  if (detached && state != SIMIX_DONE) {
-    /* the communication has failed and was detached:
-     * we have to free the buffer */
-    if (clean_fun)
-      clean_fun(src_buff);
-    src_buff = NULL;
-  }
-
-  if(mbox)
-    SIMIX_mbox_remove(mbox, this);
-
-  delete this;
-}
-
 /** @brief This is part of the cleanup process, probably an internal command */
 void simgrid::simix::Comm::cleanupSurf()
 {
@@ -119,3 +109,30 @@ void simgrid::simix::Comm::cleanupSurf()
     dst_timeout = NULL;
   }
 }
+
+void simgrid::simix::Comm::post()
+{
+  /* Update synchro state */
+  if (src_timeout &&  src_timeout->getState() == simgrid::surf::Action::State::done)
+    state = SIMIX_SRC_TIMEOUT;
+  else if (dst_timeout && dst_timeout->getState() == simgrid::surf::Action::State::done)
+    state = SIMIX_DST_TIMEOUT;
+  else if (src_timeout && src_timeout->getState() == simgrid::surf::Action::State::failed)
+    state = SIMIX_SRC_HOST_FAILURE;
+  else if (dst_timeout && dst_timeout->getState() == simgrid::surf::Action::State::failed)
+    state = SIMIX_DST_HOST_FAILURE;
+  else if (surf_comm && surf_comm->getState() == simgrid::surf::Action::State::failed) {
+    state = SIMIX_LINK_FAILURE;
+  } else
+    state = SIMIX_DONE;
+
+  XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d",
+            this, (int)state, src_proc, dst_proc, detached);
+
+  /* destroy the surf actions associated with the Simix communication */
+  cleanupSurf();
+
+  /* if there are simcalls associated with the synchro, then answer them */
+  if (xbt_fifo_size(simcalls))
+    SIMIX_comm_finish(this);
+}