X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/005cf0f71b3817a9e93de0b0c3bd92f216ef5c7f..a85110a0cc574b70238ac058937989e573434f88:/src/smpi/smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 896facd74a..6fa73d2ef6 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -5,6 +5,7 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "private.h"
@@ -21,8 +22,7 @@ typedef struct s_smpi_process_data {
   int index;
   int* argc;
   char*** argv;
-  xbt_fifo_t pending_sent;
-  xbt_fifo_t pending_recv;
+  smx_rdv_t mailbox;
   xbt_os_timer_t timer;
   double simulated;
   MPI_Comm comm_self;
@@ -33,6 +33,13 @@ static int process_count = 0;
 
 MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;
 
+#define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1)
+
+static char* get_mailbox_name(char* str, int index) {
+  snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int)(sizeof(int) * 2), index);
+  return str;
+}
+
 void smpi_process_init(int *argc, char ***argv)
 {
   int index;
@@ -52,7 +59,7 @@ void smpi_process_init(int *argc, char ***argv)
     (*argc)--;
     data->argc = argc;
     data->argv = argv;
-    DEBUG2("<%d> New process in the game: %p", index, proc);
+    XBT_DEBUG("<%d> New process in the game: %p", index, proc);
   }
 }
 
@@ -60,7 +67,7 @@ void smpi_process_destroy(void)
 {
   int index = smpi_process_index();
 
-  DEBUG1("<%d> Process left the game", index);
+  XBT_DEBUG("<%d> Process left the game", index);
 }
 
 int smpi_process_argc(void) {
@@ -69,10 +76,10 @@ int smpi_process_argc(void) {
   return data->argc ? *(data->argc) - 1 : 0;
 }
 
-int smpi_process_getarg(int* index, char* dst, size_t len) {
+int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
   smpi_process_data_t data = smpi_process_data();
   char* arg;
-  size_t i;
+  ftnlen i;
 
   if(!data->argc || !data->argv
      || *index < 1 || *index >= *(data->argc)) {
@@ -88,14 +95,11 @@ int smpi_process_getarg(int* index, char* dst, size_t len) {
   return 0;
 }
 
-int smpi_global_rank(void) {
-   return smpi_process_index();
-}
-
 int smpi_global_size(void) {
    char* value = getenv("SMPI_GLOBAL_SIZE");
 
    if(!value) {
+      fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
       abort();
    }
    return atoi(value);
@@ -103,7 +107,7 @@ int smpi_global_size(void) {
 
 smpi_process_data_t smpi_process_data(void)
 {
-  return SIMIX_req_process_get_data(SIMIX_process_self());
+  return SIMIX_process_self_get_data(SIMIX_process_self());
 }
 
 smpi_process_data_t smpi_process_remote_data(int index)
@@ -123,6 +127,18 @@ int smpi_process_index(void)
   return data->index;
 }
 
+smx_rdv_t smpi_process_mailbox(void) {
+  smpi_process_data_t data = smpi_process_data();
+
+  return data->mailbox;
+}
+
+smx_rdv_t smpi_process_remote_mailbox(int index) {
+  smpi_process_data_t data = smpi_process_remote_data(index);
+
+  return data->mailbox;
+}
+
 xbt_os_timer_t smpi_process_timer(void)
 {
   smpi_process_data_t data = smpi_process_data();
@@ -153,77 +169,18 @@ MPI_Comm smpi_process_comm_self(void)
 
 void print_request(const char *message, MPI_Request request)
 {
-  char *req =
-      bprintf
-      ("[buf = %p, size = %zu, src = %d, dst = %d, tag= %d, complete = %d, flags = %u]",
-       request->buf, request->size, request->src, request->dst,
-       request->tag, request->complete, request->flags);
-
-  DEBUG5("%s  (request %p with rdv %p and match %p) %s",
-         message, request, request->rdv, request->match, req);
-  free(req);
-}
-
-void smpi_process_post_send(MPI_Comm comm, MPI_Request request)
-{
-  int index = smpi_group_index(smpi_comm_group(comm), request->dst);
-  smpi_process_data_t data = smpi_process_remote_data(index);
-  xbt_fifo_item_t item;
-  MPI_Request req;
-
-  print_request("Isend", request);
-  xbt_fifo_foreach(data->pending_recv, item, req, MPI_Request) {
-    if (req->comm == request->comm
-        && (req->src == MPI_ANY_SOURCE || req->src == request->src)
-        && (req->tag == MPI_ANY_TAG || req->tag == request->tag)) {
-      print_request("Match found", req);
-      xbt_fifo_remove_item(data->pending_recv, item);
-      /* Materialize the *_ANY_* fields from corresponding irecv request */
-      req->src = request->src;
-      req->tag = request->tag;
-      req->match = request;
-      request->rdv = req->rdv;
-      request->match = req;
-      return;
-    }
-  }
-  request->rdv = SIMIX_req_rdv_create(NULL);
-  xbt_fifo_push(data->pending_sent, request);
-}
-
-void smpi_process_post_recv(MPI_Request request)
-{
-  smpi_process_data_t data = smpi_process_data();
-  xbt_fifo_item_t item;
-  MPI_Request req;
-
-  print_request("Irecv", request);
-  xbt_fifo_foreach(data->pending_sent, item, req, MPI_Request) {
-    if (req->comm == request->comm
-        && (request->src == MPI_ANY_SOURCE || req->src == request->src)
-        && (request->tag == MPI_ANY_TAG || req->tag == request->tag)) {
-      print_request("Match found", req);
-      xbt_fifo_remove_item(data->pending_sent, item);
-      /* Materialize the *_ANY_* fields from the irecv request */
-      req->match = request;
-      request->src = req->src;
-      request->tag = req->tag;
-      request->rdv = req->rdv;
-      request->match = req;
-      return;
-    }
-  }
-  request->rdv = SIMIX_req_rdv_create(NULL);
-  xbt_fifo_push(data->pending_recv, request);
+  XBT_DEBUG("%s  request %p  [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
+         message, request, request->buf, request->size,
+         request->src, request->dst, request->tag, request->flags);
 }
 
 void smpi_global_init(void)
 {
   int i;
   MPI_Group group;
+  char name[MAILBOX_NAME_MAXLEN];
 
-  SIMIX_comm_set_copy_data_callback
-      (&SIMIX_comm_copy_buffer_callback);
+  SIMIX_comm_set_copy_data_callback(&smpi_comm_copy_data_callback);
   process_count = SIMIX_process_count();
   process_data = xbt_new(smpi_process_data_t, process_count);
   for (i = 0; i < process_count; i++) {
@@ -231,8 +188,7 @@ void smpi_global_init(void)
     process_data[i]->index = i;
     process_data[i]->argc = NULL;
     process_data[i]->argv = NULL;
-    process_data[i]->pending_sent = xbt_fifo_new();
-    process_data[i]->pending_recv = xbt_fifo_new();
+    process_data[i]->mailbox = SIMIX_req_rdv_create(get_mailbox_name(name, i));
     process_data[i]->timer = xbt_os_timer_new();
     group = smpi_group_new(1);
     process_data[i]->comm_self = smpi_comm_new(group);
@@ -256,8 +212,7 @@ void smpi_global_destroy(void)
   for (i = 0; i < count; i++) {
     smpi_comm_destroy(process_data[i]->comm_self);
     xbt_os_timer_free(process_data[i]->timer);
-    xbt_fifo_free(process_data[i]->pending_recv);
-    xbt_fifo_free(process_data[i]->pending_sent);
+    SIMIX_req_rdv_destroy(process_data[i]->mailbox);
     xbt_free(process_data[i]);
   }
   xbt_free(process_data);
@@ -298,6 +253,11 @@ int MAIN__(void)
                    xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
                    NULL);
 
+  if(getenv("SMPI_PRETEND_CC") != NULL) {
+	/* Hack to ensure that smpicc can pretend to be a simple compiler. Particularly handy to pass it to the configuration tools */
+    return 0;
+  }
+
 #ifdef HAVE_TRACING
   TRACE_global_init(&xargc, xargv);
 #endif
@@ -311,7 +271,7 @@ int MAIN__(void)
   // parse the platform file: get the host list
   SIMIX_create_environment(xargv[1]);
 
-  SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
+  SIMIX_function_register_default(smpi_simulated_main);
   SIMIX_launch_application(xargv[2]);
 
   smpi_global_init();
@@ -326,7 +286,7 @@ int MAIN__(void)
     SIMIX_run();
 
   if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
-    INFO1("simulation time %g", SIMIX_get_clock());
+    XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock());
 
   smpi_global_destroy();