Add functions SIMIX_comm_has_send/recv_match

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9807 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/simix/simix.h b/include/simix/simix.h
index 0d246c7..967dd5d 100644 (file)
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -73,6 +73,8 @@ XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_
 XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size);
 XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_action_t comm, size_t buff_size);
 XBT_PUBLIC(smx_action_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
+XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
+XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
 XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action);
 
 /******************************************************************************/

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 2d1a1e9..31bec78 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -127,6 +127,7 @@ smx_action_t SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, vo
 smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
                                    int (*match_fun)(void *, void *), void *data)
 {
+  // FIXME rewrite this function by using SIMIX_rdv_has_send/recv_match
   smx_action_t action;
   xbt_fifo_item_t item;
   void* req_data = NULL;
@@ -153,6 +154,48 @@ smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
   return NULL;
 }
 
+/**
+ *  \brief Checks if there is a send communication action
+ *  queued in a rendez-vous matching our needs.
+ *  \return 1 if found, 0 otherwise
+ */
+int SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
+
+  smx_action_t action;
+  xbt_fifo_item_t item;
+
+  xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+    if (action->comm.type == SIMIX_COMM_SEND
+        && (!match_fun || match_fun(data, action->comm.src_data))) {
+      XBT_DEBUG("Found a matching communication action %p", action);
+      return 1;
+    }
+  }
+  XBT_DEBUG("No matching communication action found");
+  return 1;
+}
+
+/**
+ *  \brief Checks if there is a recv communication action
+ *  queued in a rendez-vous matching our needs.
+ *  \return 1 if found, 0 otherwise
+ */
+int SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data) {
+
+  smx_action_t action;
+  xbt_fifo_item_t item;
+
+  xbt_fifo_foreach(rdv->comm_fifo, item, action, smx_action_t){
+    if (action->comm.type == SIMIX_COMM_RECEIVE
+        && (!match_fun || match_fun(data, action->comm.dst_data))) {
+      XBT_DEBUG("Found a matching communication action %p", action);
+      return 1;
+    }
+  }
+  XBT_DEBUG("No matching communication action found");
+  return 1;
+}
+
 /******************************************************************************/
 /*                            Comunication Actions                            */
 /******************************************************************************/