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
Remove useless check for null before free.
[simgrid.git]
/
src
/
msg
/
msg_global.cpp
diff --git
a/src/msg/msg_global.cpp
b/src/msg/msg_global.cpp
index
9845fdf
..
cab13d9
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,25
+6,19
@@
#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 "mc/mc.h"
#include "mc/mc.h"
+#include "src/instr/instr_private.hpp"
#include "src/msg/msg_private.hpp"
#include "src/msg/msg_private.hpp"
+#include <xbt/config.hpp>
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)");
-extern "C" {
-
MSG_Global_t msg_global = nullptr;
static void MSG_exit();
/********************************* MSG **************************************/
MSG_Global_t msg_global = nullptr;
static void MSG_exit();
/********************************* MSG **************************************/
-static void _sg_cfg_cb_msg_debug_multiple_use(const char *name)
-{
- msg_global->debug_multiple_use = xbt_cfg_get_boolean(name);
-}
-
/**
* \ingroup msg_simulation
* \brief Initialize MSG with less verifications
/**
* \ingroup msg_simulation
* \brief Initialize MSG with less verifications
@@
-38,8
+32,9
@@
void MSG_init_nocheck(int *argc, char **argv) {
msg_global = new s_MSG_Global_t();
msg_global = new s_MSG_Global_t();
- xbt_cfg_register_boolean("msg/debug-multiple-use", "no", _sg_cfg_cb_msg_debug_multiple_use,
- "Print backtraces of both processes when there is a conflict of multiple use of a task");
+ msg_global->debug_multiple_use = false;
+ simgrid::config::bind_flag(msg_global->debug_multiple_use, "msg/debug-multiple-use",
+ "Print backtraces of both processes when there is a conflict of multiple use of a task");
SIMIX_global_init(argc, argv);
SIMIX_global_init(argc, argv);
@@
-56,7
+51,7
@@
void MSG_init_nocheck(int *argc, char **argv) {
MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
}
- if (
xbt_cfg_get_boolean
("clean-atexit"))
+ if (
simgrid::config::get_value<bool>
("clean-atexit"))
atexit(MSG_exit);
}
atexit(MSG_exit);
}
@@
-87,39
+82,21
@@
msg_error_t MSG_main()
*/
void MSG_config(const char *key, const char *value){
xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
*/
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(key, value);
-}
-
-/** \ingroup msg_simulation
- * \brief Kill all running process
-
- */
-int MSG_process_killall()
-{
- simcall_process_killall();
-
- return 0;
+ simgrid::config::set_as_string(key, value);
}
static void MSG_exit() {
}
static void MSG_exit() {
- if (msg_global==nullptr)
- return;
-
- TRACE_end();
delete msg_global;
msg_global = nullptr;
}
delete msg_global;
msg_global = nullptr;
}
-/** \ingroup msg_simulation
- * \brief A clock (in second).
- */
-double MSG_get_clock()
-{
- return SIMIX_get_clock();
-}
-
unsigned long int MSG_get_sent_msg()
{
return msg_global->sent_msg;
}
unsigned long int MSG_get_sent_msg()
{
return msg_global->sent_msg;
}
+
+/** \brief register functions bypassing the parser */
+void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments)
+{
+ SIMIX_process_set_function(host_id, function_name, arguments, -1, -1);
}
}