Remove XBT_INFO call

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 8c7edea..60e550f 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -1,54 +1,62 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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 <stdio.h>
-#include <stdlib.h>
+ * under the terms of the license (GNU LGPL) which comes with this package. */

 
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
 #include "mc/mc.h"
 
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
 #include "mc/mc.h"

+#include "xbt/replay.h"

 #include "surf/surf.h"
 #include "simix/smx_private.h"
 #include "simgrid/sg_config.h"
 
 #include "surf/surf.h"
 #include "simix/smx_private.h"
 #include "simgrid/sg_config.h"
 

+#include <float.h>              /* DBL_MAX */
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
                                 "Logging specific to SMPI (kernel)");
 
 typedef struct s_smpi_process_data {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
                                 "Logging specific to SMPI (kernel)");
 
 typedef struct s_smpi_process_data {

-  int index;
-  int* argc;
-  char*** argv;
+  double simulated;
+  int *argc;
+  char ***argv;

   smx_rdv_t mailbox;
   smx_rdv_t mailbox_small;
   xbt_os_timer_t timer;
   smx_rdv_t mailbox;
   smx_rdv_t mailbox_small;
   xbt_os_timer_t timer;

-  double simulated;

   MPI_Comm comm_self;
   MPI_Comm comm_self;

-  void *data; /* user data */
+  void *data;                   /* user data */
+  int index;
+  char state;
+  int sampling;                 /* inside an SMPI_SAMPLE_ block? */

 } s_smpi_process_data_t;
 
 static smpi_process_data_t *process_data = NULL;
 static int process_count = 0;
 
 MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;
 } s_smpi_process_data_t;
 
 static smpi_process_data_t *process_data = NULL;
 static int process_count = 0;
 
 MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;

+int MPI_UNIVERSE_SIZE;

 
 

-MPI_Errhandler* MPI_ERRORS_RETURN = NULL;
-MPI_Errhandler* MPI_ERRORS_ARE_FATAL = NULL;
-MPI_Errhandler* MPI_ERRHANDLER_NULL = NULL;
+MPI_Errhandler *MPI_ERRORS_RETURN = NULL;
+MPI_Errhandler *MPI_ERRORS_ARE_FATAL = NULL;
+MPI_Errhandler *MPI_ERRHANDLER_NULL = NULL;

 
 #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1)
 
 
 #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);
+static char *get_mailbox_name(char *str, int index)
+{
+  snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int) (sizeof(int) * 2),
+           index);

   return str;
 }
 
   return str;
 }
 

-static char* get_mailbox_name_small(char* str, int index) {
-  snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int)(sizeof(int) * 2), index);
+static char *get_mailbox_name_small(char *str, int index)
+{
+  snprintf(str, MAILBOX_NAME_MAXLEN, "small%0*x", (int) (sizeof(int) * 2),
+           index);

   return str;
 }
 
   return str;
 }
 


@@ -58,9 +66,12 @@ void smpi_process_init(int *argc, char ***argv)
   smpi_process_data_t data;
   smx_process_t proc;
 
   smpi_process_data_t data;
   smx_process_t proc;
 

-  if(argc && argv) {
+  if (argc && argv) {

     proc = SIMIX_process_self();
     index = atoi((*argv)[1]);
     proc = SIMIX_process_self();
     index = atoi((*argv)[1]);

+#ifdef SMPI_F2C
+    smpi_current_rank = index;
+#endif

     data = smpi_process_remote_data(index);
     simcall_process_set_data(proc, data);
     if (*argc > 2) {
     data = smpi_process_remote_data(index);
     simcall_process_set_data(proc, data);
     if (*argc > 2) {


@@ -71,15 +82,18 @@ void smpi_process_init(int *argc, char ***argv)
     (*argc)--;
     data->argc = argc;
     data->argv = argv;
     (*argc)--;
     data->argc = argc;
     data->argv = argv;

-    simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
+    // set the process attached to the mailbox
+    simcall_rdv_set_receiver(data->mailbox_small, proc);

     XBT_DEBUG("<%d> New process in the game: %p", index, proc);
   }
     XBT_DEBUG("<%d> New process in the game: %p", index, proc);
   }

+  if (smpi_process_data() == NULL)
+    xbt_die("smpi_process_data() returned NULL. You probably gave a NULL parameter to MPI_Init. Although it's required by MPI-2, this is currently not supported by SMPI.");

 }
 
 void smpi_process_destroy(void)
 {
   int index = smpi_process_index();
 }
 
 void smpi_process_destroy(void)
 {
   int index = smpi_process_index();

-  process_data[index]->index=-100;
+  process_data[index]->state = SMPI_FINALIZED;

   XBT_DEBUG("<%d> Process left the game", index);
 }
 
   XBT_DEBUG("<%d> Process left the game", index);
 }
 


