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
merge msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
410bf81
..
f04e5b5
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-638,6
+638,7
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(mc_liveness);
XBT_LOG_CONNECT(mc_memory);
XBT_LOG_CONNECT(mc_memory_map);
XBT_LOG_CONNECT(mc_liveness);
XBT_LOG_CONNECT(mc_memory);
XBT_LOG_CONNECT(mc_memory_map);
+ XBT_LOG_CONNECT(mc_page_snapshot);
XBT_LOG_CONNECT(mc_request);
XBT_LOG_CONNECT(mc_safety);
XBT_LOG_CONNECT(mc_visited);
XBT_LOG_CONNECT(mc_request);
XBT_LOG_CONNECT(mc_safety);
XBT_LOG_CONNECT(mc_visited);
@@
-650,7
+651,6
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(msg_io);
XBT_LOG_CONNECT(msg_kernel);
XBT_LOG_CONNECT(msg_mailbox);
XBT_LOG_CONNECT(msg_io);
XBT_LOG_CONNECT(msg_kernel);
XBT_LOG_CONNECT(msg_mailbox);
- XBT_LOG_CONNECT(msg_new_API);
XBT_LOG_CONNECT(msg_process);
XBT_LOG_CONNECT(msg_synchro);
XBT_LOG_CONNECT(msg_task);
XBT_LOG_CONNECT(msg_process);
XBT_LOG_CONNECT(msg_synchro);
XBT_LOG_CONNECT(msg_task);
@@
-675,9
+675,8
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(simix_io);
XBT_LOG_CONNECT(simix_kernel);
XBT_LOG_CONNECT(simix_network);
XBT_LOG_CONNECT(simix_io);
XBT_LOG_CONNECT(simix_kernel);
XBT_LOG_CONNECT(simix_network);
- XBT_LOG_CONNECT(simix_new_api);
XBT_LOG_CONNECT(simix_process);
XBT_LOG_CONNECT(simix_process);
- XBT_LOG_CONNECT(simix_
smurf
);
+ XBT_LOG_CONNECT(simix_
popping
);
XBT_LOG_CONNECT(simix_synchro);
XBT_LOG_CONNECT(simix_vm);
XBT_LOG_CONNECT(simix_synchro);
XBT_LOG_CONNECT(simix_vm);
@@
-1098,8
+1097,8
@@
static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
eq = control_string;
control_string += strcspn(control_string, " ");
eq = control_string;
control_string += strcspn(control_string, " ");
- xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'),
-
"Invalid control string '%s'", orig_control_string);
+ if(*dot != '.' && (*eq == '=' || *eq == ':'))
+
xbt_die (
"Invalid control string '%s'", orig_control_string);
if (!strncmp(dot + 1, "threshold", (size_t) (eq - dot - 1))) {
int i;
if (!strncmp(dot + 1, "threshold", (size_t) (eq - dot - 1))) {
int i;