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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 4dac16053e..0616abdc19 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -1,377 +1,540 @@
-#include <stdio.h>
+/* Copyright (c) 2007-2013. The SimGrid Team.
+ * All rights reserved.                                                     */
 
-#include "private.h"
+/* 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. */
 
-XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories");
+#include "private.h"
+#include "smpi_mpi_dt_private.h"
+#include "mc/mc.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)");
 
-smpi_global_t smpi_global = NULL;
-
-void *smpi_request_new(void);
-
-void *smpi_request_new()
+typedef struct s_smpi_process_data {
+  double simulated;
+  int *argc;
+  char ***argv;
+  smx_rdv_t mailbox;
+  smx_rdv_t mailbox_small;
+  xbt_os_timer_t timer;
+  MPI_Comm comm_self;
+  void *data;                   /* user data */
+  int index;
+  int initialized;
+  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;
+int MPI_UNIVERSE_SIZE;
+
+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)
+
+static char *get_mailbox_name(char *str, int index)
 {
-  smpi_mpi_request_t request = xbt_new(s_smpi_mpi_request_t, 1);
+  snprintf(str, MAILBOX_NAME_MAXLEN, "SMPI-%0*x", (int) (sizeof(int) * 2),
+           index);
+  return str;
+}
 
-  request->buf = NULL;
-  request->completed = 0;
-  request->mutex = SIMIX_mutex_init();
-  request->cond = SIMIX_cond_init();
-  request->data = NULL;
-  request->forward = 0;
+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 request;
+void smpi_process_init(int *argc, char ***argv)
+{
+  int index;
+  smpi_process_data_t data;
+  smx_process_t proc;
+
+  if (argc && argv) {
+    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) {
+      free((*argv)[1]);
+      memmove(&(*argv)[1], &(*argv)[2], sizeof(char *) * (*argc - 2));
+      (*argv)[(*argc) - 1] = NULL;
+    }
+    (*argc)--;
+    data->argc = argc;
+    data->argv = argv;
+    // 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);
+  }
 }
 
-void smpi_request_free(void *pointer);
+void smpi_process_destroy(void)
+{
+  int index = smpi_process_index();
+  process_data[index]->index = -100;
+  XBT_DEBUG("<%d> Process left the game", index);
+}
 
-void smpi_request_free(void *pointer)
+/**
+ * @brief Prepares the current process for termination.
+ */
+void smpi_process_finalize(void)
 {
+  // wait for all pending asynchronous comms to finish
+  while (SIMIX_process_has_pending_comms(SIMIX_process_self())) {
+    simcall_process_sleep(0.01);
+  }
+}
 
-  smpi_mpi_request_t request = pointer;
+/**
+ * @brief Check if a process is finalized
+ */
+int smpi_process_finalized()
+{
+  return (smpi_process_index() == -100);
+  // If finalized, this value has been set to -100;
+}
 
-  SIMIX_cond_destroy(request->cond);
-  SIMIX_mutex_destroy(request->mutex);
-  xbt_free(request);
+/**
+ * @brief Check if a process is initialized
+ */
+int smpi_process_initialized(void)
+{
+  int index = smpi_process_index();
+  return ((index != -100) && (index != MPI_UNDEFINED)
+          && (process_data[index]->initialized));
+}
 
-  return;
+/**
+ * @brief Mark a process as initialized (=MPI_Init called)
+ */
+void smpi_process_mark_as_initialized(void)
+{
+  int index = smpi_process_index();
+  if ((index != -100) && (index != MPI_UNDEFINED))
+    process_data[index]->initialized = 1;
 }
 
-void smpi_request_reset(void *pointer);
 
-void smpi_request_reset(void *pointer)
+#ifdef SMPI_F2C
+int smpi_process_argc(void)
 {
-  smpi_mpi_request_t request = pointer;
+  smpi_process_data_t data = smpi_process_data();
+  return data->argc ? *(data->argc) - 1 : 0;
+}
 
-  request->buf = NULL;
-  request->completed = 0;
-  request->data = NULL;
-  request->forward = 0;
+int smpi_process_getarg(integer * index, char *dst, ftnlen len)
+{
+  smpi_process_data_t data = smpi_process_data();
+  char *arg;
+  ftnlen i;
 
-  return;
+  if (!data->argc || !data->argv || *index < 1 || *index >= *(data->argc)) {
+    return -1;
+  }
+  arg = (*data->argv)[*index];
+  for (i = 0; i < len && arg[i] != '\0'; i++) {
+    dst[i] = arg[i];
+  }
+  for (; i < len; i++) {
+    dst[i] = ' ';
+  }
+  return 0;
 }
 