@@ -88,10 +102,44 @@ void smpi_process_destroy(void)
  */
 void smpi_process_finalize(void)
 {
  */
 void smpi_process_finalize(void)
 {

+#if 0

   // wait for all pending asynchronous comms to finish
   while (SIMIX_process_has_pending_comms(SIMIX_process_self())) {
     simcall_process_sleep(0.01);
   }
   // wait for all pending asynchronous comms to finish
   while (SIMIX_process_has_pending_comms(SIMIX_process_self())) {
     simcall_process_sleep(0.01);
   }

+#else
+  int i;
+  int size = smpi_comm_size(MPI_COMM_WORLD);
+  int rank = smpi_comm_rank(MPI_COMM_WORLD);
+  /* All non-root send & receive zero-length message. */
+  if (rank > 0) {
+    smpi_mpi_ssend (NULL, 0, MPI_BYTE, 0,
+                    COLL_TAG_BARRIER,
+                    MPI_COMM_WORLD);
+    smpi_mpi_recv (NULL, 0, MPI_BYTE, 0,
+                    COLL_TAG_BARRIER,
+                    MPI_COMM_WORLD, MPI_STATUS_IGNORE);
+  }
+  /* The root collects and broadcasts the messages. */
+  else {
+    MPI_Request* requests;
+    requests = (MPI_Request*)malloc( size * sizeof(MPI_Request) );
+    for (i = 1; i < size; ++i) {
+      requests[i] = smpi_mpi_irecv(NULL, 0, MPI_BYTE, MPI_ANY_SOURCE,
+                                   COLL_TAG_BARRIER, MPI_COMM_WORLD
+                                   );
+    }
+    smpi_mpi_waitall( size-1, requests+1, MPI_STATUSES_IGNORE );
+    for (i = 1; i < size; ++i) {
+      requests[i] = smpi_mpi_issend(NULL, 0, MPI_BYTE, i,
+                                   COLL_TAG_BARRIER,
+                                   MPI_COMM_WORLD
+                                   );
+    }
+    smpi_mpi_waitall( size-1, requests+1, MPI_STATUSES_IGNORE );
+    free( requests );
+  }
+#endif

 }
 
 /**
 }
 
 /**


@@ -99,47 +147,72 @@ void smpi_process_finalize(void)
  */
 int smpi_process_finalized()
 {
  */
 int smpi_process_finalized()
 {

-  // If finalized, this value has been set to -100;
-  return process_data[smpi_process_index()]->index==-100;
+  int index = smpi_process_index();
+    if (index != MPI_UNDEFINED)
+      return (process_data[index]->state == SMPI_FINALIZED);
+    else
+      return 0;
+}
+
+/**
+ * @brief Check if a process is initialized
+ */
+int smpi_process_initialized(void)
+{
+  int index = smpi_process_index();
+  return ( (index != MPI_UNDEFINED)
+          && (process_data[index]->state == SMPI_INITIALIZED));
+}
+
+/**
+ * @brief Mark a process as initialized (=MPI_Init called)
+ */
+void smpi_process_mark_as_initialized(void)
+{
+  int index = smpi_process_index();
+  if ((index != MPI_UNDEFINED) && (!process_data[index]->state != SMPI_FINALIZED))
+    process_data[index]->state = SMPI_INITIALIZED;

 }
 
 
 #ifdef SMPI_F2C
 }
 
 
 #ifdef SMPI_F2C

-int smpi_process_argc(void) {
+int smpi_process_argc(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-

   return data->argc ? *(data->argc) - 1 : 0;
 }
 
   return data->argc ? *(data->argc) - 1 : 0;
 }
 

-int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
+int smpi_process_getarg(integer * index, char *dst, ftnlen len)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-  char* arg;
+  char *arg;

   ftnlen i;
 
   ftnlen i;
 

-  if(!data->argc || !data->argv
-     || *index < 1 || *index >= *(data->argc)) {
+  if (!data->argc || !data->argv || *index < 1 || *index >= *(data->argc)) {

     return -1;
   }
   arg = (*data->argv)[*index];
     return -1;
   }
   arg = (*data->argv)[*index];

-  for(i = 0; i < len && arg[i] != '\0'; i++) {
+  for (i = 0; i < len && arg[i] != '\0'; i++) {

     dst[i] = arg[i];
   }
     dst[i] = arg[i];
   }

-  for(; i < len; i++) {
+  for (; i < len; i++) {

     dst[i] = ' ';
   }
   return 0;
 }
     dst[i] = ' ';
   }
   return 0;
 }

