X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6c262a93734a964f6aaaddf59d933398db660ff..917c2ef999f2b31df7221183ca8caea0aef85b57:/src/simix/smx_network.c

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 7a457464d7..fa62223c6e 100644
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -23,7 +23,8 @@ static XBT_INLINE void SIMIX_comm_wait_for_completion(smx_action_t comm,
                                                       double timeout);
 static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
 static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
-static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type);
+static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
+										  int (*match_fun)(void *, void *), void *);
 static void SIMIX_rdv_free(void *data);
 
 void SIMIX_network_init(void)
@@ -122,19 +123,27 @@ static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm)
  *  \param type The type of communication we are looking for (comm_send, comm_recv)
  *  \return The communication request if found, NULL otherwise
  */
-smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type)
-{
-  smx_action_t comm = (smx_action_t)
-      xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo));
-
-  if (comm && comm->comm.type == type) {
-    DEBUG0("Communication request found!");
-    xbt_fifo_shift(rdv->comm_fifo);
-    comm->comm.refcount++;
-    comm->comm.rdv = NULL;
-    return comm;
+smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
+								   int (*match_fun)(void *, void *), void *data)
+{
+  smx_action_t req;
+  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;
+    }
+    if (req->comm.type == type && (!match_fun || match_fun(data, req_data))) {
+      xbt_fifo_remove_item(rdv->comm_fifo, item);
+      xbt_fifo_free_item(item);
+      req->comm.refcount++;
+      req->comm.rdv = NULL;
+      return req;
+    }
   }
-
   DEBUG0("Communication request not found");
   return NULL;
 }
@@ -162,6 +171,11 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type)
   act->comm.type = type;
   act->comm.refcount = 1;
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  //initialize with unknown value
+  act->latency_limited = -1;
+#endif
+
 #ifdef HAVE_TRACING
   act->category = NULL;
 #endif
