/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "simgrid/s4u/Mutex.hpp"
-#include "simgrid/s4u/ConditionVariable.hpp"
+
#include "smpi_request.hpp"
#include "mc/mc.h"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/smpi/include/smpi_actor.hpp"
-#include "xbt/config.hpp"
-
#include <algorithm>
mut->unlock();
} else { /* the RECV flag was not set, so this is a send */
simgrid::smpi::ActorExt* process = smpi_process_remote(simgrid::s4u::Actor::by_pid(dst_));
+ xbt_assert(process, "Actor pid=%d is gone??", dst_);
int rank = src_;
if (TRACE_smpi_view_internals()) {
TRACE_smpi_send(rank, rank, dst_, tag_, size_);
Status::empty(status);
*flag = 1;
if (((*request)->flags_ & MPI_REQ_PREPARED) == 0) {
- if ((*request)->action_ != nullptr){
+ if ((*request)->action_ != nullptr && (*request)->cancelled_ != 1){
try{
*flag = simcall_comm_test((*request)->action_);
} catch (const Exception&) {
*count = 0;
for (int i = 0; i < incount; i++) {
- if (requests[i] != MPI_REQUEST_NULL) {
+ if (requests[i] != MPI_REQUEST_NULL && not (requests[i]->flags_ & MPI_REQ_FINISHED)) {
ret = test(&requests[i], pstat, &flag);
if(ret!=MPI_SUCCESS)
error = 1;
if(flag) {
- indices[i] = 1;
- (*count)++;
+ indices[*count] = i;
if (status != MPI_STATUSES_IGNORE)
- status[i] = *pstat;
+ status[*count] = *pstat;
+ (*count)++;
if ((requests[i] != MPI_REQUEST_NULL) && (requests[i]->flags_ & MPI_REQ_NON_PERSISTENT))
requests[i] = MPI_REQUEST_NULL;
}
int index = 0;
MPI_Status stat;
MPI_Status *pstat = status == MPI_STATUSES_IGNORE ? MPI_STATUS_IGNORE : &stat;
-
index = waitany(incount, (MPI_Request*)requests, pstat);
if(index==MPI_UNDEFINED) return MPI_UNDEFINED;
if(status != MPI_STATUSES_IGNORE) {
indices[count] = index;
count++;
for (int i = 0; i < incount; i++) {
- if (i==index)
- continue;
- if (requests[i] != MPI_REQUEST_NULL) {
+ if (i!=index && requests[i] != MPI_REQUEST_NULL
+ && not(requests[i]->flags_ & MPI_REQ_FINISHED)) {
test(&requests[i], pstat,&flag);
if (flag==1){
indices[count] = i;
char key[KEY_SIZE];
if(id==MPI_FORTRAN_REQUEST_NULL)
return static_cast<MPI_Request>(MPI_REQUEST_NULL);
- return static_cast<MPI_Request>(F2C::f2c_lookup()->at(get_key_id(key, id)));
-}
-
-int Request::add_f()
-{
- if (F2C::f2c_lookup() == nullptr) {
- F2C::set_f2c_lookup(new std::unordered_map<std::string, F2C*>);
- }
- char key[KEY_SIZE];
- (*(F2C::f2c_lookup()))[get_key_id(key, F2C::f2c_id())] = this;
- F2C::f2c_id_increment();
- return F2C::f2c_id()-1;
+ return static_cast<MPI_Request>(F2C::f2c_lookup()->at(get_key(key,id)));
}
void Request::free_f(int id)
{
if (id != MPI_FORTRAN_REQUEST_NULL) {
char key[KEY_SIZE];
- F2C::f2c_lookup()->erase(get_key_id(key, id));
+ F2C::f2c_lookup()->erase(get_key(key, id));
}
}
-
int Request::get_status(MPI_Request req, int* flag, MPI_Status * status){
*flag=0;