A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename instr_interface.h and mc_ignore.h to .hpp.
[simgrid.git]
/
src
/
msg
/
msg_global.cpp
diff --git
a/src/msg/msg_global.cpp
b/src/msg/msg_global.cpp
index
7c2e367
..
071d18a
100644
(file)
--- a/
src/msg/msg_global.cpp
+++ b/
src/msg/msg_global.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
8
. 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. */
/* 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. */
@@
-6,15
+6,13
@@
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.h
pp
"
#include "mc/mc.h"
#include "mc/mc.h"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.h
pp
"
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
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_Global_t msg_global = nullptr;
static void MSG_exit();
@@
-32,9
+30,8
@@
static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
*/
void MSG_init_nocheck(int *argc, char **argv) {
*/
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();
if (not msg_global) {
msg_global = new s_MSG_Global_t();
@@
-50,11
+47,6
@@
void MSG_init_nocheck(int *argc, char **argv) {
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
-
- 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());
- });
}
if(MC_is_active()){
}
if(MC_is_active()){
@@
-99,13
+91,10
@@
void MSG_config(const char *key, const char *value){
/** \ingroup msg_simulation
* \brief Kill all running process
/** \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
)
+int MSG_process_killall()
{
{
- simcall_process_killall(
reset_PIDs
);
+ simcall_process_killall();
return 0;
}
return 0;
}
@@
-114,7
+103,6
@@
static void MSG_exit() {
if (msg_global==nullptr)
return;
if (msg_global==nullptr)
return;
- TRACE_surf_resource_utilization_release();
TRACE_end();
delete msg_global;
msg_global = nullptr;
TRACE_end();
delete msg_global;
msg_global = nullptr;
@@
-132,5
+120,3
@@
unsigned long int MSG_get_sent_msg()
{
return msg_global->sent_msg;
}
{
return msg_global->sent_msg;
}
-
-SG_END_DECL()