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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index c8550fea16..95d44578c6 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -1,352 +1,369 @@
+/* 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 <stdio.h>
+#include <stdlib.h>
 
 #include "private.h"
+#include "smpi_mpi_dt_private.h"
+#include "mc/mc.h"
+#include "surf/surf.h"
+#include "simix/smx_private.h"
 
-XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
                                 "Logging specific to SMPI (kernel)");
 
-smpi_global_t smpi_global = NULL;
+typedef struct s_smpi_process_data {
+  int index;
+  int* argc;
+  char*** argv;
+  smx_rdv_t mailbox;
+  smx_rdv_t mailbox_small;
+  xbt_os_timer_t timer;
+  double simulated;
+  MPI_Comm comm_self;
+  void *data; /* user data */
+} s_smpi_process_data_t;
 
-void *smpi_request_new(void);
+static smpi_process_data_t *process_data = NULL;
+static int process_count = 0;
 
-void *smpi_request_new()
-{
-  smpi_mpi_request_t request = xbt_new(s_smpi_mpi_request_t, 1);
+MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;
 
-  request->buf = NULL;
-  request->completed = 0;
-  request->mutex = SIMIX_mutex_init();
-  request->cond = SIMIX_cond_init();
-  request->data = NULL;
-  request->forward = 0;
+#define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1)
 
-  return request;
+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_request_free(void *pointer);
+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;
+}
 
-void smpi_request_free(void *pointer)
+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]);
+    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;
+    simcall_rdv_set_receiver(data->mailbox_small, proc);// set the process attached to the mailbox
+    XBT_DEBUG("<%d> New process in the game: %p", index, proc);
+  }
+}
 
-  smpi_mpi_request_t request = pointer;
+void smpi_process_destroy(void)
+{
+  int index = smpi_process_index();
 
-  SIMIX_cond_destroy(request->cond);
-  SIMIX_mutex_destroy(request->mutex);
-  xbt_free(request);
+  XBT_DEBUG("<%d> Process left the game", index);
+}
 
