-/* Copyright (c) 2004-2017. 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.h"
-#include "mc/mc.h"
-#include "src/msg/msg_private.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");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
-SG_BEGIN_DECL()
-
MSG_Global_t msg_global = nullptr;
static void MSG_exit();
/********************************* MSG **************************************/
-static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
-{
- msg_global->debug_multiple_use = xbt_cfg_get_boolean(name);
-}
-
/**
- * \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) {
- TRACE_global_init(argc, argv);
+ TRACE_global_init();
- xbt_getpid = &MSG_process_self_PID;
if (not msg_global) {
msg_global = new s_MSG_Global_t();
- xbt_cfg_register_boolean("msg/debug-multiple-use", "no", _sg_cfg_cb_msg_debug_multiple_use,
- "Print backtraces of both processes when there is a conflict of multiple use of a task");
+ 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);
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::onPlatformCreated.connect(MSG_post_create_environment);
-
- simgrid::MsgHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::MsgHostExt>();
- simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
- host.extension_set<simgrid::MsgHostExt>(new simgrid::MsgHostExt());
+ 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);
+ }
});
}
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);
- 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
-
- * \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);
-
- return 0;
+ simgrid::config::set_as_string(key, value);
}
static void MSG_exit() {
- if (msg_global==nullptr)
- return;
-
- TRACE_surf_resource_utilization_release();
- TRACE_end();
delete msg_global;
msg_global = nullptr;
}
-/** \ingroup msg_simulation
- * \brief A clock (in second).
- */
-double MSG_get_clock()
-{
- return SIMIX_get_clock();
-}
-
unsigned long int MSG_get_sent_msg()
{
return msg_global->sent_msg;
}
-SG_END_DECL()
+/** @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);
+}
