Some bugfixes:

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

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 008da75..8280532 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -51,8 +51,8 @@ smx_rdv_t SIMIX_rdv_create(const char *name)
     rdv->name = name ? xbt_strdup(name) : NULL;
     rdv->comm_fifo = xbt_fifo_new();
 
-    if (name)
-      xbt_dict_set(rdv_points, name, rdv, SIMIX_rdv_free);
+    if (rdv->name)
+      xbt_dict_set(rdv_points, rdv->name, rdv, SIMIX_rdv_free);
   }
   return rdv;
 }
@@ -60,7 +60,7 @@ smx_rdv_t SIMIX_rdv_create(const char *name)
 void SIMIX_rdv_destroy(smx_rdv_t rdv)
 {
   if (rdv->name)
-    xbt_dict_remove(rdv_points, rdv->name); 
+    xbt_dict_remove(rdv_points, rdv->name);
 }
 
 void SIMIX_rdv_free(void *data)
@@ -326,7 +326,20 @@ void SIMIX_pre_comm_wait(smx_req_t req)
   req->issuer->waiting_action = action;
 
   if (MC_IS_ENABLED){
-    action->state = SIMIX_DONE;
+    if(action->comm.src_proc && action->comm.dst_proc){
+      action->state = SIMIX_DONE;
+    }else{
+      /* If we reached this point, the wait request must have a timeout */
+      /* Otherwise it shouldn't be enabled and executed by the MC */
+      if(timeout == -1)
+        THROW_IMPOSSIBLE;
+
+      if(action->comm.src_proc == req->issuer)
+        action->state = SIMIX_SRC_TIMEOUT;
+      else
+        action->state = SIMIX_DST_TIMEOUT;
+    }
+
     SIMIX_comm_finish(action);
     return;
   }
@@ -611,7 +624,9 @@ void SIMIX_comm_cancel(smx_action_t action)
     SIMIX_rdv_remove(action->comm.rdv, action);
     action->state = SIMIX_FAILED;
   } else {
-    surf_workstation_model->action_cancel(action->comm.surf_comm);
+    /* When running the MC there are no surf actions */
+    if(!MC_IS_ENABLED)
+      surf_workstation_model->action_cancel(action->comm.surf_comm);
   }
 }