X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70ed180f3ce3495678d048e9e396ef5eb65a6a99..0dc7032494e62bf141c74e192974e95cd5c365c5:/src/smpi/smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 66a1a1a839..6c9f390148 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -1,7 +1,14 @@
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+  * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include <stdint.h>
 
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
+#include "mc/mc.h"
 
 XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories");
 
@@ -13,6 +20,7 @@ typedef struct s_smpi_process_data {
   xbt_fifo_t pending_sent;
   xbt_fifo_t pending_recv;
   xbt_os_timer_t timer;
+  MPI_Comm comm_self;
 } s_smpi_process_data_t;
 
 static smpi_process_data_t* process_data = NULL;
@@ -44,29 +52,41 @@ xbt_os_timer_t smpi_process_timer(void) {
   return data->timer;
 }
 
+MPI_Comm smpi_process_comm_self(void) {
+  smpi_process_data_t data = smpi_process_data();
+
+  return data->comm_self;
+}
+
+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;
 
-  DEBUG4("isend for request %p [src = %d, dst = %d, tag = %d]",
-         request, request->src, request->dst, request->tag);
+  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)){
-      DEBUG4("find matching request %p [src = %d, dst = %d, tag = %d]",
-             req, req->src, req->dst, req->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;
-    } else {
-      DEBUG4("not matching request %p [src = %d, dst = %d, tag = %d]",
-             req, req->src, req->dst, req->tag);
     }
   }
   request->rdv = SIMIX_rdv_create(NULL);
@@ -78,23 +98,20 @@ void smpi_process_post_recv(MPI_Request request) {
   xbt_fifo_item_t item;
   MPI_Request req;
 
-  DEBUG4("irecv for request %p [src = %d, dst = %d, tag = %d]",
-         request, request->src, request->dst, request->tag);
+  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)){
-      DEBUG4("find matching request %p [src = %d, dst = %d, tag = %d]",
-             req, req->src, req->dst, req->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;
-    } else {
-      DEBUG4("not matching request %p [src = %d, dst = %d, tag = %d]",
-             req, req->src, req->dst, req->tag);
     }
   }
   request->rdv = SIMIX_rdv_create(NULL);
@@ -105,6 +122,7 @@ void smpi_global_init(void) {
   int i;
   MPI_Group group;
 
+  SIMIX_network_set_copy_data_callback(&SIMIX_network_copy_buffer_callback);
   process_count = SIMIX_process_count();
   process_data = xbt_new(smpi_process_data_t, process_count);
   for(i = 0; i < process_count; i++) {
@@ -113,6 +131,9 @@ void smpi_global_init(void) {
     process_data[i]->pending_sent = xbt_fifo_new();
     process_data[i]->pending_recv = xbt_fifo_new();
     process_data[i]->timer = xbt_os_timer_new();
+    group = smpi_group_new(1);
+    process_data[i]->comm_self = smpi_comm_new(group);
+    smpi_group_set_mapping(group, i, 0);
   }
   group = smpi_group_new(process_count);
   MPI_COMM_WORLD = smpi_comm_new(group);
@@ -128,6 +149,7 @@ void smpi_global_destroy(void) {
   smpi_comm_destroy(MPI_COMM_WORLD);
   MPI_COMM_WORLD = MPI_COMM_NULL;
   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);
@@ -142,17 +164,35 @@ int main(int argc, char **argv)
   srand(SMPI_RAND_SEED);
 
   double default_reference_speed = 20000.0;
-  xbt_cfg_register(&_surf_cfg_set, "reference_speed",
+  xbt_cfg_register(&_surf_cfg_set, "smpi/running_power",
                    "Power of the host running the simulation (in flop/s). Used to bench the operations.",
                    xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, NULL);
 
   int default_display_timing = 0;
-  xbt_cfg_register(&_surf_cfg_set, "display_timing",
+  xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing",
                    "Boolean indicating whether we should display the timing after simulation.",
                    xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
 
+  int default_display_smpe = 0;
+  xbt_cfg_register(&_surf_cfg_set, "smpi/log_events",
+                   "Boolean indicating whether we should display simulated time spent in MPI calls.",
+                   xbt_cfgelm_int, &default_display_smpe, 1, 1, NULL, NULL);
+
+  double default_threshold = 1e-6;
+  xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold",
+                   "Minimal computation time (in seconds) not discarded.",
+                   xbt_cfgelm_double, &default_threshold, 1, 1, NULL, NULL);
+
+#ifdef HAVE_TRACING
+  TRACE_global_init (&argc, argv);
+#endif
+
   SIMIX_global_init(&argc, argv);
 
+#ifdef HAVE_TRACING
+  TRACE_smpi_start ();
+#endif
+
   // parse the platform file: get the host list
   SIMIX_create_environment(argv[1]);
 
@@ -166,13 +206,24 @@ int main(int argc, char **argv)
   fflush(stderr);
   SIMIX_init();
 
-  while (SIMIX_solve(NULL, NULL) != -1.0);
-  
-  if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
+#ifdef HAVE_MC
+  if (_surf_do_model_check)
+    MC_modelcheck(1);
+  else
+#endif
+    while (SIMIX_solve(NULL, NULL) != -1.0);
+
+  if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
     INFO1("simulation time %g", SIMIX_get_clock());
 
   smpi_global_destroy();
 
+  SIMIX_message_sizes_output("toto.txt");
+
+#ifdef HAVE_TRACING
+  TRACE_smpi_end ();
+#endif
+
   SIMIX_clean();
   return 0;
 }