X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6042678d235eeddfa0b7120c17c7fb4362881a88..debe4e5871c0c3d1c714bbb1bd28ba7147454aa5:/src/msg/msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 7e250dc00d..ede87a5098 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,14 +1,14 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. 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 "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
-
-#include "instr/instr_interface.hpp"
-#include "mc/mc.h"
+#include "src/instr/instr_private.hpp"
 #include "src/msg/msg_private.hpp"
+#include "src/simix/smx_private.hpp"
 #include <xbt/config.hpp>
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
@@ -20,8 +20,8 @@ static void MSG_exit();
 /********************************* MSG **************************************/
 
 /**
- * \ingroup msg_simulation
- * \brief Initialize MSG with less verifications
+ * @ingroup msg_simulation
+ * @brief Initialize MSG with less verifications
  * You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
  */
 void MSG_init_nocheck(int *argc, char **argv) {
@@ -33,8 +33,8 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global = new s_MSG_Global_t();
 
     msg_global->debug_multiple_use = false;
-    simgrid::config::bindFlag(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");
+    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);
 
@@ -42,8 +42,13 @@ void MSG_init_nocheck(int *argc, char **argv) {
     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);
+    simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
+      // free the data if a function was provided
+      void* userdata = actor->get_impl()->get_user_data();
+      if (userdata && msg_global->process_data_cleanup) {
+        msg_global->process_data_cleanup(userdata);
+      }
+    });
   }
 
   if(MC_is_active()){
@@ -51,69 +56,27 @@ void MSG_init_nocheck(int *argc, char **argv) {
     MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
   }
 
-  if (xbt_cfg_get_boolean("clean-atexit"))
+  if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(MSG_exit);
 }
 
-/** \ingroup msg_simulation
- * \brief Launch the MSG simulation
- */
-msg_error_t MSG_main()
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_is_active()) {
-    MC_run();
-  } else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
-
-/** \ingroup msg_simulation
- * \brief set a configuration variable
- *
- * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
- *
- * Example:
- * MSG_config("host/model","ptask_L07");
- */
 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(key, value);
-}
-
-/** \ingroup msg_simulation
- * \brief Kill all running process
-
- */
-int MSG_process_killall()
-{
-  simcall_process_killall();
-
-  return 0;
+  simgrid::config::set_as_string(key, value);
 }
 
 static void MSG_exit() {
-  if (msg_global==nullptr)
-    return;
-
-  TRACE_end();
   delete msg_global;
   msg_global = nullptr;
 }
 
-/** \ingroup msg_simulation
- * \brief A clock (in second).
- */
-double MSG_get_clock()
+unsigned long int MSG_get_sent_msg()
 {
-  return SIMIX_get_clock();
+  return msg_global->sent_msg;
 }
 
-unsigned long int MSG_get_sent_msg()
+/** @brief register functions bypassing the parser */
+void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments)
 {
-  return msg_global->sent_msg;
+  SIMIX_process_set_function(host_id, function_name, arguments, -1, -1);
 }