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
Update info
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
af04c75
..
67c19a8
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-15,15
+15,16
@@
#include "src/xbt_modinter.h"
#include "src/xbt_modinter.h"
-#include "xbt/misc.h"
+#include "src/xbt/log_private.h"
+#include "xbt/asserts.h"
+#include "xbt/dynar.h"
#include "xbt/ex.h"
#include "xbt/ex.h"
+#include "xbt/misc.h"
#include "xbt/str.h"
#include "xbt/sysdep.h"
#include "xbt/str.h"
#include "xbt/sysdep.h"
-#include "src/xbt/log_private.h"
-#include "xbt/dynar.h"
#include "xbt/xbt_os_thread.h"
#include "xbt/xbt_os_thread.h"
-int xbt_log_no_loc = 0;
/* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
+int xbt_log_no_loc = 0; /* if set to true (with --log=no_loc), file localization will be omitted (for tesh tests) */
static xbt_os_mutex_t log_cat_init_mutex = NULL;
/** \addtogroup XBT_log
static xbt_os_mutex_t log_cat_init_mutex = NULL;
/** \addtogroup XBT_log
@@
-114,6
+115,7
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(xbt_lib);
XBT_LOG_CONNECT(xbt_mallocator);
XBT_LOG_CONNECT(xbt_matrix);
XBT_LOG_CONNECT(xbt_lib);
XBT_LOG_CONNECT(xbt_mallocator);
XBT_LOG_CONNECT(xbt_matrix);
+ XBT_LOG_CONNECT(xbt_memory_map);
XBT_LOG_CONNECT(xbt_parmap);
XBT_LOG_CONNECT(xbt_sync);
XBT_LOG_CONNECT(xbt_sync_os);
XBT_LOG_CONNECT(xbt_parmap);
XBT_LOG_CONNECT(xbt_sync);
XBT_LOG_CONNECT(xbt_sync_os);
@@
-135,7
+137,6
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(instr_config);
XBT_LOG_CONNECT(instr_msg);
XBT_LOG_CONNECT(instr_msg_process);
XBT_LOG_CONNECT(instr_config);
XBT_LOG_CONNECT(instr_msg);
XBT_LOG_CONNECT(instr_msg_process);
- XBT_LOG_CONNECT(instr_msg_vm);
XBT_LOG_CONNECT(instr_paje_containers);
XBT_LOG_CONNECT(instr_paje_header);
XBT_LOG_CONNECT(instr_paje_trace);
XBT_LOG_CONNECT(instr_paje_containers);
XBT_LOG_CONNECT(instr_paje_header);
XBT_LOG_CONNECT(instr_paje_trace);
@@
-150,7
+151,6
@@
static void xbt_log_connect_categories(void)
/* jedule */
#if HAVE_JEDULE
XBT_LOG_CONNECT(jedule);
/* jedule */
#if HAVE_JEDULE
XBT_LOG_CONNECT(jedule);
- XBT_LOG_CONNECT(jed_out);
XBT_LOG_CONNECT(jed_sd);
#endif
XBT_LOG_CONNECT(jed_sd);
#endif
@@
-173,8
+173,10
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(mc_comm_pattern);
XBT_LOG_CONNECT(mc_process);
XBT_LOG_CONNECT(mc_protocol);
XBT_LOG_CONNECT(mc_comm_pattern);
XBT_LOG_CONNECT(mc_process);
XBT_LOG_CONNECT(mc_protocol);
- XBT_LOG_CONNECT(mc_
RegionSnaphot
);
+ XBT_LOG_CONNECT(mc_
Channel
);
XBT_LOG_CONNECT(mc_ModelChecker);
XBT_LOG_CONNECT(mc_ModelChecker);
+ XBT_LOG_CONNECT(mc_RegionSnaphot);
+ XBT_LOG_CONNECT(mc_Session);
XBT_LOG_CONNECT(mc_state);
#endif
XBT_LOG_CONNECT(mc_global);
XBT_LOG_CONNECT(mc_state);
#endif
XBT_LOG_CONNECT(mc_global);
@@
-193,6
+195,15
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(msg_task);
XBT_LOG_CONNECT(msg_vm);
XBT_LOG_CONNECT(msg_task);
XBT_LOG_CONNECT(msg_vm);
+ /* s4u */
+ XBT_LOG_CONNECT(s4u);
+ XBT_LOG_CONNECT(s4u_activity);
+ XBT_LOG_CONNECT(s4u_actor);
+ XBT_LOG_CONNECT(s4u_netzone);
+ XBT_LOG_CONNECT(s4u_channel);
+ XBT_LOG_CONNECT(s4u_comm);
+ XBT_LOG_CONNECT(s4u_file);
+
/* sg */
XBT_LOG_CONNECT(sg_host);
/* sg */
XBT_LOG_CONNECT(sg_host);
@@
-217,7
+228,6
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(simix_process);
XBT_LOG_CONNECT(simix_popping);
XBT_LOG_CONNECT(simix_synchro);
XBT_LOG_CONNECT(simix_process);
XBT_LOG_CONNECT(simix_popping);
XBT_LOG_CONNECT(simix_synchro);
- XBT_LOG_CONNECT(simix_vm);
/* smpi */
/* SMPI categories are connected in smpi_global.c */
/* smpi */
/* SMPI categories are connected in smpi_global.c */
@@
-253,7
+263,7
@@
static void xbt_log_connect_categories(void)
XBT_LOG_CONNECT(surf_trace);
XBT_LOG_CONNECT(surf_vm);
XBT_LOG_CONNECT(surf_host);
XBT_LOG_CONNECT(surf_trace);
XBT_LOG_CONNECT(surf_vm);
XBT_LOG_CONNECT(surf_host);
-
+
#endif /* simgrid_EXPORTS */
}
#endif /* simgrid_EXPORTS */
}
@@
-270,7
+280,8
@@
void xbt_log_init(int *argc, char **argv)
int i, j;
char *opt;
int i, j;
char *opt;
- // _XBT_LOGV(log).threshold = xbt_log_priority_debug; /* uncomment to set the LOG category to debug directly */
+ /* uncomment to set the LOG category to debug directly */
+ // _XBT_LOGV(log).threshold = xbt_log_priority_debug;
xbt_log_connect_categories();
xbt_log_connect_categories();