+#endif

 
 

-int smpi_global_size(void) {
-   char* value = getenv("SMPI_GLOBAL_SIZE");
+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");
-     xbt_abort();
-   }
-   return atoi(value);
+  if (!value) {
+    fprintf(stderr,
+            "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
+    xbt_abort();
+  }
+  return atoi(value);

 }
 }

-#endif

 
 smpi_process_data_t smpi_process_data(void)
 {
 
 smpi_process_data_t smpi_process_data(void)
 {


@@ -157,7 +230,8 @@ void smpi_process_set_user_data(void *data)
   process_data->data = data;
 }
 
   process_data->data = data;
 }
 

-void* smpi_process_get_user_data(){
+void *smpi_process_get_user_data()
+{

   smpi_process_data_t process_data = smpi_process_data();
   return process_data->data;
 }
   smpi_process_data_t process_data = smpi_process_data();
   return process_data->data;
 }


@@ -170,71 +244,116 @@ int smpi_process_count(void)
 int smpi_process_index(void)
 {
   smpi_process_data_t data = smpi_process_data();
 int smpi_process_index(void)
 {
   smpi_process_data_t data = smpi_process_data();

-
-  return data->index;
+  //return -1 if not initialized
+  return data ? data->index : MPI_UNDEFINED;

 }
 
 }
 

-smx_rdv_t smpi_process_mailbox(void) {
+smx_rdv_t smpi_process_mailbox(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-

   return data->mailbox;
 }
 
   return data->mailbox;
 }
 

-smx_rdv_t smpi_process_mailbox_small(void) {
+smx_rdv_t smpi_process_mailbox_small(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-

   return data->mailbox_small;
 }
 
   return data->mailbox_small;
 }
 

-smx_rdv_t smpi_process_remote_mailbox(int index) {
+smx_rdv_t smpi_process_remote_mailbox(int index)
+{

   smpi_process_data_t data = smpi_process_remote_data(index);
   smpi_process_data_t data = smpi_process_remote_data(index);

-

   return data->mailbox;
 }
 
 
   return data->mailbox;
 }
 
 

-smx_rdv_t smpi_process_remote_mailbox_small(int index) {
+smx_rdv_t smpi_process_remote_mailbox_small(int index)
+{

   smpi_process_data_t data = smpi_process_remote_data(index);
   smpi_process_data_t data = smpi_process_remote_data(index);

-

   return data->mailbox_small;
 }
 
 xbt_os_timer_t smpi_process_timer(void)
 {
   smpi_process_data_t data = smpi_process_data();
   return data->mailbox_small;
 }
 
 xbt_os_timer_t smpi_process_timer(void)
 {
   smpi_process_data_t data = smpi_process_data();

-

   return data->timer;
 }
 
   return data->timer;
 }
 

-void smpi_process_simulated_start(void) {
+void smpi_process_simulated_start(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-

   data->simulated = SIMIX_get_clock();
 }
 
   data->simulated = SIMIX_get_clock();
 }
 