+int smpi_global_size(void)
+{
+  char *value = getenv("SMPI_GLOBAL_SIZE");
 
-void *smpi_message_new(void);
+  if (!value) {
+    fprintf(stderr,
+            "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
+    xbt_abort();
+  }
+  return atoi(value);
+}
+#endif
 
-void *smpi_message_new()
+smpi_process_data_t smpi_process_data(void)
 {
-  smpi_received_message_t message = xbt_new(s_smpi_received_message_t, 1);
-  message->buf = NULL;
-  return message;
+  return SIMIX_process_self_get_data(SIMIX_process_self());
 }
 
-void smpi_message_free(void *pointer);
+smpi_process_data_t smpi_process_remote_data(int index)
+{
+  return process_data[index];
+}
 
-void smpi_message_free(void *pointer)
+void smpi_process_set_user_data(void *data)
 {
-  xbt_free(pointer);
-  return;
+  smpi_process_data_t process_data = smpi_process_data();
+  process_data->data = data;
 }
 
-void smpi_message_reset(void *pointer);
+void *smpi_process_get_user_data()
+{
+  smpi_process_data_t process_data = smpi_process_data();
+  return process_data->data;
+}
 
-void smpi_message_reset(void *pointer)
+int smpi_process_count(void)
 {
-  smpi_received_message_t message = pointer;
-  message->buf = NULL;
-  return;
+  return process_count;
 }
 
-int smpi_create_request(void *buf, int count, smpi_mpi_datatype_t datatype,
-                        int src, int dst, int tag,
-                        smpi_mpi_communicator_t comm,
-                        smpi_mpi_request_t * requestptr)
-{
-  int retval = MPI_SUCCESS;
-
-  smpi_mpi_request_t request = NULL;
-
-  // parameter checking prob belongs in smpi_mpi, but this is less repeat code
-  if (NULL == buf) {
-    retval = MPI_ERR_INTERN;
-  } else if (0 > count) {
-    retval = MPI_ERR_COUNT;
-  } else if (NULL == datatype) {
-    retval = MPI_ERR_TYPE;
-  } else if (MPI_ANY_SOURCE != src && (0 > src || comm->size <= src)) {
-    retval = MPI_ERR_RANK;
-  } else if (0 > dst || comm->size <= dst) {
-    retval = MPI_ERR_RANK;
-  } else if (MPI_ANY_TAG != tag && 0 > tag) {
-    retval = MPI_ERR_TAG;
-  } else if (NULL == comm) {
-    retval = MPI_ERR_COMM;
-  } else if (NULL == requestptr) {
-    retval = MPI_ERR_ARG;
-  } else {
-    request = xbt_mallocator_get(smpi_global->request_mallocator);
-    request->comm = comm;
-    request->src = src;
-    request->dst = dst;
-    request->tag = tag;
-    request->buf = buf;
-    request->datatype = datatype;
-    request->count = count;
-
-    *requestptr = request;
-  }
-  return retval;
+int smpi_process_index(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  //return -1 if not initialized
+  return data ? data->index : MPI_UNDEFINED;
 }
-/* FIXME: understand what they do and put the prototypes in a header file (live in smpi_base.c) */
-void smpi_mpi_land_func(void *a, void *b, int *length,
-                        MPI_Datatype * datatype);
-void smpi_mpi_sum_func(void *a, void *b, int *length,
-                       MPI_Datatype * datatype);
 
-void smpi_global_init()
+smx_rdv_t smpi_process_mailbox(void)
 {
-  int i;
+  smpi_process_data_t data = smpi_process_data();
+  return data->mailbox;
+}
 
-  int size = SIMIX_host_get_number();
-
-  /* Connect our log channels: that must be done manually under windows */
-#ifdef XBT_LOG_CONNECT
-  XBT_LOG_CONNECT(smpi_base, smpi);
-  XBT_LOG_CONNECT(smpi_bench, smpi);
-  XBT_LOG_CONNECT(smpi_kernel, smpi);
-  XBT_LOG_CONNECT(smpi_mpi, smpi);
-  XBT_LOG_CONNECT(smpi_receiver, smpi);
-  XBT_LOG_CONNECT(smpi_sender, smpi);
-  XBT_LOG_CONNECT(smpi_util, smpi);
-#endif
+smx_rdv_t smpi_process_mailbox_small(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->mailbox_small;
+}
 
-  smpi_global = xbt_new(s_smpi_global_t, 1);
-  // config variable
-  smpi_global->reference_speed = SMPI_DEFAULT_SPEED;
-
-  smpi_global->root_ready = 0;
-  smpi_global->ready_process_count = 0;
-
-  // start/stop
-  smpi_global->start_stop_mutex = SIMIX_mutex_init();
-  smpi_global->start_stop_cond = SIMIX_cond_init();
-
-  // host info blank until sim starts
-  // FIXME: is this okay?
-  smpi_global->hosts = NULL;
-  smpi_global->host_count = 0;
-
-  // running hosts
-  smpi_global->running_hosts_count_mutex = SIMIX_mutex_init();
-  smpi_global->running_hosts_count = 0;
-
-  // mallocators
-  smpi_global->request_mallocator =
-    xbt_mallocator_new(SMPI_REQUEST_MALLOCATOR_SIZE, smpi_request_new,
-                       smpi_request_free, smpi_request_reset);
-  smpi_global->message_mallocator =
-    xbt_mallocator_new(SMPI_MESSAGE_MALLOCATOR_SIZE, smpi_message_new,
-                       smpi_message_free, smpi_message_reset);
-
-  // queues
-  smpi_global->pending_send_request_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->pending_send_request_queues_mutexes =
-    xbt_new(smx_mutex_t, size);
-  smpi_global->pending_recv_request_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->pending_recv_request_queues_mutexes =
-    xbt_new(smx_mutex_t, size);
-  smpi_global->received_message_queues = xbt_new(xbt_fifo_t, size);
-  smpi_global->received_message_queues_mutexes = xbt_new(smx_mutex_t, size);
-
-  // sender/receiver processes
-  smpi_global->sender_processes = xbt_new(smx_process_t, size);
-  smpi_global->receiver_processes = xbt_new(smx_process_t, size);
-
-  // timers
-  smpi_global->timer = xbt_os_timer_new();
-  smpi_global->timer_mutex = SIMIX_mutex_init();
-  smpi_global->timer_cond = SIMIX_cond_init();
-
-  smpi_global->do_once_duration_nodes = NULL;
-  smpi_global->do_once_duration = NULL;
-  smpi_global->do_once_mutex = SIMIX_mutex_init();
-
-  for (i = 0; i < size; i++) {
-    smpi_global->pending_send_request_queues[i] = xbt_fifo_new();
-    smpi_global->pending_send_request_queues_mutexes[i] = SIMIX_mutex_init();
-    smpi_global->pending_recv_request_queues[i] = xbt_fifo_new();
-    smpi_global->pending_recv_request_queues_mutexes[i] = SIMIX_mutex_init();
-    smpi_global->received_message_queues[i] = xbt_fifo_new();
-    smpi_global->received_message_queues_mutexes[i] = SIMIX_mutex_init();
-  }
+smx_rdv_t smpi_process_remote_mailbox(int index)
+{
+  smpi_process_data_t data = smpi_process_remote_data(index);
+  return data->mailbox;
+}
 
-  smpi_global->hosts = SIMIX_host_get_table();
-  smpi_global->host_count = SIMIX_host_get_number();
-
-  smpi_mpi_global = xbt_new(s_smpi_mpi_global_t, 1);
-
-  // global communicator
-  smpi_mpi_global->mpi_comm_world = xbt_new(s_smpi_mpi_communicator_t, 1);
-  smpi_mpi_global->mpi_comm_world->size = smpi_global->host_count;
-  smpi_mpi_global->mpi_comm_world->barrier_count = 0;
-  smpi_mpi_global->mpi_comm_world->barrier_mutex = SIMIX_mutex_init();
-  smpi_mpi_global->mpi_comm_world->barrier_cond = SIMIX_cond_init();
-  smpi_mpi_global->mpi_comm_world->rank_to_index_map =
-    xbt_new(int, smpi_global->host_count);
-  smpi_mpi_global->mpi_comm_world->index_to_rank_map =
-    xbt_new(int, smpi_global->host_count);
-  for (i = 0; i < smpi_global->host_count; i++) {
-    smpi_mpi_global->mpi_comm_world->rank_to_index_map[i] = i;
-    smpi_mpi_global->mpi_comm_world->index_to_rank_map[i] = i;
-  }
 
-  // mpi datatypes
-  smpi_mpi_global->mpi_byte = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_byte->size = (size_t) 1;
-  smpi_mpi_global->mpi_int = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_int->size = sizeof(int);
-  smpi_mpi_global->mpi_double = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_double->size = sizeof(double);
+smx_rdv_t smpi_process_remote_mailbox_small(int index)
+{
+  smpi_process_data_t data = smpi_process_remote_data(index);
+  return data->mailbox_small;
+}
 
-  // mpi operations
-  smpi_mpi_global->mpi_land = xbt_new(s_smpi_mpi_op_t, 1);
-  smpi_mpi_global->mpi_land->func = smpi_mpi_land_func;
-  smpi_mpi_global->mpi_sum = xbt_new(s_smpi_mpi_op_t, 1);
-  smpi_mpi_global->mpi_sum->func = smpi_mpi_sum_func;
+xbt_os_timer_t smpi_process_timer(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->timer;
+}
 
+void smpi_process_simulated_start(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  data->simulated = SIMIX_get_clock();
 }
 
-void smpi_global_destroy()
+double smpi_process_simulated_elapsed(void)
 {
-  int i;
+  smpi_process_data_t data = smpi_process_data();
+  return SIMIX_get_clock() - data->simulated;
+}
 
-  int size = SIMIX_host_get_number();
+MPI_Comm smpi_process_comm_self(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->comm_self;
+}
 
-  smpi_do_once_duration_node_t curr, next;
+void smpi_process_set_sampling(int s)
+{
+  smpi_process_data_t data = smpi_process_data();
+  data->sampling = s;
+}
 
-  // start/stop
-  SIMIX_mutex_destroy(smpi_global->start_stop_mutex);
-  SIMIX_cond_destroy(smpi_global->start_stop_cond);
+int smpi_process_get_sampling(void)
+{
+  smpi_process_data_t data = smpi_process_data();
+  return data->sampling;
+}
 
-  // processes
-  xbt_free(smpi_global->sender_processes);
-  xbt_free(smpi_global->receiver_processes);
+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);
+}
 