-  return;
+/**
+ * @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);
+  }
 }
 
-void smpi_request_reset(void *pointer);
+int smpi_process_argc(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-void smpi_request_reset(void *pointer)
-{
-  smpi_mpi_request_t request = pointer;
+  return data->argc ? *(data->argc) - 1 : 0;
+}
 
-  request->buf = NULL;
-  request->completed = 0;
-  request->consumed = 0;
-  request->data = NULL;
-  request->forward = 0;
+#ifdef SMPI_F2C
+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;
 }
+#endif
 
+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);
+}
 
-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 smpi_process_index(void)
 {
-  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;
+  smpi_process_data_t data = smpi_process_data();
+
+  return data->index;
 }
 
-/* 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_mpi_min_func(void *a, void *b, int *length,
-                       MPI_Datatype * datatype);
-void smpi_mpi_max_func(void *a, void *b, int *length,
-                       MPI_Datatype * datatype);
-
-void smpi_global_init()
-{
-  int i;
+smx_rdv_t smpi_process_mailbox(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-  /* 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
+  return data->mailbox;
+}
 
-  smpi_global = xbt_new(s_smpi_global_t, 1);
-
-  // 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);
-
-  smpi_global->process_count = SIMIX_process_count();
-  DEBUG1("There is %d processes", smpi_global->process_count);
-
-  // sender/receiver processes
-  smpi_global->main_processes =
-    xbt_new(smx_process_t, smpi_global->process_count);
-
-  // 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();
-
-
-  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->process_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->process_count);
-  smpi_mpi_global->mpi_comm_world->index_to_rank_map =
-    xbt_new(int, smpi_global->process_count);
-  for (i = 0; i < smpi_global->process_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;
-  }
+smx_rdv_t smpi_process_mailbox_small(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-  // 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_char = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_char->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_float = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_float->size = sizeof(float);
-  smpi_mpi_global->mpi_double = xbt_new(s_smpi_mpi_datatype_t, 1);
-  smpi_mpi_global->mpi_double->size = sizeof(double);
-
-  // 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;
-  smpi_mpi_global->mpi_min = xbt_new(s_smpi_mpi_op_t, 1);
-  smpi_mpi_global->mpi_min->func = smpi_mpi_min_func;
-  smpi_mpi_global->mpi_max = xbt_new(s_smpi_mpi_op_t, 1);
-  smpi_mpi_global->mpi_max->func = smpi_mpi_max_func;
+  return data->mailbox_small;
+}
+
+smx_rdv_t smpi_process_remote_mailbox(int index) {
+  smpi_process_data_t data = smpi_process_remote_data(index);
 
+  return data->mailbox;
 }
 
-void smpi_global_destroy()
-{
-  smpi_do_once_duration_node_t curr, next;
 
-  // processes
-  xbt_free(smpi_global->main_processes);
+smx_rdv_t smpi_process_remote_mailbox_small(int index) {
+  smpi_process_data_t data = smpi_process_remote_data(index);
 
-  // mallocators
-  xbt_mallocator_free(smpi_global->request_mallocator);
-  xbt_mallocator_free(smpi_global->message_mallocator);
+  return data->mailbox_small;
+}
 
-  xbt_os_timer_free(smpi_global->timer);
-  SIMIX_mutex_destroy(smpi_global->timer_mutex);
-  SIMIX_cond_destroy(smpi_global->timer_cond);
+xbt_os_timer_t smpi_process_timer(void)
+{
+  smpi_process_data_t data = smpi_process_data();
 
-  for (curr = smpi_global->do_once_duration_nodes; NULL != curr; curr = next) {
-    next = curr->next;
-    xbt_free(curr->file);
-    xbt_free(curr);
-  }
+  return data->timer;
+}
 
-  SIMIX_mutex_destroy(smpi_global->do_once_mutex);
+void smpi_process_simulated_start(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-  xbt_free(smpi_global);
-  smpi_global = NULL;
+  data->simulated = SIMIX_get_clock();
+}
 
-  /* free smpi_mpi_global */
-  SIMIX_mutex_destroy(smpi_mpi_global->mpi_comm_world->barrier_mutex);
-  SIMIX_cond_destroy(smpi_mpi_global->mpi_comm_world->barrier_cond);
-  xbt_free(smpi_mpi_global->mpi_comm_world->rank_to_index_map);
-  xbt_free(smpi_mpi_global->mpi_comm_world);
+double smpi_process_simulated_elapsed(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-  xbt_free(smpi_mpi_global->mpi_byte);
-  xbt_free(smpi_mpi_global->mpi_char);
-  xbt_free(smpi_mpi_global->mpi_int);
-  xbt_free(smpi_mpi_global->mpi_double);
-  xbt_free(smpi_mpi_global->mpi_float);
+  return SIMIX_get_clock() - data->simulated;
+}
 
-  xbt_free(smpi_mpi_global->mpi_land);
-  xbt_free(smpi_mpi_global->mpi_sum);
-  xbt_free(smpi_mpi_global->mpi_max);
-  xbt_free(smpi_mpi_global->mpi_min);
+MPI_Comm smpi_process_comm_self(void) {
+  smpi_process_data_t data = smpi_process_data();
 
-  xbt_free(smpi_mpi_global);
+  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);
 }
 
-int smpi_process_index()
+static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
 {
-  smpi_process_data_t pdata =
-    (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
-  return pdata->index;
+  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;
+  }
 }
 
-smx_mutex_t smpi_process_mutex()
+void smpi_global_init(void)
 {
-  smpi_process_data_t pdata =
-    (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
-  return pdata->mutex;
+  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();
+    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);
+  for (i = 0; i < process_count; i++) {
+    smpi_group_set_mapping(group, i, i);
+  }
 }
 