-double smpi_process_simulated_elapsed(void) {
+double smpi_process_simulated_elapsed(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

-

   return SIMIX_get_clock() - data->simulated;
 }
 
   return SIMIX_get_clock() - data->simulated;
 }
 

-MPI_Comm smpi_process_comm_self(void) {
+MPI_Comm smpi_process_comm_self(void)
+{

   smpi_process_data_t data = smpi_process_data();
   smpi_process_data_t data = smpi_process_data();

+  if(data->comm_self==MPI_COMM_NULL){
+    MPI_Group group = smpi_group_new(1);
+    data->comm_self = smpi_comm_new(group);
+    smpi_group_set_mapping(group, smpi_process_index(), 0);
+  }

 
   return data->comm_self;
 }
 
 
   return data->comm_self;
 }
 

-void print_request(const char *message, MPI_Request 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_process_set_sampling(int s)
+{
+  smpi_process_data_t data = smpi_process_data();
+  data->sampling = s;
+}
+
+int smpi_process_get_sampling(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->sampling;

 }
 
 }
 

-static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
+void print_request(const char *message, MPI_Request 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);
+}
+
+static void smpi_comm_copy_buffer_callback(smx_action_t comm,
+                                           void *buff, size_t buff_size)

 {
   XBT_DEBUG("Copy the data over");
 {
   XBT_DEBUG("Copy the data over");

-  memcpy(comm->comm.dst_buff, buff, buff_size);
-  if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP
+  if(_xbt_replay_is_active()) return;
+  void* tmpbuff=buff;
+
+  if((smpi_privatize_global_variables)
+      && ((char*)buff >= start_data_exe)
+      && ((char*)buff < start_data_exe + size_data_exe )
+    ){
+       XBT_WARN("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
+       switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index);
+       tmpbuff = (void*)xbt_malloc(buff_size);
+       memcpy(tmpbuff, buff, buff_size);
+  }
+
+
+  if((smpi_privatize_global_variables)
+      && ((char*)comm->comm.dst_buff >= start_data_exe)
+      && ((char*)comm->comm.dst_buff < start_data_exe + size_data_exe )
+    ){
+       XBT_WARN("Privatization : We are copying to a zone inside global memory - Switch data segment");
+       switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index);
+  }
+
+
+  memcpy(comm->comm.dst_buff, tmpbuff, buff_size);
+  if (comm->comm.detached) {
+    // if this is a detached send, the source buffer was duplicated by SMPI
+    // sender to make the original buffer available to the application ASAP

     xbt_free(buff);
     //It seems that the request is used after the call there this should
     //be free somewhereelse  but where???
     xbt_free(buff);
     //It seems that the request is used after the call there this should
     //be free somewhereelse  but where???


@@ -242,6 +361,9 @@ static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t
     //inside the user data and should be free 
     comm->comm.src_buff = NULL;
   }
     //inside the user data and should be free 
     comm->comm.src_buff = NULL;
   }

+
+  if(tmpbuff!=buff)xbt_free(tmpbuff);
+

 }
 
 void smpi_global_init(void)
 }
 
 void smpi_global_init(void)


@@ -250,7 +372,7 @@ void smpi_global_init(void)
   MPI_Group group;
   char name[MAILBOX_NAME_MAXLEN];
 
   MPI_Group group;
   char name[MAILBOX_NAME_MAXLEN];
 

-  SIMIX_comm_set_copy_data_callback(&SMPI_comm_copy_buffer_callback);
+  SIMIX_comm_set_copy_data_callback(&smpi_comm_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++) {
   process_count = SIMIX_process_count();
   process_data = xbt_new(smpi_process_data_t, process_count);
   for (i = 0; i < process_count; i++) {


@@ -259,17 +381,35 @@ void smpi_global_init(void)
     process_data[i]->argc = NULL;
     process_data[i]->argv = NULL;
     process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i));
     process_data[i]->argc = NULL;
     process_data[i]->argv = NULL;
     process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i));

