X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2Flog.c;h=3ee04e05b1fe097e463250503a6cc075f2792aeb;hb=9c05c92c1437dc243b52d9281ab77e8ac223816f;hp=8eea1ac0a8e1f540eb5deba02f95b60aa02e3f79;hpb=c13924e32cf58e51aa6b86f785c7961daf3da01e;p=openocd diff --git a/src/helper/log.c b/src/helper/log.c index 8eea1ac0..3ee04e05 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -27,23 +27,19 @@ #include "config.h" #endif -#include "replacements.h" - #include "log.h" -#include "configuration.h" #include "time_support.h" -#include "command.h" +// @todo the inclusion of server.h here is a layering violation #include "server.h" -#include -#include -#include -#include #include -#define PRINT_MEM() 0 -#if PRINT_MEM() +#ifdef _DEBUG_FREE_SPACE_ +#ifdef HAVE_MALLOC_H #include +#else +#error "malloc.h is required to use --enable-malloc-logging" +#endif #endif int debug_level = -1; @@ -93,27 +89,27 @@ 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 (strchr(string, '\n') != NULL) { if (debug_level >= LOG_LVL_DEBUG) { /* print with count and time information */ - int t=(int)(timeval_ms()-start); -#if PRINT_MEM() + int t = (int)(timeval_ms()-start); +#ifdef _DEBUG_FREE_SPACE_ struct mallinfo info; info = mallinfo(); #endif fprintf(log_output, "%s%d %d %s:%d %s()" -#if PRINT_MEM() +#ifdef _DEBUG_FREE_SPACE_ " %d" #endif - ": %s", log_strings[level+1], count, t, file, line, function, -#if PRINT_MEM() + ": %s", log_strings[level + 1], count, t, file, line, function, +#ifdef _DEBUG_FREE_SPACE_ info.fordblks, #endif string); } - else if(server_use_pipes == 0) + else if (server_use_pipes == 0) { /* if we are using gdb through pipes then we do not want any output * to the pipe otherwise we get repeated strings */ @@ -121,7 +117,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch { /* print human readable output - but skip empty lines */ fprintf(log_output, "%s%s", - (level > LOG_LVL_USER)?log_strings[level+1]:"", string); + (level > LOG_LVL_USER)?log_strings[level + 1]:"", string); } } } else @@ -140,9 +136,9 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch /* DANGER!!!! the log callback can remove itself!!!! */ while (cb) { - next=cb->next; + next = cb->next; cb->fn(cb->priv, file, line, function, string); - cb=next; + cb = next; } } } @@ -198,17 +194,16 @@ void log_printf_lf(enum log_levels level, const char *file, int line, const char */ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - if (argc == 0) - command_print(cmd_ctx, "debug_level: %i", debug_level); - - if (argc > 0) - debug_level = strtoul(args[0], NULL, 0); - - if (debug_level < 0) - debug_level = 0; - - if (debug_level > 3) - debug_level = 3; + 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) { @@ -222,6 +217,8 @@ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha } } + command_print(cmd_ctx, "debug_level: %i", debug_level); + return ERROR_OK; } @@ -262,7 +259,7 @@ int log_init(struct command_context_s *cmd_ctx) log_output = stderr; } - start=last_time=timeval_ms(); + start = last_time = timeval_ms(); return ERROR_OK; } @@ -386,12 +383,24 @@ char *alloc_printf(const char *format, ...) */ void keep_alive() { - current_time=timeval_ms(); - if (current_time-last_time>1000) + current_time = timeval_ms(); + if (current_time-last_time > 1000) { - LOG_WARNING("BUG: keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%lld)", current_time-last_time); + extern int gdb_actual_connections; + + if (gdb_actual_connections) + LOG_WARNING("keep_alive() was not invoked in the " + "1000ms timelimit. GDB alive packet not " + "sent! (%lld). Workaround: increase " + "\"set remotetimeout\" in GDB", + current_time-last_time); + else + LOG_DEBUG("keep_alive() was not invoked in the " + "1000ms timelimit (%lld). This may cause " + "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", ""); @@ -404,28 +413,28 @@ void keep_alive() * These functions should be invoked at a well defined spot in server.c */ - last_time=current_time; + last_time = current_time; } } /* reset keep alive timer without sending message */ void kept_alive() { - current_time=timeval_ms(); - last_time=current_time; + current_time = timeval_ms(); + last_time = current_time; } /* if we sleep for extended periods of time, we must invoke keep_alive() intermittantly */ void alive_sleep(int ms) { int i; - int napTime=10; - for (i=0; inapTime) + int sleep_a_bit = ms-i; + if (sleep_a_bit > napTime) { - sleep_a_bit=napTime; + sleep_a_bit = napTime; } usleep(sleep_a_bit*1000); keep_alive(); @@ -435,8 +444,8 @@ void alive_sleep(int ms) void busy_sleep(int ms) { long long then; - then=timeval_ms(); - while ((timeval_ms()-then)