-  // running hosts
-  SIMIX_mutex_destroy(smpi_global->running_hosts_count_mutex);
+static void smpi_comm_copy_buffer_callback(smx_action_t comm,
+                                           void *buff, size_t buff_size)
+{
+  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
+    xbt_free(buff);
+    //It seems that the request is used after the call there this should
+    //be free somewhereelse  but where???
+    //xbt_free(comm->comm.src_data);// inside SMPI the request is keep
+    //inside the user data and should be free 
+    comm->comm.src_buff = NULL;
+  }
+}
 
-  // mallocators
-  xbt_mallocator_free(smpi_global->request_mallocator);
-  xbt_mallocator_free(smpi_global->message_mallocator);
+void smpi_global_init(void)
+{
+  int i;
+  MPI_Group group;
+  char name[MAILBOX_NAME_MAXLEN];
+
+  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_data[i] = xbt_new(s_smpi_process_data_t, 1);
+    process_data[i]->index = 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]->timer = xbt_os_timer_new();
+    if (MC_is_active())
+      MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size());
+    group = smpi_group_new(1);
+    process_data[i]->comm_self = smpi_comm_new(group);
+    process_data[i]->initialized = 0;
+    process_data[i]->sampling = 0;
+
+    smpi_group_set_mapping(group, i, 0);
+  }
+  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);
+  }
 