-    process_data[i]->mailbox_small = simcall_rdv_create(get_mailbox_name_small(name, i));
+    process_data[i]->mailbox_small =
+        simcall_rdv_create(get_mailbox_name_small(name, i));

     process_data[i]->timer = xbt_os_timer_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);
+    if (MC_is_active())
+      MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size());
+    process_data[i]->comm_self = MPI_COMM_NULL;
+    process_data[i]->state = SMPI_UNINITIALIZED;
+    process_data[i]->sampling = 0;

   }
   group = smpi_group_new(process_count);
   MPI_COMM_WORLD = smpi_comm_new(group);
   }
   group = smpi_group_new(process_count);
   MPI_COMM_WORLD = smpi_comm_new(group);

+  MPI_UNIVERSE_SIZE = smpi_comm_size(MPI_COMM_WORLD);

   for (i = 0; i < process_count; i++) {
     smpi_group_set_mapping(group, i, i);
   }
   for (i = 0; i < process_count; i++) {
     smpi_group_set_mapping(group, i, i);
   }

+
+  //check correctness of MPI parameters
+
+  xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <=
+             sg_cfg_get_int("smpi/send_is_detached_thres"));
+
+  if (sg_cfg_is_default_value("smpi/running_power")) {
+    XBT_INFO("You did not set the power of the host running the simulation.  "
+             "The timings will certainly not be accurate.  "
+             "Use the option \"--cfg=smpi/running_power:<flops>\" to set its value."
+             "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. ");
+  }
+  if(smpi_privatize_global_variables)
+    smpi_initialize_global_memory_segments();

 }
 
 void smpi_global_destroy(void)
 }
 
 void smpi_global_destroy(void)


@@ -278,12 +418,14 @@ void smpi_global_destroy(void)
   int i;
 
   smpi_bench_destroy();
   int i;
 
   smpi_bench_destroy();

-  smpi_group_destroy(smpi_comm_group(MPI_COMM_WORLD));
-  smpi_comm_destroy(MPI_COMM_WORLD);
+  while (smpi_group_unuse(smpi_comm_group(MPI_COMM_WORLD)) > 0);
+  xbt_free(MPI_COMM_WORLD);

   MPI_COMM_WORLD = MPI_COMM_NULL;
   for (i = 0; i < count; i++) {
   MPI_COMM_WORLD = MPI_COMM_NULL;
   for (i = 0; i < count; i++) {

-    smpi_group_destroy(smpi_comm_group(process_data[i]->comm_self));
-    smpi_comm_destroy(process_data[i]->comm_self);
+    if(process_data[i]->comm_self!=MPI_COMM_NULL){
+      smpi_group_unuse(smpi_comm_group(process_data[i]->comm_self));
+      smpi_comm_destroy(process_data[i]->comm_self);
+    }

     xbt_os_timer_free(process_data[i]->timer);
     simcall_rdv_destroy(process_data[i]->mailbox);
     simcall_rdv_destroy(process_data[i]->mailbox_small);
     xbt_os_timer_free(process_data[i]->timer);
     simcall_rdv_destroy(process_data[i]->mailbox);
     simcall_rdv_destroy(process_data[i]->mailbox_small);


@@ -291,65 +433,72 @@ void smpi_global_destroy(void)
   }
   xbt_free(process_data);
   process_data = NULL;
   }
   xbt_free(process_data);
   process_data = NULL;

-
+  if(smpi_privatize_global_variables)
+    smpi_destroy_global_memory_segments();

   smpi_free_static();
 }
 
 /* Fortran specific stuff */
 /* With smpicc, the following weak symbols are used */
 /* With smpiff, the following weak symbols are replaced by those in libf2c */
   smpi_free_static();
 }
 
 /* Fortran specific stuff */
 /* With smpicc, the following weak symbols are used */
 /* With smpiff, the following weak symbols are replaced by those in libf2c */

-int __attribute__((weak)) xargc;
-char** __attribute__((weak)) xargv;
+int __attribute__ ((weak)) xargc;
+char ** __attribute__ ((weak)) xargv;

 
 #ifndef WIN32
 
 #ifndef WIN32

