-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2015. 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 <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
-#include "simgrid/msg.h"
#include "instr/instr_interface.h"
-#include "msg_private.h"
#include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
-#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
+#include "src/msg/msg_private.h"
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
TRACE_global_init(argc, argv);
- xbt_getpid = MSG_process_self_PID;
+ xbt_getpid = &MSG_process_self_PID;
if (!msg_global) {
msg_global = xbt_new0(s_MSG_Global_t, 1);
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
- simgrid::surf::on_postparse.connect(MSG_post_create_environment);
+ simgrid::s4u::onPlatformCreated.connect(MSG_post_create_environment);
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host& host) {
MSG_host_create_(&host);
});
{
simcall_process_killall(reset_PIDs);
- if (reset_PIDs > 0)
- msg_global->session++;
-
return 0;
-
}
static void MSG_exit() {