X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bb2efd7e0e8209feca2ae848dcdd90ff5e8394d..d37b09424c4b4e8d5b59c575b5b1b3d1b7c252ee:/src/smpi/smpi_base.c?ds=sidebyside diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c index 9b3641a07f..ff3b8554cb 100644 --- a/src/smpi/smpi_base.c +++ b/src/smpi/smpi_base.c @@ -9,6 +9,7 @@ #include "mc/mc.h" #include "xbt/replay.h" #include +#include "surf/surf.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); @@ -121,39 +122,54 @@ void smpi_mpi_start(MPI_Request request) "Cannot (re)start a non-finished communication"); if(request->flags & RECV) { print_request("New recv", request); + if (request->size < xbt_cfg_get_int(_surf_cfg_set, "smpi/async_small_thres")) + mailbox = smpi_process_mailbox_small(); + else mailbox = smpi_process_mailbox(); + // FIXME: SIMIX does not yet support non-contiguous datatypes request->action = simcall_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request); } else { print_request("New send", request); - mailbox = smpi_process_remote_mailbox( - smpi_group_index(smpi_comm_group(request->comm), request->dst)); - // FIXME: SIMIX does not yet support non-contiguous datatypes - if (request->size < 64*1024 ) { // eager mode => detached send (FIXME: this limit should be configurable) + if (request->size < xbt_cfg_get_int(_surf_cfg_set, "smpi/async_small_thres")) { // eager mode => detached send (FIXME: this limit should be configurable) + mailbox = smpi_process_remote_mailbox_small( + smpi_group_index(smpi_comm_group(request->comm), request->dst)); + }else{ + XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf); + mailbox = smpi_process_remote_mailbox( + smpi_group_index(smpi_comm_group(request->comm), request->dst)); + } + if (request->size < 64*1024 ) { //(FIXME: this limit should be configurable) void *oldbuf = request->buf; detached = 1; request->buf = malloc(request->size); - memcpy(request->buf,oldbuf,request->size); + if (oldbuf) + memcpy(request->buf,oldbuf,request->size); XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf); - } else { + }else{ XBT_DEBUG("Send request %p is not detached (buf: %p)",request,request->buf); + mailbox = smpi_process_remote_mailbox( + smpi_group_index(smpi_comm_group(request->comm), request->dst)); + } + + request->action = + simcall_comm_isend(mailbox, request->size, -1.0, + request->buf, request->size, + &match_send, + &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails + request, + // detach if msg size < eager/rdv switch limit + detached); + + #ifdef HAVE_TRACING + /* FIXME: detached sends are not traceable (request->action == NULL) */ + if (request->action) + simcall_set_category(request->action, TRACE_internal_smpi_get_category()); + #endif + } - request->action = - simcall_comm_isend(mailbox, request->size, -1.0, - request->buf, request->size, - &match_send, - &smpi_mpi_request_free_voidp, // how to free the userdata if a detached send fails - request, - // detach if msg size < eager/rdv switch limit - detached); -#ifdef HAVE_TRACING - /* FIXME: detached sends are not traceable (request->action == NULL) */ - if (request->action) - simcall_set_category(request->action, TRACE_internal_smpi_get_category()); -#endif - } } void smpi_mpi_startall(int count, MPI_Request * requests) @@ -220,13 +236,15 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src, smpi_mpi_wait(&request, status); } + + void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - MPI_Request request; + MPI_Request request; - request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); - smpi_mpi_wait(&request, MPI_STATUS_IGNORE); + request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm); + smpi_mpi_wait(&request, MPI_STATUS_IGNORE); } void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, @@ -348,7 +366,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], XBT_DEBUG("Wait for one of"); for(i = 0; i < count; i++) { if((requests[i] != MPI_REQUEST_NULL) && (requests[i]->action != NULL)) { - print_request(" ", requests[i]); + print_request("Waiting any ", requests[i]); xbt_dynar_push(comms, &requests[i]->action); map[size] = i; size++; @@ -356,10 +374,12 @@ int smpi_mpi_waitany(int count, MPI_Request requests[], } if(size > 0) { i = simcall_comm_waitany(comms); + // FIXME: MPI_UNDEFINED or does SIMIX have a return code? if (i != MPI_UNDEFINED) { index = map[i]; finish_wait(&requests[index], status); + } } xbt_free(map); @@ -671,7 +691,8 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, // FIXME: check for errors smpi_datatype_extent(datatype, &lb, &dataext); // Local copy from root - smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype); + if (sendbuf && recvbuf) + smpi_datatype_copy(sendbuf, count, datatype, recvbuf, count, datatype); // Receive buffers from senders //TODO: make a MPI_barrier here ? requests = xbt_new(MPI_Request, size - 1); @@ -692,10 +713,12 @@ void smpi_mpi_reduce(void *sendbuf, void *recvbuf, int count, smpi_mpi_startall(size - 1, requests); for(src = 0; src < size - 1; src++) { index = smpi_mpi_waitany(size - 1, requests, MPI_STATUS_IGNORE); + XBT_VERB("finished waiting any request with index %d", index); if(index == MPI_UNDEFINED) { break; } - smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype); + if(op) /* op can be MPI_OP_NULL that does nothing */ + smpi_op_apply(op, tmpbufs[index], recvbuf, &count, &datatype); } for(index = 0; index < size - 1; index++) { xbt_free(tmpbufs[index]);