summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f2bf42c)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4820
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
smpi_mpi_request_t request = NULL;
smpi_mpi_request_t request = NULL;
- // FIXME: make sure requestptr is not null
+ // parameter checking prob belongs in smpi_mpi, but this is less repeat code
if (NULL == buf) {
retval = MPI_ERR_INTERN;
} else if (0 > count) {
if (NULL == buf) {
retval = MPI_ERR_INTERN;
} else if (0 > count) {
} else if (NULL == comm) {
retval = MPI_ERR_COMM;
} else if (NULL == requestptr) {
} else if (NULL == comm) {
retval = MPI_ERR_COMM;
} else if (NULL == requestptr) {
- retval = MPI_ERR_INTERN;
} else {
request = xbt_mallocator_get(smpi_global->request_mallocator);
request->comm = comm;
} else {
request = xbt_mallocator_get(smpi_global->request_mallocator);
request->comm = comm;
- if (NULL == request) {
- retval = MPI_ERR_ARG;
- } else {
- int dst = 0;
- retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
- if (NULL != *request && MPI_SUCCESS == retval) {
- retval = smpi_mpi_irecv(*request);
- }
+ retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, request);
+ if (NULL != *request && MPI_SUCCESS == retval) {
+ retval = smpi_mpi_irecv(*request);
int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
{
int retval = MPI_SUCCESS;
int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status *status)
{
int retval = MPI_SUCCESS;
smpi_mpi_request_t request;
smpi_bench_end();
smpi_mpi_request_t request;
smpi_bench_end();
- retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
+ retval = smpi_create_request(buf, count, datatype, src, 0, tag, comm, &request);
if (NULL != request && MPI_SUCCESS == retval) {
retval = smpi_mpi_irecv(request);
if (MPI_SUCCESS == retval) {
if (NULL != request && MPI_SUCCESS == retval) {
retval = smpi_mpi_irecv(request);
if (MPI_SUCCESS == retval) {
- if (NULL == request) {
- retval = MPI_ERR_ARG;
- } else {
- int src = 0;
- retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, request);
- if (NULL != *request && MPI_SUCCESS == retval) {
- retval = smpi_mpi_isend(*request);
- }
+ retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, request);
+ if (NULL != *request && MPI_SUCCESS == retval) {
+ retval = smpi_mpi_isend(*request);
int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
{
int retval = MPI_SUCCESS;
int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm)
{
int retval = MPI_SUCCESS;
smpi_mpi_request_t request;
smpi_bench_end();
smpi_mpi_request_t request;
smpi_bench_end();
- retval = smpi_create_request(buf, count, datatype, src, dst, tag, comm, &request);
+ retval = smpi_create_request(buf, count, datatype, 0, dst, tag, comm, &request);
if (NULL != request && MPI_SUCCESS == retval) {
retval = smpi_mpi_isend(request);
if (MPI_SUCCESS == retval) {
if (NULL != request && MPI_SUCCESS == retval) {
retval = smpi_mpi_isend(request);
if (MPI_SUCCESS == retval) {
-// FIXME: overly simplistic
int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
int retval = MPI_SUCCESS;
int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
int retval = MPI_SUCCESS;
retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
request->forward = comm->size - 1;
smpi_mpi_isend(request);
retval = smpi_create_request(buf, count, datatype, root, (root + 1) % comm->size, 0, comm, &request);
request->forward = comm->size - 1;
smpi_mpi_isend(request);
- smpi_mpi_wait(request, MPI_STATUS_IGNORE);
- xbt_mallocator_release(smpi_global->request_mallocator, request);
} else {
retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank, 0, comm, &request);
smpi_mpi_irecv(request);
} else {
retval = smpi_create_request(buf, count, datatype, MPI_ANY_SOURCE, rank, 0, comm, &request);
smpi_mpi_irecv(request);
- smpi_mpi_wait(request, MPI_STATUS_IGNORE);
- xbt_mallocator_release(smpi_global->request_mallocator, request);
+ smpi_mpi_wait(request, MPI_STATUS_IGNORE);
+ xbt_mallocator_release(smpi_global->request_mallocator, request);
+
smpi_bench_begin();
return retval;
smpi_bench_begin();
return retval;
request->completed = 1;
SIMIX_cond_broadcast(request->cond);
} else {
request->completed = 1;
SIMIX_cond_broadcast(request->cond);
} else {
- request->src = smpi_mpi_comm_rank(request->comm);
+ request->src = request->comm->index_to_rank_map[index];
request->dst = (request->src + 1) % request->comm->size;
smpi_mpi_isend(request);
}
request->dst = (request->src + 1) % request->comm->size;
smpi_mpi_isend(request);
}
SIMIX_mutex_lock(request->mutex);
message->comm = request->comm;
SIMIX_mutex_lock(request->mutex);
message->comm = request->comm;
- message->src = smpi_mpi_comm_rank(request->comm);
+ message->src = request->comm->index_to_rank_map[index];
message->tag = request->tag;
message->data = request->data;
message->buf = xbt_malloc(request->datatype->size * request->count);
message->tag = request->tag;
message->data = request->data;
message->buf = xbt_malloc(request->datatype->size * request->count);