X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvlog.c;h=ef95b1b44e303168b5daac4703fcedacea4100b0;hb=c1a543a8d6d2847983b6b0defd1e19777da85715;hp=b534d196525dfce984c7fb2280056452138f617d;hpb=a0bc29a541fc7dc6e20137d5558e2094d614e6ab;p=sliver-openvswitch.git diff --git a/lib/vlog.c b/lib/vlog.c index b534d1965..ef95b1b44 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,11 +29,12 @@ #include "dirs.h" #include "dynamic-string.h" #include "sat-math.h" +#include "svec.h" #include "timeval.h" #include "unixctl.h" #include "util.h" -#define THIS_MODULE VLM_vlog +VLOG_DEFINE_THIS_MODULE(vlog); /* Name for each logging level. */ static const char *level_names[VLL_N_LEVELS] = { @@ -49,12 +50,24 @@ static int syslog_levels[VLL_N_LEVELS] = { #undef VLOG_LEVEL }; -/* Name for each logging module */ -static const char *module_names[VLM_N_MODULES] = { -#define VLOG_MODULE(NAME) #NAME, +/* The log modules. */ +#if USE_LINKER_SECTIONS +extern struct vlog_module *__start_vlog_modules[]; +extern struct vlog_module *__stop_vlog_modules[]; +#define vlog_modules __start_vlog_modules +#define n_vlog_modules (__stop_vlog_modules - __start_vlog_modules) +#else +#define VLOG_MODULE VLOG_DEFINE_MODULE__ +#include "vlog-modules.def" +#undef VLOG_MODULE + +struct vlog_module *vlog_modules[] = { +#define VLOG_MODULE(NAME) &VLM_##NAME, #include "vlog-modules.def" #undef VLOG_MODULE }; +#define n_vlog_modules ARRAY_SIZE(vlog_modules) +#endif /* Information about each facility. */ struct facility { @@ -68,13 +81,6 @@ static struct facility facilities[VLF_N_FACILITIES] = { #undef VLOG_FACILITY }; -/* Current log levels. */ -static int levels[VLM_N_MODULES][VLF_N_FACILITIES]; - -/* For fast checking whether we're logging anything for a given module and - * level.*/ -enum vlog_level min_vlog_levels[VLM_N_MODULES]; - /* Time at which vlog was initialized, in milliseconds. */ static long long int boot_time; @@ -82,7 +88,10 @@ static long long int boot_time; static char *log_file_name; static FILE *log_file; -static void format_log_message(enum vlog_module, enum vlog_level, +/* vlog initialized? */ +static bool vlog_inited; + +static void format_log_message(const struct vlog_module *, enum vlog_level, enum vlog_facility, unsigned int msg_num, const char *message, va_list, struct ds *) PRINTF_FORMAT(5, 0); @@ -90,7 +99,7 @@ static void format_log_message(enum vlog_module, enum vlog_level, /* Searches the 'n_names' in 'names'. Returns the index of a match for * 'target', or 'n_names' if no name matches. */ static size_t -search_name_array(const char *target, const char **names, size_t n_names) +search_name_array(const char *target, const char **names, size_t n_names) { size_t i; @@ -114,14 +123,14 @@ vlog_get_level_name(enum vlog_level level) /* Returns the logging level with the given 'name', or VLL_N_LEVELS if 'name' * is not the name of a logging level. */ enum vlog_level -vlog_get_level_val(const char *name) +vlog_get_level_val(const char *name) { return search_name_array(name, level_names, ARRAY_SIZE(level_names)); } /* Returns the name for logging facility 'facility'. */ const char * -vlog_get_facility_name(enum vlog_facility facility) +vlog_get_facility_name(enum vlog_facility facility) { assert(facility < VLF_N_FACILITIES); return facilities[facility].name; @@ -130,7 +139,7 @@ vlog_get_facility_name(enum vlog_facility facility) /* Returns the logging facility named 'name', or VLF_N_FACILITIES if 'name' is * not the name of a logging facility. */ enum vlog_facility -vlog_get_facility_val(const char *name) +vlog_get_facility_val(const char *name) { size_t i; @@ -143,65 +152,77 @@ vlog_get_facility_val(const char *name) } /* Returns the name for logging module 'module'. */ -const char *vlog_get_module_name(enum vlog_module module) +const char * +vlog_get_module_name(const struct vlog_module *module) { - assert(module < VLM_N_MODULES); - return module_names[module]; + return module->name; } -/* Returns the logging module named 'name', or VLM_N_MODULES if 'name' is not - * the name of a logging module. */ -enum vlog_module -vlog_get_module_val(const char *name) +/* Returns the logging module named 'name', or NULL if 'name' is not the name + * of a logging module. */ +struct vlog_module * +vlog_module_from_name(const char *name) { - return search_name_array(name, module_names, ARRAY_SIZE(module_names)); + struct vlog_module **mp; + + for (mp = vlog_modules; mp < &vlog_modules[n_vlog_modules]; mp++) { + if (!strcasecmp(name, (*mp)->name)) { + return *mp; + } + } + return NULL; } /* Returns the current logging level for the given 'module' and 'facility'. */ enum vlog_level -vlog_get_level(enum vlog_module module, enum vlog_facility facility) +vlog_get_level(const struct vlog_module *module, enum vlog_facility facility) { - assert(module < VLM_N_MODULES); assert(facility < VLF_N_FACILITIES); - return levels[module][facility]; + return module->levels[facility]; } static void -update_min_level(enum vlog_module module) +update_min_level(struct vlog_module *module) { - enum vlog_level min_level = VLL_EMER; enum vlog_facility facility; + module->min_level = VLL_OFF; for (facility = 0; facility < VLF_N_FACILITIES; facility++) { if (log_file || facility != VLF_FILE) { - min_level = MAX(min_level, levels[module][facility]); + enum vlog_level level = module->levels[facility]; + if (level > module->min_level) { + module->min_level = level; + } } } - min_vlog_levels[module] = min_level; } static void -set_facility_level(enum vlog_facility facility, enum vlog_module module, +set_facility_level(enum vlog_facility facility, struct vlog_module *module, enum vlog_level level) { assert(facility >= 0 && facility < VLF_N_FACILITIES); assert(level < VLL_N_LEVELS); - if (module == VLM_ANY_MODULE) { - for (module = 0; module < VLM_N_MODULES; module++) { - levels[module][facility] = level; - update_min_level(module); + if (!module) { + struct vlog_module **mp; + + for (mp = vlog_modules; mp < &vlog_modules[n_vlog_modules]; mp++) { + (*mp)->levels[facility] = level; + update_min_level(*mp); } } else { - levels[module][facility] = level; + module->levels[facility] = level; update_min_level(module); } } -/* Sets the logging level for the given 'module' and 'facility' to 'level'. */ +/* Sets the logging level for the given 'module' and 'facility' to 'level'. A + * null 'module' or a 'facility' of VLF_ANY_FACILITY is treated as a wildcard + * across all modules or facilities, respectively. */ void -vlog_set_levels(enum vlog_module module, enum vlog_facility facility, - enum vlog_level level) +vlog_set_levels(struct vlog_module *module, enum vlog_facility facility, + enum vlog_level level) { assert(facility < VLF_N_FACILITIES || facility == VLF_ANY_FACILITY); if (facility == VLF_ANY_FACILITY) { @@ -214,7 +235,7 @@ vlog_set_levels(enum vlog_module module, enum vlog_facility facility, } static void -do_set_pattern(enum vlog_facility facility, const char *pattern) +do_set_pattern(enum vlog_facility facility, const char *pattern) { struct facility *f = &facilities[facility]; if (!f->default_pattern) { @@ -256,7 +277,7 @@ int vlog_set_log_file(const char *file_name) { char *old_log_file_name; - enum vlog_module module; + struct vlog_module **mp; int error; /* Close old log file. */ @@ -271,15 +292,15 @@ vlog_set_log_file(const char *file_name) old_log_file_name = log_file_name; log_file_name = (file_name ? xstrdup(file_name) - : xasprintf("%s/%s.log", ovs_logdir, program_name)); + : xasprintf("%s/%s.log", ovs_logdir(), program_name)); free(old_log_file_name); file_name = NULL; /* Might have been freed. */ /* Open new log file and update min_levels[] to reflect whether we actually * have a log_file. */ log_file = fopen(log_file_name, "a"); - for (module = 0; module < VLM_N_MODULES; module++) { - update_min_level(module); + for (mp = vlog_modules; mp < &vlog_modules[n_vlog_modules]; mp++) { + update_min_level(*mp); } /* Log success or failure. */ @@ -320,7 +341,7 @@ vlog_set_levels_from_string(const char *s_) for (module = strtok_r(s, ": \t", &save_ptr); module != NULL; module = strtok_r(NULL, ": \t", &save_ptr)) { - enum vlog_module e_module; + struct vlog_module *e_module; enum vlog_facility e_facility; facility = strtok_r(NULL, ":", &save_ptr); @@ -344,10 +365,10 @@ vlog_set_levels_from_string(const char *s_) enum vlog_level e_level; if (!strcmp(module, "ANY")) { - e_module = VLM_ANY_MODULE; + e_module = NULL; } else { - e_module = vlog_get_module_val(module); - if (e_module >= VLM_N_MODULES) { + e_module = vlog_module_from_name(module); + if (!e_module) { char *msg = xasprintf("unknown module \"%s\"", module); free(s); return msg; @@ -380,7 +401,7 @@ vlog_set_verbosity(const char *arg) ovs_fatal(0, "processing \"%s\": %s", arg, msg); } } else { - vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_DBG); + vlog_set_levels(NULL, VLF_ANY_FACILITY, VLL_DBG); } } @@ -418,17 +439,22 @@ vlog_unixctl_reopen(struct unixctl_conn *conn, } } -/* Initializes the logging subsystem. */ +/* Initializes the logging subsystem and registers its unixctl server + * commands. */ void -vlog_init(void) +vlog_init(void) { time_t now; + if (vlog_inited) { + return; + } + vlog_inited = true; + openlog(program_name, LOG_NDELAY, LOG_DAEMON); - vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_INFO); boot_time = time_msec(); - now = time_now(); + now = time_wall(); if (now < 0) { struct tm tm; char s[128]; @@ -445,9 +471,12 @@ vlog_init(void) /* Closes the logging subsystem. */ void -vlog_exit(void) +vlog_exit(void) { - closelog(); + if (vlog_inited) { + closelog(); + vlog_inited = false; + } } /* Print the current logging level for each module. */ @@ -455,18 +484,28 @@ char * vlog_get_levels(void) { struct ds s = DS_EMPTY_INITIALIZER; - enum vlog_module module; + struct vlog_module **mp; + struct svec lines = SVEC_EMPTY_INITIALIZER; + char *line; + size_t i; ds_put_format(&s, " console syslog file\n"); ds_put_format(&s, " ------- ------ ------\n"); - for (module = 0; module < VLM_N_MODULES; module++) { - ds_put_format(&s, "%-16s %4s %4s %4s\n", - vlog_get_module_name(module), - vlog_get_level_name(vlog_get_level(module, VLF_CONSOLE)), - vlog_get_level_name(vlog_get_level(module, VLF_SYSLOG)), - vlog_get_level_name(vlog_get_level(module, VLF_FILE))); + for (mp = vlog_modules; mp < &vlog_modules[n_vlog_modules]; mp++) { + line = xasprintf("%-16s %4s %4s %4s\n", + vlog_get_module_name(*mp), + vlog_get_level_name(vlog_get_level(*mp, VLF_CONSOLE)), + vlog_get_level_name(vlog_get_level(*mp, VLF_SYSLOG)), + vlog_get_level_name(vlog_get_level(*mp, VLF_FILE))); + svec_add_nocopy(&lines, line); + } + + svec_sort(&lines); + SVEC_FOR_EACH (i, line, &lines) { + ds_put_cstr(&s, line); } + svec_destroy(&lines); return ds_cstr(&s); } @@ -475,9 +514,9 @@ vlog_get_levels(void) * would cause some log output, false if that module and level are completely * disabled. */ bool -vlog_is_enabled(enum vlog_module module, enum vlog_level level) +vlog_is_enabled(const struct vlog_module *module, enum vlog_level level) { - return min_vlog_levels[module] >= level; + return module->min_level >= level; } static const char * @@ -496,7 +535,7 @@ fetch_braces(const char *p, const char *def, char *out, size_t out_size) } static void -format_log_message(enum vlog_module module, enum vlog_level level, +format_log_message(const struct vlog_module *module, enum vlog_level level, enum vlog_facility facility, unsigned int msg_num, const char *message, va_list args_, struct ds *s) { @@ -591,17 +630,19 @@ format_log_message(enum vlog_module module, enum vlog_level level, * * Guaranteed to preserve errno. */ void -vlog_valist(enum vlog_module module, enum vlog_level level, +vlog_valist(const struct vlog_module *module, enum vlog_level level, const char *message, va_list args) { - bool log_to_console = levels[module][VLF_CONSOLE] >= level; - bool log_to_syslog = levels[module][VLF_SYSLOG] >= level; - bool log_to_file = levels[module][VLF_FILE] >= level && log_file; + bool log_to_console = module->levels[VLF_CONSOLE] >= level; + bool log_to_syslog = module->levels[VLF_SYSLOG] >= level; + bool log_to_file = module->levels[VLF_FILE] >= level && log_file; if (log_to_console || log_to_syslog || log_to_file) { int save_errno = errno; static unsigned int msg_num; struct ds s; + vlog_init(); + ds_init(&s); ds_reserve(&s, 1024); msg_num++; @@ -640,7 +681,8 @@ vlog_valist(enum vlog_module module, enum vlog_level level, } void -vlog(enum vlog_module module, enum vlog_level level, const char *message, ...) +vlog(const struct vlog_module *module, enum vlog_level level, + const char *message, ...) { va_list args; @@ -649,8 +691,32 @@ vlog(enum vlog_module module, enum vlog_level level, const char *message, ...) va_end(args); } +void +vlog_fatal_valist(const struct vlog_module *module_, + const char *message, va_list args) +{ + struct vlog_module *module = (struct vlog_module *) module_; + + /* Don't log this message to the console to avoid redundancy with the + * message written by the later ovs_fatal_valist(). */ + module->levels[VLF_CONSOLE] = VLL_OFF; + + vlog_valist(module, VLL_EMER, message, args); + ovs_fatal_valist(0, message, args); +} + +void +vlog_fatal(const struct vlog_module *module, const char *message, ...) +{ + va_list args; + + va_start(args, message); + vlog_fatal_valist(module, message, args); + va_end(args); +} + bool -vlog_should_drop(enum vlog_module module, enum vlog_level level, +vlog_should_drop(const struct vlog_module *module, enum vlog_level level, struct vlog_rate_limit *rl) { if (!vlog_is_enabled(module, level)) { @@ -673,6 +739,7 @@ vlog_should_drop(enum vlog_module module, enum vlog_level level, if (!rl->n_dropped) { rl->first_dropped = now; } + rl->last_dropped = now; rl->n_dropped++; return true; } @@ -680,17 +747,22 @@ vlog_should_drop(enum vlog_module module, enum vlog_level level, rl->tokens -= VLOG_MSG_TOKENS; if (rl->n_dropped) { + time_t now = time_now(); + unsigned int first_dropped_elapsed = now - rl->first_dropped; + unsigned int last_dropped_elapsed = now - rl->last_dropped; + vlog(module, level, - "Dropped %u log messages in last %u seconds " - "due to excessive rate", - rl->n_dropped, (unsigned int) (time_now() - rl->first_dropped)); + "Dropped %u log messages in last %u seconds (most recently, " + "%u seconds ago) due to excessive rate", + rl->n_dropped, first_dropped_elapsed, last_dropped_elapsed); + rl->n_dropped = 0; } return false; } void -vlog_rate_limit(enum vlog_module module, enum vlog_level level, +vlog_rate_limit(const struct vlog_module *module, enum vlog_level level, struct vlog_rate_limit *rl, const char *message, ...) { if (!vlog_should_drop(module, level, rl)) { @@ -703,12 +775,12 @@ vlog_rate_limit(enum vlog_module module, enum vlog_level level, } void -vlog_usage(void) +vlog_usage(void) { printf("\nLogging options:\n" " -v, --verbose=MODULE[:FACILITY[:LEVEL]] set logging levels\n" " -v, --verbose set maximum verbosity level\n" " --log-file[=FILE] enable logging to specified FILE\n" " (default: %s/%s.log)\n", - ovs_logdir, program_name); + ovs_logdir(), program_name); }