-  xbt_os_timer_free(smpi_global->timer);
-  SIMIX_mutex_destroy(smpi_global->timer_mutex);
-  SIMIX_cond_destroy(smpi_global->timer_cond);
+  //check correctness of MPI parameters
 
-  for (curr = smpi_global->do_once_duration_nodes; NULL != curr; curr = next) {
-    next = curr->next;
-    xbt_free(curr->file);
-    xbt_free(curr);
-  }
+  xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <=
+             sg_cfg_get_int("smpi/send_is_detached_thres"));
+}
 
-  SIMIX_mutex_destroy(smpi_global->do_once_mutex);
+void smpi_global_destroy(void)
+{
+  int count = smpi_process_count();
+  int i;
 
-  for (i = 0; i < size; i++) {
-    xbt_fifo_free(smpi_global->pending_send_request_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->pending_send_request_queues_mutexes[i]);
-    xbt_fifo_free(smpi_global->pending_recv_request_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->pending_recv_request_queues_mutexes[i]);
-    xbt_fifo_free(smpi_global->received_message_queues[i]);
-    SIMIX_mutex_destroy(smpi_global->received_message_queues_mutexes[i]);
+  smpi_bench_destroy();
+  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++) {
+    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_free(process_data[i]);
   }
+  xbt_free(process_data);
+  process_data = NULL;
 
-  xbt_free(smpi_global->pending_send_request_queues);
-  xbt_free(smpi_global->pending_send_request_queues_mutexes);
-  xbt_free(smpi_global->pending_recv_request_queues);
-  xbt_free(smpi_global->pending_recv_request_queues_mutexes);
-  xbt_free(smpi_global->received_message_queues);
-  xbt_free(smpi_global->received_message_queues_mutexes);
+  smpi_free_static();
+}
 
