#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/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);
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_cfgelm_boolean, 1, 1, _sg_cfg_cb_msg_debug_multiple_use);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "msg/debug_multiple_use", "no");
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;
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::surf::on_postparse.connect(MSG_post_create_environment);
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()){
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;
-}
-#endif
-
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
xbt_cfg_set_as_string(_sg_cfg_set, key, value);
}
-
/** \ingroup msg_simulation
* \brief Kill all running process
msg_global = NULL;
}
-
/** \ingroup msg_simulation
* \brief A clock (in second).
*/
{
return msg_global->sent_msg;
}
-
-#ifdef MSG_USE_DEPRECATED
-msg_error_t MSG_clean(void) {
- return MSG_OK;
-}
-#endif