X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/73da83c4318087e842fe48c2faff661087895cd2..65a36c8ffd483e56feb42eef2beab7dadb7938c3:/src/xbt/log.c diff --git a/src/xbt/log.c b/src/xbt/log.c index adaa919f06..83acbfde9c 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -1,12 +1,11 @@ /* log - a generic logging facility in the spirit of log4j */ -/* Copyright (c) 2004-2011. The SimGrid Team. +/* Copyright (c) 2004-2014. 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. */ - #include #include #include /* snprintf */ @@ -24,7 +23,6 @@ #include "xbt/dynar.h" #include "xbt/xbt_os_thread.h" -XBT_PUBLIC_DATA(int) (*xbt_pid) (); 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_rmutex_t log_cat_init_mutex = NULL; @@ -256,7 +254,7 @@ XBT_LOG_NEW_CATEGORY(VSS); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(SA, VSS); int main() { - / * Now set the parent's priority. (the string would typcially be a runtime option) * / + / * Now set the parent's priority. (the string would typically be a runtime option) * / xbt_log_control_set("SA.thresh:3"); / * This request is enabled, because WARNING >= INFO. * / @@ -288,12 +286,29 @@ checks and deals properly with such arguments. The most common setting is to control which logging event will get displayed by setting a threshold to each category through the -thres keyword. +threshold keyword. -For example, \verbatim --log=root.thres:debug\endverbatim will make +For example, \verbatim --log=root.threshold:debug\endverbatim will make SimGrid extremely verbose while \verbatim --log=root.thres:critical\endverbatim should shut it almost -completely off. The full list of recognized thresholds is the following: +completely off. + +Note that the threshold keyword can be abbreviated here. For example, +all the following notations have the same result. +\verbatim +--log=root.threshold:debug +--log=root.threshol:debug +--log=root.thresho:debug +--log=root.thresh:debug +--log=root.thres:debug +--log=root.thre:debug +--log=root.thr:debug +--log=root.th:debug +--log=root.t:debug +--log=root.:debug <--- That's obviously really ugly, but it actually works. +\endverbatim + +The full list of recognized thresholds is the following: - trace: enter and return of some functions - debug: crufty output @@ -405,6 +420,13 @@ The following example resets the additivity of the xbt category to true (which i option and specify the max file size. This would be a nice default for non-kernel applications. - Careful, category names are global variables. + - When writting a log format, you often want to use spaces. If you don't protect these spaces, they are used as configuration elements separators. + For example, if you want to remove the date from the logs, you want to pass the following + argument on the command line. The outer quotes are here to protect the string from the shell + interpretation while the inner ones are there to prevent simgrid from splitting the string + in several log parameters (that would be invalid). + +\verbatim --log="'root.fmt:%l: [%p/%c]: %m%n'"\endverbatim \section log_internals 4. Internal considerations @@ -530,7 +552,7 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(xbt); XBT_LOG_CONNECT(graphxml_parse); XBT_LOG_CONNECT(log); -#if HAVE_MMAP +#if HAVE_MMALLOC XBT_LOG_CONNECT(mm_diff); #endif XBT_LOG_CONNECT(module); @@ -553,7 +575,6 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(xbt_mallocator); XBT_LOG_CONNECT(xbt_matrix); XBT_LOG_CONNECT(xbt_parmap); - XBT_LOG_CONNECT(xbt_parmap_unit); XBT_LOG_CONNECT(xbt_queue); XBT_LOG_CONNECT(xbt_set); XBT_LOG_CONNECT(xbt_sync); @@ -582,6 +603,7 @@ 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_msg_vm); XBT_LOG_CONNECT(instr_paje_containers); XBT_LOG_CONNECT(instr_paje_header); XBT_LOG_CONNECT(instr_paje_trace); @@ -589,7 +611,10 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(instr_paje_values); XBT_LOG_CONNECT(instr_resource); XBT_LOG_CONNECT(instr_routing); + XBT_LOG_CONNECT(instr_sd); XBT_LOG_CONNECT(instr_surf); + XBT_LOG_CONNECT(instr_trace); + XBT_LOG_CONNECT(instr_TI_trace); #endif /* jedule */ @@ -605,7 +630,9 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(mc_checkpoint); XBT_LOG_CONNECT(mc_compare); XBT_LOG_CONNECT(mc_dpor); + XBT_LOG_CONNECT(mc_dwarf); XBT_LOG_CONNECT(mc_global); + XBT_LOG_CONNECT(mc_hash); XBT_LOG_CONNECT(mc_liveness); XBT_LOG_CONNECT(mc_memory); XBT_LOG_CONNECT(mc_memory_map); @@ -621,6 +648,7 @@ static void xbt_log_connect_categories(void) 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_vm); @@ -647,6 +675,7 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(simix_process); XBT_LOG_CONNECT(simix_smurf); XBT_LOG_CONNECT(simix_synchro); + XBT_LOG_CONNECT(simix_vm); /* smpi */ /* SMPI categories are connected in smpi_global.c */ @@ -657,13 +686,14 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(random); XBT_LOG_CONNECT(surf_config); XBT_LOG_CONNECT(surf_cpu); + XBT_LOG_CONNECT(surf_cpu_cas); XBT_LOG_CONNECT(surf_cpu_ti); + XBT_LOG_CONNECT(surf_energy); XBT_LOG_CONNECT(surf_kernel); XBT_LOG_CONNECT(surf_lagrange); XBT_LOG_CONNECT(surf_lagrange_dichotomy); XBT_LOG_CONNECT(surf_maxmin); XBT_LOG_CONNECT(surf_network); - XBT_LOG_CONNECT(surf_new_model); #ifdef HAVE_GTNETS XBT_LOG_CONNECT(surf_network_gtnets); XBT_LOG_CONNECT(surf_network_gtnets_interface); @@ -679,14 +709,15 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(surf_route); XBT_LOG_CONNECT(surf_routing_generic); XBT_LOG_CONNECT(surf_route_cluster); + XBT_LOG_CONNECT(surf_route_cluster_torus); XBT_LOG_CONNECT(surf_route_dijkstra); XBT_LOG_CONNECT(surf_route_floyd); XBT_LOG_CONNECT(surf_route_full); XBT_LOG_CONNECT(surf_route_none); - XBT_LOG_CONNECT(surf_route_rulebased); XBT_LOG_CONNECT(surf_route_vivaldi); XBT_LOG_CONNECT(surf_storage); XBT_LOG_CONNECT(surf_trace); + XBT_LOG_CONNECT(surf_vm_workstation); XBT_LOG_CONNECT(surf_workstation); #endif /* simgrid_EXPORTS */ @@ -1040,7 +1071,7 @@ void xbt_log_threshold_set(xbt_log_category_t cat, static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) { - + const char *orig_control_string = control_string; xbt_log_setting_t set = xbt_new(s_xbt_log_setting_t, 1); const char *name, *dot, *eq; @@ -1063,9 +1094,9 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) control_string += strcspn(control_string, " "); xbt_assert(*dot == '.' && (*eq == '=' || *eq == ':'), - "Invalid control string '%s'", control_string); + "Invalid control string '%s'", orig_control_string); - if (!strncmp(dot + 1, "thresh", (size_t) (eq - dot - 1))) { + if (!strncmp(dot + 1, "threshold", (size_t) (eq - dot - 1))) { int i; char *neweq = xbt_strdup(eq + 1); char *p = neweq - 1; @@ -1083,7 +1114,12 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string) break; } } - if (i < xbt_log_priority_infinite) { + + if(ithresh = (e_xbt_log_priority_t) i; } else { THROWF(arg_error, 0, @@ -1345,8 +1381,8 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category, this_prefix = bprintf("%s \\_ ", prefix); child_prefix = bprintf("%s | ", prefix); } else { - this_prefix = bprintf("%s", prefix); - child_prefix = bprintf("%s", prefix); + this_prefix = xbt_strdup(prefix); + child_prefix = xbt_strdup(prefix); } dynar = xbt_dynar_new(sizeof(xbt_log_category_t), NULL);