X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Flog.c;h=c15b95da16bfe9cccaada31bd6433da5c1e87dcb;hp=3ee04e05b1fe097e463250503a6cc075f2792aeb;hb=48a681c741993e61f2a9404b75b73d011b9e184e;hpb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa diff --git a/src/helper/log.c b/src/helper/log.c index 3ee04e05b1..c15b95da16 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007-2010 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -21,16 +21,16 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "log.h" #include "time_support.h" -// @todo the inclusion of server.h here is a layering violation -#include "server.h" +/* @todo the inclusion of server.h here is a layering violation */ +#include #include @@ -44,25 +44,66 @@ int debug_level = -1; -static FILE* log_output; -static log_callback_t *log_callbacks = NULL; +static FILE *log_output; +static struct log_callback *log_callbacks; static long long last_time; static long long current_time; static long long start; -static char *log_strings[5] = -{ +static const char * const log_strings[5] = { "User : ", "Error: ", - "Warn : ", /* want a space after each colon, all same width, colons aligned */ + "Warn : ", /* want a space after each colon, all same width, colons aligned */ "Info : ", "Debug: " }; +static int count; + +static struct store_log_forward *log_head; +static int log_forward_count; + +struct store_log_forward { + struct store_log_forward *next; + const char *file; + int line; + const char *function; + const char *string; +}; -static int count = 0; +/* either forward the log to the listeners or store it for possible forwarding later */ +static void log_forward(const char *file, unsigned line, const char *function, const char *string) +{ + if (log_forward_count == 0) { + struct log_callback *cb, *next; + cb = log_callbacks; + /* DANGER!!!! the log callback can remove itself!!!! */ + while (cb) { + next = cb->next; + cb->fn(cb->priv, file, line, function, string); + cb = next; + } + } else { + struct store_log_forward *log = malloc(sizeof(struct store_log_forward)); + log->file = strdup(file); + log->line = line; + log->function = strdup(function); + log->string = strdup(string); + log->next = NULL; + if (log_head == NULL) + log_head = log; + else { + /* append to tail */ + struct store_log_forward *t; + t = log_head; + while (t->next != NULL) + t = t->next; + t->next = log; + } + } +} /* The log_puts() serves to somewhat different goals: * @@ -74,11 +115,14 @@ static int count = 0; * target_request.c). * */ -static void log_puts(enum log_levels level, const char *file, int line, const char *function, const char *string) +static void log_puts(enum log_levels level, + const char *file, + int line, + const char *function, + const char *string) { char *f; - if (level == LOG_LVL_OUTPUT) - { + if (level == LOG_LVL_OUTPUT) { /* do not prepend any headers, just print out what we were given and return */ fputs(string, log_output); fflush(log_output); @@ -89,10 +133,8 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch if (f != NULL) file = f + 1; - if (strchr(string, '\n') != NULL) - { - if (debug_level >= LOG_LVL_DEBUG) - { + if (strlen(string) > 0) { + if (debug_level >= LOG_LVL_DEBUG) { /* print with count and time information */ int t = (int)(timeval_ms()-start); #ifdef _DEBUG_FREE_SPACE_ @@ -101,49 +143,37 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch #endif fprintf(log_output, "%s%d %d %s:%d %s()" #ifdef _DEBUG_FREE_SPACE_ - " %d" + " %d" #endif - ": %s", log_strings[level + 1], count, t, file, line, function, + ": %s", log_strings[level + 1], count, t, file, line, function, #ifdef _DEBUG_FREE_SPACE_ - info.fordblks, + info.fordblks, #endif - string); - } - else if (server_use_pipes == 0) - { + string); + } else { /* if we are using gdb through pipes then we do not want any output * to the pipe otherwise we get repeated strings */ - if (strcmp(string, "\n") != 0) - { - /* print human readable output - but skip empty lines */ - fprintf(log_output, "%s%s", - (level > LOG_LVL_USER)?log_strings[level + 1]:"", string); - } + fprintf(log_output, "%s%s", + (level > LOG_LVL_USER) ? log_strings[level + 1] : "", string); } - } else - { - /* only entire lines are logged. Otherwise it's - * single chars intended for the log callbacks. */ + } else { + /* Empty strings are sent to log callbacks to keep e.g. gdbserver alive, here we do + *nothing. */ } fflush(log_output); /* Never forward LOG_LVL_DEBUG, too verbose and they can be found in the log if need be */ if (level <= LOG_LVL_INFO) - { - log_callback_t *cb, *next; - cb = log_callbacks; - /* DANGER!!!! the log callback can remove itself!!!! */ - while (cb) - { - next = cb->next; - cb->fn(cb->priv, file, line, function, string); - cb = next; - } - } + log_forward(file, line, function, string); } -void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) +void log_printf(enum log_levels level, + const char *file, + unsigned line, + const char *function, + const char *format, + ...) { char *string; va_list ap; @@ -155,8 +185,7 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f va_start(ap, format); string = alloc_vprintf(format, ap); - if (string != NULL) - { + if (string != NULL) { log_puts(level, file, line, function, string); free(string); } @@ -164,7 +193,12 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f va_end(ap); } -void log_printf_lf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...) +void log_printf_lf(enum log_levels level, + const char *file, + unsigned line, + const char *function, + const char *format, + ...) { char *string; va_list ap; @@ -176,9 +210,9 @@ void log_printf_lf(enum log_levels level, const char *file, int line, const char va_start(ap, format); string = alloc_vprintf(format, ap); - if (string != NULL) - { - strcat(string, "\n"); /* alloc_vprintf guaranteed the buffer to be at least one char longer */ + if (string != NULL) { + strcat(string, "\n"); /* alloc_vprintf guaranteed the buffer to be at least one + *char longer */ log_puts(level, file, line, function, string); free(string); } @@ -186,85 +220,85 @@ void log_printf_lf(enum log_levels level, const char *file, int line, const char va_end(ap); } -/* change the current debug level on the fly - * 0: only ERRORS - * 1: + WARNINGS - * 2: + INFORMATIONAL MSGS - * 3: + DEBUG MSGS - */ -int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_debug_level_command) { - if (argc == 1) - { - unsigned new_level; - int retval = parse_uint(args[0], &new_level); - if (ERROR_OK != retval) - return retval; - debug_level = MIN(new_level, LOG_LVL_DEBUG); - } - else if (argc > 1) - return ERROR_COMMAND_SYNTAX_ERROR; - - if (debug_level >= LOG_LVL_DEBUG && server_use_pipes == 1) - { - /* if we are enabling debug info then we need to write to a log file - * otherwise the pipe will get full and cause issues with gdb */ - FILE* file = fopen("openocd.log", "w"); - if (file) - { - log_output = file; - LOG_WARNING("enabling log output as we are using pipes"); + if (CMD_ARGC == 1) { + int new_level; + COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], new_level); + if ((new_level > LOG_LVL_DEBUG) || (new_level < LOG_LVL_SILENT)) { + LOG_ERROR("level must be between %d and %d", LOG_LVL_SILENT, LOG_LVL_DEBUG); + return ERROR_COMMAND_SYNTAX_ERROR; } - } + debug_level = new_level; + } else if (CMD_ARGC > 1) + return ERROR_COMMAND_SYNTAX_ERROR; - command_print(cmd_ctx, "debug_level: %i", debug_level); + command_print(CMD_CTX, "debug_level: %i", debug_level); return ERROR_OK; } -int handle_log_output_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_log_output_command) { - if (argc == 1) - { - FILE* file = fopen(args[0], "w"); + if (CMD_ARGC == 1) { + FILE *file = fopen(CMD_ARGV[0], "w"); if (file) - { log_output = file; - } } return ERROR_OK; } -int log_register_commands(struct command_context_s *cmd_ctx) -{ - start = timeval_ms(); - register_command(cmd_ctx, NULL, "log_output", handle_log_output_command, - COMMAND_ANY, "redirect logging to (default: stderr)"); - register_command(cmd_ctx, NULL, "debug_level", handle_debug_level_command, - COMMAND_ANY, "adjust debug level <0-3>"); +static struct command_registration log_command_handlers[] = { + { + .name = "log_output", + .handler = handle_log_output_command, + .mode = COMMAND_ANY, + .help = "redirect logging to a file (default: stderr)", + .usage = "file_name", + }, + { + .name = "debug_level", + .handler = handle_debug_level_command, + .mode = COMMAND_ANY, + .help = "Sets the verbosity level of debugging output. " + "0 shows errors only; 1 adds warnings; " + "2 (default) adds other info; 3 adds debugging.", + .usage = "number", + }, + COMMAND_REGISTRATION_DONE +}; - return ERROR_OK; +int log_register_commands(struct command_context *cmd_ctx) +{ + return register_commands(cmd_ctx, NULL, log_command_handlers); } -int log_init(struct command_context_s *cmd_ctx) +void log_init(void) { - /* set defaults for daemon configuration, if not set by cmdline or cfgfile */ + /* set defaults for daemon configuration, + * if not set by cmdline or cfgfile */ if (debug_level == -1) debug_level = LOG_LVL_INFO; + char *debug_env = getenv("OPENOCD_DEBUG_LEVEL"); + if (NULL != debug_env) { + int value; + int retval = parse_int(debug_env, &value); + if (ERROR_OK == retval && + debug_level >= LOG_LVL_SILENT && + debug_level <= LOG_LVL_DEBUG) + debug_level = value; + } + if (log_output == NULL) - { log_output = stderr; - } start = last_time = timeval_ms(); - - return ERROR_OK; } -int set_log_output(struct command_context_s *cmd_ctx, FILE *output) +int set_log_output(struct command_context *cmd_ctx, FILE *output) { log_output = output; return ERROR_OK; @@ -273,17 +307,18 @@ int set_log_output(struct command_context_s *cmd_ctx, FILE *output) /* add/remove log callback handler */ int log_add_callback(log_callback_fn fn, void *priv) { - log_callback_t *cb; + struct log_callback *cb; /* prevent the same callback to be registered more than once, just for sure */ - for (cb = log_callbacks; cb; cb = cb->next) - { + for (cb = log_callbacks; cb; cb = cb->next) { if (cb->fn == fn && cb->priv == priv) - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } - /* alloc memory, it is safe just to return in case of an error, no need for the caller to check this */ - if ((cb = malloc(sizeof(log_callback_t))) == NULL) + /* alloc memory, it is safe just to return in case of an error, no need for the caller to + *check this */ + cb = malloc(sizeof(struct log_callback)); + if (cb == NULL) return ERROR_BUF_TOO_SMALL; /* add item to the beginning of the linked list */ @@ -297,12 +332,10 @@ int log_add_callback(log_callback_fn fn, void *priv) int log_remove_callback(log_callback_fn fn, void *priv) { - log_callback_t *cb, **p; + struct log_callback *cb, **p; - for (p = &log_callbacks; (cb = *p); p = &(*p)->next) - { - if (cb->fn == fn && cb->priv == priv) - { + for (p = &log_callbacks; (cb = *p); p = &(*p)->next) { + if (cb->fn == fn && cb->priv == priv) { *p = cb->next; free(cb); return ERROR_OK; @@ -310,43 +343,32 @@ int log_remove_callback(log_callback_fn fn, void *priv) } /* no such item */ - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } /* return allocated string w/printf() result */ char *alloc_vprintf(const char *fmt, va_list ap) { - /* no buffer at the beginning, force realloc to do the job */ - char *string = NULL; - - /* start with buffer size suitable for typical messages */ - int size = 128; + va_list ap_copy; + int len; + char *string; - for (;;) - { - char *t = string; - va_list ap_copy; - int ret; - string = realloc(string, size); - if (string == NULL) - { - if (t != NULL) - free(t); - return NULL; - } + /* determine the length of the buffer needed */ + va_copy(ap_copy, ap); + len = vsnprintf(NULL, 0, fmt, ap_copy); + va_end(ap_copy); - va_copy(ap_copy, ap); + /* allocate and make room for terminating zero. */ + /* FIXME: The old version always allocated at least one byte extra and + * other code depend on that. They should be probably be fixed, but for + * now reserve the extra byte. */ + string = malloc(len + 2); + if (string == NULL) + return NULL; - ret = vsnprintf(string, size, fmt, ap_copy); - /* NB! The result of the vsnprintf() might be an *EMPTY* string! */ - if ((ret >= 0) && ((ret + 1) < size)) - break; + /* do the real work */ + vsnprintf(string, len + 1, fmt, ap); - /* there was just enough or not enough space, allocate more in the next round */ - size *= 2; /* double the buffer size */ - } - - /* the returned buffer is by principle guaranteed to be at least one character longer */ return string; } @@ -384,8 +406,7 @@ char *alloc_printf(const char *format, ...) void keep_alive() { current_time = timeval_ms(); - if (current_time-last_time > 1000) - { + if (current_time-last_time > 1000) { extern int gdb_actual_connections; if (gdb_actual_connections) @@ -400,8 +421,7 @@ void keep_alive() "trouble with GDB connections.", current_time-last_time); } - if (current_time-last_time > 500) - { + if (current_time-last_time > 500) { /* this will keep the GDB connection alive */ LOG_USER_N("%s", ""); @@ -425,28 +445,25 @@ void kept_alive() } /* if we sleep for extended periods of time, we must invoke keep_alive() intermittantly */ -void alive_sleep(int ms) +void alive_sleep(uint64_t ms) { - int i; - int napTime = 10; - for (i = 0; i < ms; i += napTime) - { - int sleep_a_bit = ms-i; + uint64_t napTime = 10; + for (uint64_t i = 0; i < ms; i += napTime) { + uint64_t sleep_a_bit = ms - i; if (sleep_a_bit > napTime) - { sleep_a_bit = napTime; - } - usleep(sleep_a_bit*1000); + + usleep(sleep_a_bit * 1000); keep_alive(); } } -void busy_sleep(int ms) +void busy_sleep(uint64_t ms) { - long long then; - then = timeval_ms(); - while ((timeval_ms()-then) < ms) - { - /* busy wait */ + uint64_t then = timeval_ms(); + while (timeval_ms() - then < ms) { + /* + * busy wait + */ } }