-void __attribute__((weak)) user_main_(){
+void __attribute__ ((weak)) user_main_()
+{

   xbt_die("Should not be in this smpi_simulated_main");
   return;
 }
   xbt_die("Should not be in this smpi_simulated_main");
   return;
 }

-int __attribute__((weak)) smpi_simulated_main_(int argc, char** argv) {
+
+int __attribute__ ((weak)) smpi_simulated_main_(int argc, char **argv)
+{

   smpi_process_init(&argc, &argv);
   user_main_();
   smpi_process_init(&argc, &argv);
   user_main_();

-  //xbt_die("Should not be in this smpi_simulated_main");

   return 0;
 }
 
   return 0;
 }
 

-int __attribute__((weak)) main(int argc, char** argv) {
-   return smpi_main(smpi_simulated_main_,argc,argv);
+int __attribute__ ((weak)) main(int argc, char **argv)
+{
+  return smpi_main(smpi_simulated_main_, argc, argv);

 }
 
 }
 

-int __attribute__((weak)) MAIN__(){
-  return smpi_main(smpi_simulated_main_,xargc, xargv);
+int __attribute__ ((weak)) MAIN__()
+{
+  return smpi_main(smpi_simulated_main_, xargc, xargv);

 };
 #endif
 
 };
 #endif
 

-int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
+int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])

 {
   srand(SMPI_RAND_SEED);
 {
   srand(SMPI_RAND_SEED);

-  
-  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 */
+
+  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;
   }
 
   /* Connect log categories.  See xbt/log.c */
     return 0;
   }
 
   /* Connect log categories.  See xbt/log.c */

-  XBT_LOG_CONNECT(smpi);  /* Keep this line as soon as possible in this
-                             function: xbt_log_appender_file.c depends on it
-                             DO NOT connect this in XBT or so, or it will be
-                             useless to xbt_log_appender_file.c */
+  XBT_LOG_CONNECT(smpi);        /* Keep this line as soon as possible in this
+                                   function: xbt_log_appender_file.c depends on it
+                                   DO NOT connect this in XBT or so, or it will be
+                                   useless to xbt_log_appender_file.c */

 #ifdef HAVE_TRACING
   XBT_LOG_CONNECT(instr_smpi);
 #endif
   XBT_LOG_CONNECT(smpi_base);
   XBT_LOG_CONNECT(smpi_bench);
   XBT_LOG_CONNECT(smpi_coll);
 #ifdef HAVE_TRACING
   XBT_LOG_CONNECT(instr_smpi);
 #endif
   XBT_LOG_CONNECT(smpi_base);
   XBT_LOG_CONNECT(smpi_bench);
   XBT_LOG_CONNECT(smpi_coll);

+  XBT_LOG_CONNECT(smpi_colls);

   XBT_LOG_CONNECT(smpi_comm);
   XBT_LOG_CONNECT(smpi_comm);

+  XBT_LOG_CONNECT(smpi_dvfs);

   XBT_LOG_CONNECT(smpi_group);
   XBT_LOG_CONNECT(smpi_kernel);
   XBT_LOG_CONNECT(smpi_mpi);
   XBT_LOG_CONNECT(smpi_mpi_dt);
   XBT_LOG_CONNECT(smpi_pmpi);
   XBT_LOG_CONNECT(smpi_replay);
   XBT_LOG_CONNECT(smpi_group);
   XBT_LOG_CONNECT(smpi_kernel);
   XBT_LOG_CONNECT(smpi_mpi);
   XBT_LOG_CONNECT(smpi_mpi_dt);
   XBT_LOG_CONNECT(smpi_pmpi);
   XBT_LOG_CONNECT(smpi_replay);

-  XBT_LOG_CONNECT(smpi_colls);

 
 #ifdef HAVE_TRACING
   TRACE_global_init(&argc, argv);
 
 #ifdef HAVE_TRACING
   TRACE_global_init(&argc, argv);


@@ -371,70 +520,82 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
   SIMIX_launch_application(argv[2]);
 
   int gather_id = find_coll_description(mpi_coll_gather_description,
   SIMIX_launch_application(argv[2]);
 
   int gather_id = find_coll_description(mpi_coll_gather_description,

-                                           sg_cfg_get_string("smpi/gather"));
+                                        sg_cfg_get_string("smpi/gather"));

   mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype,
   mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype,

