Don't store user pointers

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

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 104dba6..990a4f5 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)
@@ -119,32 +119,36 @@ static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm)
 }
 
 /**
- *  \brief Checks if there is a communication request queued in a rendez-vous matching our needs
+ *  \brief Checks if there is a communication action queued in a rendez-vous matching our needs
  *  \param type The type of communication we are looking for (comm_send, comm_recv)
- *  \return The communication request if found, NULL otherwise
+ *  \return The communication action if found, NULL otherwise
  */
 smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
-                                                                  int (*match_fun)(void *, void *), void *data)
+                                   int (*match_fun)(void *, void *), void *data)
 {
-  smx_action_t req;
+  smx_action_t action;
   xbt_fifo_item_t item;
   void* req_data = NULL;
 
-  xbt_fifo_foreach(rdv->comm_fifo, item, req, smx_action_t){
-    if(req->comm.type == SIMIX_COMM_SEND) {
-      req_data = req->comm.src_data;
-    } else if(req->comm.type == SIMIX_COMM_RECEIVE) {
-      req_data = req->comm.dst_data;
+  xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+    if (action->comm.type == SIMIX_COMM_SEND) {
+      req_data = action->comm.src_data;
+    } else if (action->comm.type == SIMIX_COMM_RECEIVE) {
+      req_data = action->comm.dst_data;
     }
-    if (req->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+    if (action->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+      DEBUG1("Found a matching communication action %p", action);
       xbt_fifo_remove_item(rdv->comm_fifo, item);
       xbt_fifo_free_item(item);
-      req->comm.refcount++;
-      req->comm.rdv = NULL;
-      return req;
+      action->comm.refcount++;
+      action->comm.rdv = NULL;
+      return action;
     }
+    DEBUG3("Sorry, communication action %p does not match our needs:"
+           " its type is %d but we are looking for a comm of type %d",
+           action, action->comm.type, type);
   }
-  DEBUG0("Communication request not found");
+  DEBUG0("No matching communication action found");
   return NULL;
 }
 
@@ -355,11 +359,25 @@ void SIMIX_pre_comm_test(smx_req_t req)
   }
 }
 
-void SIMIX_pre_comm_testany(smx_req_t req)
+void SIMIX_pre_comm_testany(smx_req_t req, unsigned int idx)
 {
   unsigned int cursor;
   smx_action_t action;
+  xbt_dynar_t actions = req->comm_testany.comms;
   req->comm_testany.result = -1;
+
+  if (MC_IS_ENABLED){
+    if((int)idx == -1){
+      SIMIX_request_answer(req);
+    }else{
+      action = xbt_dynar_get_as(actions, idx, smx_action_t);
+      xbt_fifo_push(action->request_list, req);
+      action->state = SIMIX_DONE;
+      SIMIX_comm_finish(action);
+    }
+    return;
+  }
+
   xbt_dynar_foreach(req->comm_testany.comms,cursor,action) {
     if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
       req->comm_testany.result = cursor;
@@ -371,11 +389,21 @@ void SIMIX_pre_comm_testany(smx_req_t req)
   SIMIX_request_answer(req);
 }
 
-void SIMIX_pre_comm_waitany(smx_req_t req)
+void SIMIX_pre_comm_waitany(smx_req_t req, unsigned int idx)
 {
   smx_action_t action;
   unsigned int cursor = 0;
   xbt_dynar_t actions = req->comm_waitany.comms;
+
+  if (MC_IS_ENABLED){
+    action = xbt_dynar_get_as(actions, idx, smx_action_t);
+    xbt_fifo_push(action->request_list, req);
+    req->comm_waitany.result = idx;
+    action->state = SIMIX_DONE;
+    SIMIX_comm_finish(action);
+    return;
+  }
+
   xbt_dynar_foreach(actions, cursor, action){
     /* Associate this request to the action */
     xbt_fifo_push(action->request_list, req);
@@ -452,7 +480,8 @@ void SIMIX_comm_finish(smx_action_t action)
        return it as the result of the call */
     if (req->call == REQ_COMM_WAITANY) {
       SIMIX_waitany_req_remove_from_actions(req);
-      req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &action);
+      if(!MC_IS_ENABLED)
+        req->comm_waitany.result = xbt_dynar_search(req->comm_waitany.comms, &action);
     }
 
     /* If the action is still in a rendez-vous point then remove from it */