Enable using the MC with SMPI

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index b802e34..6f92d0f 100644 (file)
--- 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");
 
@@ -51,30 +58,35 @@ MPI_Comm smpi_process_comm_self(void) {
   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->data = request->data;
+      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);
@@ -86,24 +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->data = req->data;
       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);
@@ -190,7 +198,12 @@ int main(int argc, char **argv)
   fflush(stderr);
   SIMIX_init();
 
-  while (SIMIX_solve(NULL, NULL) != -1.0);
+#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());