* 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 *
static int count = 0;
+
+static struct store_log_forward * log_head = NULL;
+static int log_forward_count = 0;
+
+struct store_log_forward
+{
+ struct store_log_forward * next;
+ const char * file;
+ int line;
+ const char * function;
+ const char * string;
+};
+
+/* either forward the log to the listeners or store it for possible forwarding later */
+static void log_forward(const char *file, int line, const char *function, const char *string)
+{
+ if (log_forward_count==0)
+ {
+ 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;
+ }
+ } 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;
+ }
+ }
+}
+
+void log_try(void)
+{
+ log_forward_count++;
+}
+
+void log_catch(void)
+{
+ assert(log_forward_count>0);
+ log_forward_count--;
+}
+
+void log_rethrow(void)
+{
+ log_catch();
+ if (log_forward_count==0)
+ {
+ struct store_log_forward *log;
+
+ log = log_head;
+ while (log != NULL)
+ {
+ log_forward(log->file, log->line, log->function, log->string);
+
+ struct store_log_forward *t=log;
+ log = log->next;
+
+ free((void *)t->file);
+ free((void *)t->function);
+ free((void *)t->string);
+ free(t);
+
+ }
+
+ log_head = NULL;
+ }
+}
+
+
/* The log_puts() serves to somewhat different goals:
*
* - logging
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);
+ int t = (int)(timeval_ms()-start);
#ifdef _DEBUG_FREE_SPACE_
struct mallinfo info;
info = mallinfo();
#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
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 */
{
/* 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
/* 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, ...)
{
char *string;
* 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 == 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;
+ COMMAND_PARSE_NUMBER(uint, args[0], new_level);
+ 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)
{
}
}
+ 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)
{
log_output = stderr;
}
- start=last_time=timeval_ms();
+ start = last_time = timeval_ms();
return ERROR_OK;
}
*/
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("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);
+ 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", "");
* 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; i<ms; i+=napTime)
+ int napTime = 10;
+ for (i = 0; i < ms; i += napTime)
{
- int sleep_a_bit=ms-i;
- if (sleep_a_bit>napTime)
+ 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();
void busy_sleep(int ms)
{
long long then;
- then=timeval_ms();
- while ((timeval_ms()-then)<ms)
+ then = timeval_ms();
+ while ((timeval_ms()-then) < ms)
{
/* busy wait */
}
projects / fw / openocd / blobdiff