- if (request->comm == message->comm &&
- (MPI_ANY_SOURCE == request->src || request->src == message->src) &&
- (MPI_ANY_TAG == request->tag || request->tag == message->tag)) {
+ if (
+ request->comm == message->comm &&
+ (MPI_ANY_SOURCE == request->src || request->src == message->src) &&
+ (MPI_ANY_TAG == request->tag || request->tag == message->tag) &&
+ (message->action != SURF_ACTION_READY && message->action != SURF_ACTION_RUNNING)
+ ) {