X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Flog.c;h=9bfe4d11c56f81c7c0fb9cc9bbf6c4aa59cb9cbb;hp=0e04af6f6bb88b7151e75b96dcdadb88344521e1;hb=8b994145b849c40b0a195c3fb332b9770b2f9097;hpb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020 diff --git a/src/helper/log.c b/src/helper/log.c index 0e04af6f6b..9bfe4d11c5 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,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -94,7 +94,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch if (debug_level >= LOG_LVL_DEBUG) { /* print with count and time information */ - int t=(int)(timeval_ms()-start); + int t = (int)(timeval_ms()-start); #ifdef _DEBUG_FREE_SPACE_ struct mallinfo info; info = mallinfo(); @@ -103,7 +103,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch #ifdef _DEBUG_FREE_SPACE_ " %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, #endif @@ -117,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 @@ -136,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; } } } @@ -259,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; } @@ -383,8 +383,8 @@ 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) { extern int gdb_actual_connections; @@ -400,7 +400,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", ""); @@ -413,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(); @@ -444,8 +444,8 @@ void alive_sleep(int ms) void busy_sleep(int ms) { long long then; - then=timeval_ms(); - while ((timeval_ms()-then)