#include "simgrid/msg.h"
#include "instr/instr_interface.h"
#include "msg_private.h"
-#include "msg_mailbox.h"
#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/surf/platform.hpp"
+#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
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);
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);
+ msg_global->debug_multiple_use = xbt_cfg_get_boolean(name);
}
static void MSG_host_create_(sg_host_t host)
msg_global = xbt_new0(s_MSG_Global_t, 1);
- 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);
- xbt_cfg_setdefault_boolean(_sg_cfg_set, "msg/debug_multiple_use", "no");
+ xbt_cfg_register_boolean("msg/debug_multiple_use",
+ "Print backtraces of both processes when there is a conflict of multiple use of a task",
+ "no", _sg_cfg_cb_msg_debug_multiple_use);
SIMIX_global_init(argc, argv);
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
MSG_host_create_(&host);
});
+ MSG_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
+ __MSG_host_priv_free((msg_host_priv_t) p);
+ });
+
}
if(MC_is_active()){
*/
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);
+ xbt_cfg_set_as_string(key, value);
}
-
/** \ingroup msg_simulation
* \brief Kill all running process
msg_global = NULL;
}
-
/** \ingroup msg_simulation
* \brief A clock (in second).
*/