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
Create a new log channel tbx containing dict, set, log, dynar, config (to shut
[simgrid.git]
/
src
/
xbt
/
log.c
diff --git
a/src/xbt/log.c
b/src/xbt/log.c
index
cb07747
..
37c978c
100644
(file)
--- a/
src/xbt/log.c
+++ b/
src/xbt/log.c
@@
-48,7
+48,8
@@
gras_log_category_t _GRAS_LOGV(GRAS_LOG_ROOT_CAT) = {
NULL, 0
};
GRAS_LOG_NEW_SUBCATEGORY(GRAS,GRAS_LOG_ROOT_CAT);
NULL, 0
};
GRAS_LOG_NEW_SUBCATEGORY(GRAS,GRAS_LOG_ROOT_CAT);
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(log,GRAS);
+GRAS_LOG_NEW_SUBCATEGORY(tbx,GRAS);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(log,tbx);
static void _apply_control(gras_log_category_t* cat) {
static void _apply_control(gras_log_category_t* cat) {
@@
-233,7
+234,8
@@
static gras_error_t _gras_log_parse_setting(const char* control_string,
if (!(set->catname=malloc(dot - name+1)))
RAISE_MALLOC;
if (!(set->catname=malloc(dot - name+1)))
RAISE_MALLOC;
- strncat(set->catname,name,dot-name);
+ strncpy(set->catname,name,dot-name);
+ set->catname[dot-name]='\0'; /* Just in case */
DEBUG1("This is for cat '%s'", set->catname);
return no_error;
}
DEBUG1("This is for cat '%s'", set->catname);
return no_error;
}
@@
-316,7
+318,8
@@
gras_error_t gras_log_control_set(const char* control_string) {
if (control_string == NULL)
return no_error;
if (gras_log_settings == NULL)
if (control_string == NULL)
return no_error;
if (gras_log_settings == NULL)
- TRY(gras_dynar_new(&gras_log_settings,sizeof(gras_log_setting_t*),_free_setting));
+ TRY(gras_dynar_new(&gras_log_settings,sizeof(gras_log_setting_t*),
+ _free_setting));
if (!(set = malloc(sizeof(gras_log_setting_t))))
RAISE_MALLOC;
if (!(set = malloc(sizeof(gras_log_setting_t))))
RAISE_MALLOC;
@@
-342,7
+345,8
@@
gras_error_t gras_log_control_set(const char* control_string) {
free(cs);
}
free(cs);
}
- TRYCATCH(_gras_log_cat_searchsub(&_GRAS_LOGV(root),set->catname,&cat),mismatch_error);
+ TRYCATCH(_gras_log_cat_searchsub(&_GRAS_LOGV(root),set->catname,&cat),
+ mismatch_error);
if (errcode == mismatch_error) {
DEBUG0("Store for further application");
DEBUG1("push %p to the settings",set);
if (errcode == mismatch_error) {
DEBUG0("Store for further application");
DEBUG1("push %p to the settings",set);
@@
-368,5
+372,7
@@
void gras_log_appender_set(gras_log_category_t* cat, gras_log_appender_t* app) {
}
void gras_log_exit(void) {
}
void gras_log_exit(void) {
+ VERB0("Exiting log");
gras_dynar_free(gras_log_settings);
gras_dynar_free(gras_log_settings);
+ VERB0("Exited log");
}
}