X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..bacbeb57f1e9eae6aa69a8f2fa5f455d7f4d1dac:/src/smpi/smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 0fc8226a36..e897b2ee15 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -63,6 +63,12 @@ static MPI_Request build_request(void *buf, int count,
   return request;
 }
 
+static void smpi_mpi_request_free_voidp(void* request)
+{
+  MPI_Request req = request;
+  smpi_mpi_request_free(&req);
+}
+
 /* MPI Low level calls */
 MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype,
                                int dst, int tag, MPI_Comm comm)
@@ -95,7 +101,7 @@ void smpi_mpi_start(MPI_Request request)
     print_request("New recv", request);
     mailbox = smpi_process_mailbox();
     // FIXME: SIMIX does not yet support non-contiguous datatypes
-    request->action = SIMIX_req_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request);
+    request->action = simcall_comm_irecv(mailbox, request->buf, &request->size, &match_recv, request);
   } else {
     print_request("New send", request);
     mailbox = smpi_process_remote_mailbox(
@@ -112,13 +118,18 @@ void smpi_mpi_start(MPI_Request request)
     	XBT_DEBUG("Send request %p is not detached (buf: %p)",request,request->buf);
     }
     request->action = 
-		SIMIX_req_comm_isend(mailbox, request->size, -1.0,
-				    request->buf, request->size, &match_send, request,  
+		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
-    SIMIX_req_set_category (request->action, TRACE_internal_smpi_get_category());
+    /* FIXME: detached sends are not traceable (request->action == NULL) */
+    if (request->action)
+      simcall_set_category(request->action, TRACE_internal_smpi_get_category());
 #endif
   }
 }
@@ -247,7 +258,7 @@ int flag;
    if ((*request)->action == NULL)
 	flag = 1;
    else 
-    flag = SIMIX_req_comm_test((*request)->action);
+    flag = simcall_comm_test((*request)->action);
    if(flag) {
 		    smpi_mpi_wait(request, status);
 	  }
@@ -275,7 +286,7 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
       }
     }
     if(size > 0) {
-      i = SIMIX_req_comm_testany(comms);
+      i = simcall_comm_testany(comms);
       // FIXME: MPI_UNDEFINED or does SIMIX have a return code?
       if(i != MPI_UNDEFINED) {
         *index = map[i];
@@ -292,9 +303,11 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
 void smpi_mpi_wait(MPI_Request * request, MPI_Status * status)
 {
   print_request("Waiting", *request);
-  if ((*request)->action != NULL ) 
- 	 SIMIX_req_comm_wait((*request)->action, -1.0);
-  finish_wait(request, status);
+  if ((*request)->action != NULL) { // this is not a detached send
+    simcall_comm_wait((*request)->action, -1.0);
+    finish_wait(request, status);
+  }
+  // FIXME for a detached send, finish_wait is not called:
 }
 
 int smpi_mpi_waitany(int count, MPI_Request requests[],
@@ -320,7 +333,7 @@ int smpi_mpi_waitany(int count, MPI_Request requests[],
       }
     }
     if(size > 0) {
-      i = SIMIX_req_comm_waitany(comms);
+      i = simcall_comm_waitany(comms);
       // FIXME: MPI_UNDEFINED or does SIMIX have a return code?
       if (i != MPI_UNDEFINED) {
         index = map[i];