- 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 action;
+ xbt_fifo_item_t item;
+ void* req_data = NULL;
+
+ 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 (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);
+ 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);