X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24e3d7b3bb3312445ad0986fc67853995031bea0..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/msg/msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index a025930960..cab13d920d 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,41 +1,24 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2018. 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 "simgrid/msg.h"
-#include "instr/instr_interface.h"
-#include "msg_private.h"
-#include "msg_mailbox.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+
 #include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/virtu.h"
-#include "xbt/ex.h"             /* ex_backtrace_display */
-#include "xbt/replay.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
-#include "src/surf/callbacks.h"
+#include "src/instr/instr_private.hpp"
+#include "src/msg/msg_private.hpp"
+#include <xbt/config.hpp>
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
-                                "Logging specific to MSG (kernel)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
-MSG_Global_t msg_global = NULL;
-static void MSG_exit(void);
+MSG_Global_t msg_global = nullptr;
+static void MSG_exit();
 
 /********************************* MSG **************************************/
 
-static void _sg_cfg_cb_msg_debug_multiple_use(const char *name, int pos)
-{
-  msg_global->debug_multiple_use = xbt_cfg_get_boolean(_sg_cfg_set, name);
-}
-
-static void MSG_host_create_(sg_host_t host)
-{
-  __MSG_host_create(host);
-}
-
 /**
  * \ingroup msg_simulation
  * \brief Initialize MSG with less verifications
@@ -43,34 +26,24 @@ static void MSG_host_create_(sg_host_t host)
  */
 void MSG_init_nocheck(int *argc, char **argv) {
 
-  TRACE_global_init(argc, argv);
+  TRACE_global_init();
 
-  xbt_getpid = MSG_process_self_PID;
-  if (!msg_global) {
+  if (not msg_global) {
 
-    msg_global = xbt_new0(s_MSG_Global_t, 1);
+    msg_global = new s_MSG_Global_t();
 
-    xbt_cfg_register(&_sg_cfg_set, "msg/debug_multiple_use",
-                     "Print backtraces of both processes when there is a conflict of multiple use of a task",
-                     xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_msg_debug_multiple_use, NULL);
-    xbt_cfg_setdefault_boolean(_sg_cfg_set, "msg/debug_multiple_use", "no");
+    msg_global->debug_multiple_use = false;
+    simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
+                               "Print backtraces of both processes when there is a conflict of multiple use of a task");
 
     SIMIX_global_init(argc, argv);
 
-#ifdef MSG_USE_DEPRECATED
-    msg_global->max_channel = 0;
-#endif
     msg_global->sent_msg = 0;
-    msg_global->task_copy_callback = NULL;
-    msg_global->process_data_cleanup = NULL;
+    msg_global->task_copy_callback = nullptr;
+    msg_global->process_data_cleanup = nullptr;
 
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
-
-    sg_platf_postparse_add_cb(MSG_post_create_environment);
-    simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
-      MSG_host_create_(&host);
-    });
   }
 
   if(MC_is_active()){
@@ -78,52 +51,14 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-  XBT_DEBUG("ADD MSG LEVELS");
-  MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy);
-  MSG_FILE_LEVEL = xbt_lib_add_level(file_lib, (void_f_pvoid_t) __MSG_file_destroy);
-  if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit);
-}
-
-#ifdef MSG_USE_DEPRECATED
-
-/* This deprecated function has to be called to fix the number of channel in the
-   simulation before creating any host. Indeed, each channel is
-   represented by a different mailbox on each #m_host_t. This
-   function can then be called only once. This function takes only one
-   parameter.
- * \param number the number of channel in the simulation. It has to be >0
- */
-msg_error_t MSG_set_channel_number(int number)
-{
-  XBT_WARN("DEPRECATED! Please use aliases instead");
-  xbt_assert((msg_global)
-              && (msg_global->max_channel == 0),
-              "Channel number already set!");
-
-  msg_global->max_channel = number;
-
-  return MSG_OK;
-}
-
-/* This deprecated function has to be called once the number of channel is fixed. I can't
-   figure out a reason why anyone would like to call this function but nevermind.
- * \return the number of channel in the simulation.
- */
-int MSG_get_channel_number(void)
-{
-  XBT_WARN("DEPRECATED! Please use aliases instead");
-  xbt_assert((msg_global)
-              && (msg_global->max_channel != 0),
-              "Channel number not set yet!");
-
-  return msg_global->max_channel;
+  if (simgrid::config::get_value<bool>("clean-atexit"))
+    atexit(MSG_exit);
 }
-#endif
 
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
  */
-msg_error_t MSG_main(void)
+msg_error_t MSG_main()
 {
   /* Clean IO before the run */
   fflush(stdout);
@@ -147,45 +82,12 @@ msg_error_t MSG_main(void)
  */
 void MSG_config(const char *key, const char *value){
   xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
-  xbt_cfg_set_as_string(_sg_cfg_set, key, value);
-}
-
-
-/** \ingroup msg_simulation
- * \brief Kill all running process
-
- * \param reset_PIDs should we reset the PID numbers. A negative
- *   number means no reset and a positive number will be used to set the PID
- *   of the next newly created process.
- */
-int MSG_process_killall(int reset_PIDs)
-{
-  simcall_process_killall(reset_PIDs);
-
-  if (reset_PIDs > 0)
-    msg_global->session++;
-
-  return 0;
-
+  simgrid::config::set_as_string(key, value);
 }
 
-static void MSG_exit(void) {
-  if (msg_global==NULL)
-    return;
-
-  TRACE_surf_resource_utilization_release();
-  TRACE_end();
-  free(msg_global);
-  msg_global = NULL;
-}
-
-
-/** \ingroup msg_simulation
- * \brief A clock (in second).
- */
-double MSG_get_clock(void)
-{
-  return SIMIX_get_clock();
+static void MSG_exit() {
+  delete msg_global;
+  msg_global = nullptr;
 }
 
 unsigned long int MSG_get_sent_msg()
@@ -193,8 +95,8 @@ unsigned long int MSG_get_sent_msg()
   return msg_global->sent_msg;
 }
 
-#ifdef MSG_USE_DEPRECATED
-msg_error_t MSG_clean(void) {
-  return MSG_OK;
+/** \brief register functions bypassing the parser */
+void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments)
+{
+  SIMIX_process_set_function(host_id, function_name, arguments, -1, -1);
 }
-#endif