@@ -177,27 +191,21 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type)
  */
 void SIMIX_comm_destroy(smx_action_t action)
 {
-  DEBUG1("Destroy action %p", action);
+  DEBUG2("Destroy action %p (refcount:%d)", action, action->comm.refcount);
 
   if (action->comm.refcount <= 0)
     xbt_die(bprintf("the refcount of comm %p is already 0 before decreasing it. That's a bug!",action));
 
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  //save is latency limited flag to use afterwards
-  if (action->comm.surf_comm) {
-    DEBUG2("adding key %p with latency limited value %d to the dict", action,
-           SIMIX_comm_is_latency_bounded(action));
-    xbt_dicti_set(simix_global->latency_limited_dict, (uintptr_t) action,
-                  SIMIX_comm_is_latency_bounded(action));
-  }
-#endif
-
   action->comm.refcount--;
   if (action->comm.refcount > 0)
     return;
-  VERB2("Really free communication %p; refcount is now %d", action,
+  DEBUG2("Really free communication %p; refcount is now %d", action,
         action->comm.refcount);
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
+#endif
+
 #ifdef HAVE_TRACING
   TRACE_smx_action_destroy(action);
 #endif
@@ -215,6 +223,9 @@ void SIMIX_comm_destroy(smx_action_t action)
 void SIMIX_comm_destroy_internal_actions(smx_action_t action)
 {
   if (action->comm.surf_comm){
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded(action);
+#endif
     action->comm.surf_comm->model_type->action_unref(action->comm.surf_comm);
     action->comm.surf_comm = NULL;
   }
@@ -232,13 +243,14 @@ void SIMIX_comm_destroy_internal_actions(smx_action_t action)
 
 smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
                               double task_size, double rate,
-                              void *src_buff, size_t src_buff_size, void *data)
+                              void *src_buff, size_t src_buff_size,
+                              int (*match_fun)(void *, void *), void *data)
 {
   smx_action_t action;
 
   /* Look for communication request matching our needs.
      If it is not found then create it and push it into the rendez-vous point */
-  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_RECEIVE);
+  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_RECEIVE, match_fun, data);
 
   if (!action) {
     action = SIMIX_comm_new(SIMIX_COMM_SEND);
@@ -254,7 +266,7 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
   action->comm.rate = rate;
   action->comm.src_buff = src_buff;
   action->comm.src_buff_size = src_buff_size;
-  action->comm.data = data;
+  action->comm.src_data = data;
 
   if (MC_IS_ENABLED) {
     action->state = SIMIX_RUNNING;
@@ -266,14 +278,15 @@ smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
 }
 
 smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
-                      void *dst_buff, size_t *dst_buff_size)
+                      void *dst_buff, size_t *dst_buff_size,
+                      int (*match_fun)(void *, void *), void *data)
 {
   smx_action_t action;
 
   /* Look for communication request matching our needs.
    * If it is not found then create it and push it into the rendez-vous point
    */
-  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND);
+  action = SIMIX_rdv_get_request(rdv, SIMIX_COMM_SEND, match_fun, data);
 
   if (!action) {
     action = SIMIX_comm_new(SIMIX_COMM_RECEIVE);
@@ -287,6 +300,7 @@ smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
   action->comm.dst_proc = dst_proc;
   action->comm.dst_buff = dst_buff;
   action->comm.dst_buff_size = dst_buff_size;
+  action->comm.dst_data = data;
 
   if (MC_IS_ENABLED) {
     action->state = SIMIX_RUNNING;
@@ -310,6 +324,7 @@ void SIMIX_pre_comm_wait(smx_req_t req)
   if (MC_IS_ENABLED){
     action->state = SIMIX_DONE;
     SIMIX_comm_finish(action);
+    return;
   }
 
   /* If the action has already finish perform the error handling, */
@@ -335,12 +350,27 @@ void SIMIX_pre_comm_test(smx_req_t req)
   if (req->comm_test.result) {
     xbt_fifo_push(action->request_list, req);
     SIMIX_comm_finish(action);
-  }
-  else {
+  } else {
     SIMIX_request_answer(req);
   }
 }
 
+void SIMIX_pre_comm_testany(smx_req_t req)
+{
+  unsigned int cursor;
+  smx_action_t action;
+  req->comm_testany.result = -1;
+  xbt_dynar_foreach(req->comm_testany.comms,cursor,action) {
+    if (action->state != SIMIX_WAITING && action->state != SIMIX_RUNNING) {
+      req->comm_testany.result = cursor;
+      xbt_fifo_push(action->request_list, req);
+      SIMIX_comm_finish(action);
+      return;
+    }
+  }
+  SIMIX_request_answer(req);
+}
+
 void SIMIX_pre_comm_waitany(smx_req_t req)
 {
   smx_action_t action;
@@ -390,7 +420,6 @@ static XBT_INLINE void SIMIX_comm_start(smx_action_t action)
 
 #ifdef HAVE_TRACING
     TRACE_smx_action_communicate(action, action->comm.src_proc);
-    TRACE_surf_action(action->comm.surf_comm, action->category);
 #endif
 
     /* If a link is failed, detect it immediately */
@@ -593,13 +622,23 @@ e_smx_state_t SIMIX_comm_get_state(smx_action_t action)
 }
 
 /**
- *  \brief Return the user data associated to the communication
+ *  \brief Return the user data associated to the sender of the communication
+ *  \param action The communication
+ *  \return the user data
+ */
+void* SIMIX_comm_get_src_data(smx_action_t action)
+{
+  return action->comm.src_data;
+}
+
+/**
+ *  \brief Return the user data associated to the receiver of the communication
  *  \param action The communication
  *  \return the user data
  */
-void* SIMIX_comm_get_data(smx_action_t action)
+void* SIMIX_comm_get_dst_data(smx_action_t action)
 {
-  return action->comm.data;
+  return action->comm.dst_data;
 }
 
 void* SIMIX_comm_get_src_buff(smx_action_t action)
@@ -646,21 +685,12 @@ smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action)
  */
 XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
 {
-  //try to find comm on the list of finished flows
-  uintptr_t key = 0;
-  uintptr_t data = 0;
-  xbt_dict_cursor_t cursor;
-  xbt_dict_foreach(simix_global->latency_limited_dict, cursor, key, data) {
-    DEBUG2("comparing key=%p with comm=%p", (void *) key, (void *) action);
-    if ((void *) action == (void *) key) {
-      DEBUG2("key %p found, return value latency limited value %d",
-             (void *) key, (int) data);
-      xbt_dict_cursor_free(&cursor);
-      return (int) data;
-    }
+  if (action->comm.surf_comm){
+      DEBUG1("Getting latency limited for surf_action (%p)", action->comm.surf_comm);
+      action->latency_limited = surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+      DEBUG1("Action limited is %d", action->latency_limited);
   }
-
-  return surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+  return action->latency_limited;
 }
 #endif