- 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 (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;