/********************************* MSG **************************************/
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
+/**
+ * \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_global_init_args(int *argc, char **argv)
-{
- MSG_global_init(argc, argv);
-}
+void MSG_init_nocheck(int *argc, char **argv) {
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
- */
-void MSG_global_init(int *argc, char **argv)
-{
#ifdef HAVE_TRACING
TRACE_global_init(argc, argv);
#endif
msg_global->process_data_cleanup = NULL;
msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
+ if(MC_IS_ENABLED){
+ /* Ignore total amount of messages sent during the simulation for heap comparison */
+ MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+ }
+
/* initialization of the action module */
_MSG_action_init();
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
- SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
}
#ifdef HAVE_TRACING
TRACE_start();
XBT_DEBUG("ADD MSG LEVELS");
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
-
}
#ifdef MSG_USE_DEPRECATED
parameter.
* \param number the number of channel in the simulation. It has to be >0
*/
-MSG_error_t MSG_set_channel_number(int number)
+msg_error_t MSG_set_channel_number(int number)
{
XBT_WARN("DEPRECATED! Please use aliases instead");
xbt_assert((msg_global)
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
-MSG_error_t MSG_main(void)
-{
- /* Clean IO before the run */
- fflush(stdout);
- fflush(stderr);
-
- if (MC_IS_ENABLED) {
- MC_modelcheck();
- }
- else {
- SIMIX_run();
- }
- return MSG_OK;
-}
-
-MSG_error_t MSG_main_stateful(void)
-{
- /* Clean IO before the run */
- fflush(stdout);
- fflush(stderr);
-
- if (MC_IS_ENABLED) {
- MC_modelcheck_stateful();
- }
- else {
- SIMIX_run();
- }
- return MSG_OK;
-}
-
-
-MSG_error_t MSG_main_liveness(xbt_automaton_t a)
+msg_error_t MSG_main(void)
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- if (MC_IS_ENABLED) {
- MC_modelcheck_liveness(a);
- }
- else {
+ if (MC_IS_ENABLED) {
+ MC_do_the_modelcheck_for_real();
+ } else {
SIMIX_run();
}
return MSG_OK;
/** \ingroup msg_simulation
* \brief Clean the MSG simulation
*/
-MSG_error_t MSG_clean(void)
+msg_error_t MSG_clean(void)
{
XBT_DEBUG("Closing MSG");