-  xbt_free(smpi_global);
+/* 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;
 
-  smpi_global = NULL;
+#ifndef WIN32
+void __attribute__ ((weak)) user_main_()
+{
+  xbt_die("Should not be in this smpi_simulated_main");
+  return;
 }
 
-int smpi_host_index()
+int __attribute__ ((weak)) smpi_simulated_main_(int argc, char **argv)
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->index;
+  smpi_process_init(&argc, &argv);
+  user_main_();
+  //xbt_die("Should not be in this smpi_simulated_main");
+  return 0;
 }
 
-smx_mutex_t smpi_host_mutex()
+int __attribute__ ((weak)) main(int argc, char **argv)
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->mutex;
+  return smpi_main(smpi_simulated_main_, argc, argv);
 }
 
-smx_cond_t smpi_host_cond()
+int __attribute__ ((weak)) MAIN__()
 {
-  smx_host_t host = SIMIX_host_self();
-  smpi_host_data_t hdata = (smpi_host_data_t) SIMIX_host_get_data(host);
-  return hdata->cond;
-}
+  return smpi_main(smpi_simulated_main_, xargc, xargv);
+};
+#endif
 
-int smpi_run_simulation(int *argc, char **argv)
+int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
 {
-  smx_cond_t cond = NULL;
-  smx_action_t action = NULL;
+  srand(SMPI_RAND_SEED);
 
-  xbt_fifo_t actions_failed = xbt_fifo_new();
-  xbt_fifo_t actions_done = xbt_fifo_new();
+  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;
+  }
 
-  srand(SMPI_RAND_SEED);
+  /* 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 */
+#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_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);
+
+#ifdef HAVE_TRACING
+  TRACE_global_init(&argc, argv);
+
+  TRACE_add_start_function(TRACE_smpi_alloc);
+  TRACE_add_end_function(TRACE_smpi_release);
+#endif
+
+  SIMIX_global_init(&argc, argv);
 
-  SIMIX_global_init(argc, argv);
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
 
   // parse the platform file: get the host list
   SIMIX_create_environment(argv[1]);
 
-  SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
-  SIMIX_function_register("smpi_sender", smpi_sender);
-  SIMIX_function_register("smpi_receiver", smpi_receiver);
+  SIMIX_function_register_default(realmain);
   SIMIX_launch_application(argv[2]);
 
-  // must initialize globals between creating environment and launching app....
-  smpi_global_init();
+  int gather_id = find_coll_description(mpi_coll_gather_description,
+                                        sg_cfg_get_string("smpi/gather"));
+  mpi_coll_gather_fun = (int (*)(void *, int, MPI_Datatype,
+                                 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,
+                                    void *, int, MPI_Datatype, MPI_Comm))
+      mpi_coll_allgather_description[allgather_id].coll;
+
+  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;
+
+  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;
+
+  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;
+
+  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;
+
+  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;
+
+  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;
+
+  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;
+
+  int barrier_id = find_coll_description(mpi_coll_barrier_description,
+                                         sg_cfg_get_string("smpi/barrier"));
+  mpi_coll_barrier_fun = (int (*)(MPI_Comm comm))
+      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");
+  if (smpi_cpu_threshold < 0)
+    smpi_cpu_threshold = DBL_MAX;
 
-  /* Prepare to display some more info when dying on Ctrl-C pressing */
-  // FIXME: doesn't work
-  //signal(SIGINT, inthandler);
+  smpi_global_init();
 
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
-  SIMIX_init();
-
-  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
-    while ((action = xbt_fifo_pop(actions_failed))) {
-      DEBUG1("** %s failed **", action->name);
-      while ((cond = xbt_fifo_pop(action->cond_list))) {
-        SIMIX_cond_broadcast(cond);
-      }
-    }
-    while ((action = xbt_fifo_pop(actions_done))) {
-      DEBUG1("** %s done **", action->name);
-      while ((cond = xbt_fifo_pop(action->cond_list))) {
-        SIMIX_cond_broadcast(cond);
-      }
-    }
-  }
 
-  // FIXME: cleanup incomplete
-  xbt_fifo_free(actions_failed);
-  xbt_fifo_free(actions_done);
+  if (MC_is_active())
+    MC_do_the_modelcheck_for_real();
+  else
+    SIMIX_run();
 
-  INFO1("simulation time %g", SIMIX_get_clock());
+  if (sg_cfg_get_boolean("smpi/display_timing"))
+    XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock());
 
   smpi_global_destroy();
 
-  SIMIX_clean();
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
 
   return 0;
 }