deal with MSG and Java too

[simgrid.git] / src / msg / msg_global.cpp

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 6f5885a..3e18336 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2021. 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. */
@@ -7,15 +7,15 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/instr/instr_private.hpp"
+#include "src/kernel/EngineImpl.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");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
-MSG_Global_t msg_global = nullptr;
-simgrid::xbt::Extension<simgrid::s4u::Actor, simgrid::msg::ActorUserData> simgrid::msg::ActorUserData::EXTENSION_ID;
+bool MSG_Global_t::debug_multiple_use = false;
+
+MSG_Global_t* msg_global = nullptr;
 
 static void MSG_exit();
 
@@ -26,55 +26,46 @@ static void MSG_exit();
  * @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) {
-
-  TRACE_global_init();
+void MSG_init_nocheck(int* argc, char** argv)
+{
+  simgrid::instr::init();
 
   if (not msg_global) {
-
-    msg_global = new s_MSG_Global_t();
-    if (not simgrid::msg::ActorUserData::EXTENSION_ID.valid())
-      simgrid::msg::ActorUserData::EXTENSION_ID = simgrid::s4u::Actor::extension_create<simgrid::msg::ActorUserData>();
-
-    msg_global->debug_multiple_use = false;
-    simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
+    simgrid::config::bind_flag(MSG_Global_t::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);
+    simgrid::kernel::EngineImpl::get_instance(argc, argv);
+
+    msg_global = new MSG_Global_t();
 
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = nullptr;
     msg_global->process_data_cleanup = nullptr;
-
-    simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr actor) {
-      XBT_DEBUG("creating the extension to store user data");
-      actor->extension_set(new simgrid::msg::ActorUserData(actor));
-    });
-
-    simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) {
+    simgrid::s4u::Actor::on_termination.connect([](simgrid::s4u::Actor const& actor) {
       // free the data if a function was provided
-      void* userdata = actor->extension<simgrid::msg::ActorUserData>()->get_user_data();
-      if (userdata && msg_global->process_data_cleanup) {
+      void* userdata = sg_actor_get_data(&actor);
+      if (userdata && msg_global->process_data_cleanup)
         msg_global->process_data_cleanup(userdata);
-      }
     });
   }
 
   if(MC_is_active()){
     /* Ignore total amount of messages sent during the simulation for heap comparison */
-    MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+    MC_ignore_heap(&msg_global->sent_msg, sizeof msg_global->sent_msg);
   }
 
-  if (simgrid::config::get_value<bool>("clean-atexit"))
+  if (simgrid::config::get_value<bool>("debug/clean-atexit"))
     atexit(MSG_exit);
 }
 
-void MSG_config(const char *key, const char *value){
+void MSG_config(const char* key, const char* value)
+{
   xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
   simgrid::config::set_as_string(key, value);
 }
 
-static void MSG_exit() {
+static void MSG_exit()
+{
   delete msg_global;
   msg_global = nullptr;
 }
@@ -83,9 +74,3 @@ unsigned long int MSG_get_sent_msg()
 {
   return msg_global->sent_msg;
 }
-
-/** @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);
-}