-smx_cond_t smpi_process_cond()
+void smpi_global_destroy(void)
 {
-  smpi_process_data_t pdata =
-    (smpi_process_data_t) SIMIX_process_get_data(SIMIX_process_self());
-  return pdata->cond;
+  int count = smpi_process_count();
+  int i;
+
+  smpi_bench_destroy();
+  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);
+    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;
+
+  smpi_free_static();
 }
 
-static void smpi_cfg_cb_host_speed(const char *name, int pos)
-{
-  smpi_global->reference_speed =
-    xbt_cfg_get_double_at(_surf_cfg_set, name, pos);
+/* 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)) main(int argc, char** argv) {
+   xargc = argc;
+   xargv = argv;
+   return MAIN__();
 }
 
-int smpi_run_simulation(int *argc, char **argv)
+#ifdef WIN32
+#include <windows.h>
+
+int __attribute__((weak)) smpi_simulated_main(int argc, char** argv) {
+  xbt_die("Should not be in this smpi_simulated_main");
+  return 1;
+}
+
+/* TODO FOR WIN32 */
+/* Dummy prototype to make gcc happy */
+int APIENTRY WinMain(HINSTANCE hInst,HINSTANCE hInst2,LPSTR lpstr01,int nCmdShow)
 {
-  smx_action_t action = NULL;
+	return MAIN__();
+}
 
-  xbt_fifo_t actions_failed = xbt_fifo_new();
-  xbt_fifo_t actions_done = xbt_fifo_new();
+#endif
 
+int MAIN__(void)
+{
   srand(SMPI_RAND_SEED);
 
-  double default_reference_speed = 20000.0;
-  xbt_cfg_register(&_surf_cfg_set, "reference_speed",
-                   "Power of the host running the simulation (in flop/s). Used to bench the operations.",
-                   xbt_cfgelm_double, &default_reference_speed, 1, 1,
-                   smpi_cfg_cb_host_speed, 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;
+  }
 
-  int default_display_timing = 0;
-  xbt_cfg_register(&_surf_cfg_set, "display_timing",
-                   "Boolean indicating whether we should display the timing after simulation.",
-                   xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, NULL);
+  /* 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_base);
+  XBT_LOG_CONNECT(smpi_bench);
+  XBT_LOG_CONNECT(smpi_coll);
+  XBT_LOG_CONNECT(smpi_comm);
+  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);
+
+#ifdef HAVE_TRACING
+  TRACE_global_init(&xargc, xargv);
+#endif
 
-  SIMIX_global_init(argc, argv);
+  SIMIX_global_init(&xargc, xargv);
 
+#ifdef HAVE_TRACING
+  TRACE_start();
+#endif
 
   // parse the platform file: get the host list
-  SIMIX_create_environment(argv[1]);
+  SIMIX_create_environment(xargv[1]);
 
-  SIMIX_function_register("smpi_simulated_main", smpi_simulated_main);
-  SIMIX_launch_application(argv[2]);
+  SIMIX_function_register_default(smpi_simulated_main);
+  SIMIX_launch_application(xargv[2]);
 
-  // must initialize globals between creating environment and launching app....
   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 **", SIMIX_action_get_name(action));
-      SIMIX_action_signal_all(action);
-    }
-    while ((action = xbt_fifo_pop(actions_done))) {
-      DEBUG1("** %s done **", SIMIX_action_get_name(action));
-      SIMIX_action_signal_all(action);
-    }
-  }
-
-  // FIXME: cleanup incomplete
-  xbt_fifo_free(actions_failed);
-  xbt_fifo_free(actions_done);
 
+  if (MC_is_active())
+    MC_modelcheck();
+  else
+    SIMIX_run();
 
-  if (xbt_cfg_get_int(_surf_cfg_set, "display_timing"))
-    INFO1("simulation time %g", SIMIX_get_clock());
+  if (xbt_cfg_get_int(_surf_cfg_set, "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;
 }