-                                   void*, int, MPI_Datatype, int, MPI_Comm))
-                          mpi_coll_gather_description[gather_id].coll;
+                                 void *, int, MPI_Datatype, int, MPI_Comm))
+      mpi_coll_gather_description[gather_id].coll;

 
   int allgather_id = find_coll_description(mpi_coll_allgather_description,
                                            sg_cfg_get_string("smpi/allgather"));
   mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype,
 
   int allgather_id = find_coll_description(mpi_coll_allgather_description,
                                            sg_cfg_get_string("smpi/allgather"));
   mpi_coll_allgather_fun = (int (*)(void *, int, MPI_Datatype,

-                                   void*, int, MPI_Datatype, MPI_Comm))
-                          mpi_coll_allgather_description[allgather_id].coll;
+                                    void *, int, MPI_Datatype, MPI_Comm))
+      mpi_coll_allgather_description[allgather_id].coll;

 
   int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description,
 
   int allgatherv_id = find_coll_description(mpi_coll_allgatherv_description,

-                                           sg_cfg_get_string("smpi/allgatherv"));
-  mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype,
-                                   void*, int*, int*, MPI_Datatype, MPI_Comm))
-                          mpi_coll_allgatherv_description[allgatherv_id].coll;
+                                            sg_cfg_get_string("smpi/allgatherv"));
+  mpi_coll_allgatherv_fun = (int (*)(void *, int, MPI_Datatype, void *, int *,
+                                     int *, MPI_Datatype, MPI_Comm))
+      mpi_coll_allgatherv_description[allgatherv_id].coll;

 
   int allreduce_id = find_coll_description(mpi_coll_allreduce_description,
                                            sg_cfg_get_string("smpi/allreduce"));
 
   int allreduce_id = find_coll_description(mpi_coll_allreduce_description,
                                            sg_cfg_get_string("smpi/allreduce"));

