Solve white space conflicts

[simgrid.git] / src / smpi / smpi_base.c

diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 91cb599..991d09f 100644 (file)
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -10,17 +10,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi,
                                 "Logging specific to SMPI (base)");
-XBT_LOG_EXTERNAL_CATEGORY(smpi_base);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_bench);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_mpi_dt);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_coll);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_receiver);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_sender);
-XBT_LOG_EXTERNAL_CATEGORY(smpi_util);
-
-static int match_recv(void* a, void* b) {
+
+static int match_recv(void* a, void* b, smx_action_t ignored) {
    MPI_Request ref = (MPI_Request)a;
    MPI_Request req = (MPI_Request)b;
 
@@ -30,7 +21,7 @@ static int match_recv(void* a, void* b) {
           && (ref->tag == MPI_ANY_TAG || req->tag == ref->tag);
 }
 
-static int match_send(void* a, void* b) {
+static int match_send(void* a, void* b,smx_action_t ignored) {
    MPI_Request ref = (MPI_Request)a;
    MPI_Request req = (MPI_Request)b;
 
@@ -63,6 +54,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,40 +92,42 @@ 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(
-                         smpi_group_index(smpi_comm_group(request->comm), request->dst));
+        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)
-       void *oldbuf = request->buf;
-       detached = 1;
-       request->buf = malloc(request->size);
-       memcpy(request->buf,oldbuf,request->size);
-       XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf);
+      void *oldbuf = request->buf;
+      detached = 1;
+      request->buf = malloc(request->size);
+      memcpy(request->buf,oldbuf,request->size);
+      XBT_DEBUG("Send request %p is detached; buf %p copied into %p",request,oldbuf,request->buf);
     } else {
-       XBT_DEBUG("Send request %p is not detached (buf: %p)",request,request->buf);
+      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,
-                                   &smpi_mpi_request_free, // how to free the userdata if a detached send fails
-                                   request,
-                                   // detach if msg size < eager/rdv switch limit
-                                   detached);
+    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
   }
 }
 
 void smpi_mpi_startall(int count, MPI_Request * requests)
 {
-         int i;
+    int i;
 
   for(i = 0; i < count; i++) {
     smpi_mpi_start(requests[i]);
@@ -248,13 +247,13 @@ int smpi_mpi_test(MPI_Request * request, MPI_Status * status) {
 int flag;
 
    if ((*request)->action == NULL)
-       flag = 1;
+  flag = 1;
    else 
-    flag = SIMIX_req_comm_test((*request)->action);
+    flag = simcall_comm_test((*request)->action);
    if(flag) {
-                   smpi_mpi_wait(request, status);
-         }
-         return flag;
+        smpi_mpi_wait(request, status);
+    }
+    return flag;
 }
 
 int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
@@ -278,7 +277,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];
@@ -296,7 +295,7 @@ void smpi_mpi_wait(MPI_Request * request, MPI_Status * status)
 {
   print_request("Waiting", *request);
   if ((*request)->action != NULL) { // this is not a detached send
-    SIMIX_req_comm_wait((*request)->action, -1.0);
+    simcall_comm_wait((*request)->action, -1.0);
     finish_wait(request, status);
   }
   // FIXME for a detached send, finish_wait is not called:
@@ -325,7 +324,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];