-  mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount, \
-                                    MPI_Datatype dtype, MPI_Op op, MPI_Comm comm))
-                          mpi_coll_allreduce_description[allreduce_id].coll;
+  mpi_coll_allreduce_fun = (int (*)(void *sbuf, void *rbuf, int rcount,
+                                    MPI_Datatype dtype, MPI_Op op,
+                                    MPI_Comm comm))
+      mpi_coll_allreduce_description[allreduce_id].coll;

 
   int alltoall_id = find_coll_description(mpi_coll_alltoall_description,
                                           sg_cfg_get_string("smpi/alltoall"));
   mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype,
 
   int alltoall_id = find_coll_description(mpi_coll_alltoall_description,
                                           sg_cfg_get_string("smpi/alltoall"));
   mpi_coll_alltoall_fun = (int (*)(void *, int, MPI_Datatype,

-                                  void*, int, MPI_Datatype, MPI_Comm))
-                         mpi_coll_alltoall_description[alltoall_id].coll;
+                                   void *, int, MPI_Datatype, MPI_Comm))
+      mpi_coll_alltoall_description[alltoall_id].coll;

 
   int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description,
 
   int alltoallv_id = find_coll_description(mpi_coll_alltoallv_description,

-                                          sg_cfg_get_string("smpi/alltoallv"));
-  mpi_coll_alltoallv_fun = (int (*)(void *, int*, int*, MPI_Datatype,
-                                   void*, int*, int*, MPI_Datatype, MPI_Comm))
-                         mpi_coll_alltoallv_description[alltoallv_id].coll;
+                                           sg_cfg_get_string("smpi/alltoallv"));
+  mpi_coll_alltoallv_fun = (int (*)(void *, int *, int *, MPI_Datatype,
+                                    void *, int *, int *, MPI_Datatype,
+                                    MPI_Comm))
+      mpi_coll_alltoallv_description[alltoallv_id].coll;

 
   int bcast_id = find_coll_description(mpi_coll_bcast_description,
 
   int bcast_id = find_coll_description(mpi_coll_bcast_description,

-                                          sg_cfg_get_string("smpi/bcast"));
-  mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype, \
-                               int root, MPI_Comm com))
-                      mpi_coll_bcast_description[bcast_id].coll;
+                                       sg_cfg_get_string("smpi/bcast"));
+  mpi_coll_bcast_fun = (int (*)(void *buf, int count, MPI_Datatype datatype,
+                                int root, MPI_Comm com))
+      mpi_coll_bcast_description[bcast_id].coll;

 
   int reduce_id = find_coll_description(mpi_coll_reduce_description,
 
   int reduce_id = find_coll_description(mpi_coll_reduce_description,

-                                          sg_cfg_get_string("smpi/reduce"));
-  mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count, MPI_Datatype datatype, \
-                                 MPI_Op op, int root, MPI_Comm comm))
-                       mpi_coll_reduce_description[reduce_id].coll;
-
-  int reduce_scatter_id = find_coll_description(mpi_coll_reduce_scatter_description,
-                                           sg_cfg_get_string("smpi/reduce_scatter"));
-  mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,\
-                    MPI_Datatype dtype,MPI_Op  op,MPI_Comm  comm))
-                          mpi_coll_reduce_scatter_description[reduce_scatter_id].coll;
+                                        sg_cfg_get_string("smpi/reduce"));
+  mpi_coll_reduce_fun = (int (*)(void *buf, void *rbuf, int count,
+                                 MPI_Datatype datatype, MPI_Op op,
+                                 int root, MPI_Comm comm))
+      mpi_coll_reduce_description[reduce_id].coll;
+
+  int reduce_scatter_id =
+      find_coll_description(mpi_coll_reduce_scatter_description,
+                            sg_cfg_get_string("smpi/reduce_scatter"));
+  mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,
+                                         MPI_Datatype dtype, MPI_Op op,
+                                         MPI_Comm comm))
+      mpi_coll_reduce_scatter_description[reduce_scatter_id].coll;

 
   int scatter_id = find_coll_description(mpi_coll_scatter_description,
 
   int scatter_id = find_coll_description(mpi_coll_scatter_description,

-                                           sg_cfg_get_string("smpi/scatter"));
-  mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount, MPI_Datatype sendtype,\
-                void *recvbuf, int recvcount, MPI_Datatype recvtype,\
-                int root, MPI_Comm comm))
-                          mpi_coll_scatter_description[scatter_id].coll;
+                                         sg_cfg_get_string("smpi/scatter"));
+  mpi_coll_scatter_fun = (int (*)(void *sendbuf, int sendcount,
+                                  MPI_Datatype sendtype, void *recvbuf,
+                                  int recvcount, MPI_Datatype recvtype,
+                                  int root, MPI_Comm comm))
+      mpi_coll_scatter_description[scatter_id].coll;

 
   int barrier_id = find_coll_description(mpi_coll_barrier_description,
 
   int barrier_id = find_coll_description(mpi_coll_barrier_description,

-                                           sg_cfg_get_string("smpi/barrier"));
+                                         sg_cfg_get_string("smpi/barrier"));

   mpi_coll_barrier_fun = (int (*)(MPI_Comm comm))
   mpi_coll_barrier_fun = (int (*)(MPI_Comm comm))

-                          mpi_coll_barrier_description[barrier_id].coll;
+      mpi_coll_barrier_description[barrier_id].coll;
+
+  smpi_cpu_threshold = sg_cfg_get_double("smpi/cpu_threshold");
+  smpi_running_power = sg_cfg_get_double("smpi/running_power");
+  smpi_privatize_global_variables = sg_cfg_get_boolean("smpi/privatize_global_variables");
+  if (smpi_cpu_threshold < 0)
+    smpi_cpu_threshold = DBL_MAX;

 
   smpi_global_init();
 
 
   smpi_global_init();
 


@@ -443,7 +604,7 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
   fflush(stderr);
 
   if (MC_is_active())
   fflush(stderr);
 
   if (MC_is_active())

-    MC_modelcheck_safety();
+    MC_do_the_modelcheck_for_real();

   else
     SIMIX_run();
 
   else
     SIMIX_run();