use COMMAND_HANDLER macro to define all commands

[openocd.git] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index 68b29a203b5cda1f27f2e4d9287551db332731b0..ccc0c01bdb655d4808cd30b274d388cd7853dc7b 100644 (file)
--- 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                                  *
@@ -64,6 +64,95 @@ static char *log_strings[5] =
 
 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
@@ -103,7 +192,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 +206,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
@@ -131,18 +220,11 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
        /* 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;
@@ -192,14 +274,12 @@ void log_printf_lf(enum log_levels level, const char *file, int line, const char
  * 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;
+               COMMAND_PARSE_NUMBER(uint, args[0], new_level);
                debug_level = MIN(new_level, LOG_LVL_DEBUG);
        }
        else if (argc > 1)
@@ -222,7 +302,7 @@ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha
        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)
        {
@@ -384,7 +464,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;
 
@@ -400,7 +480,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", "");
@@ -429,10 +509,10 @@ void alive_sleep(int ms)
 {
        int i;
        int napTime = 10;
-       for (i = 0; i<ms; i += napTime)
+       for (i = 0; i < ms; i += napTime)
        {
                int sleep_a_bit = ms-i;
-               if (sleep_a_bit>napTime)
+               if (sleep_a_bit > napTime)
                {
                        sleep_a_bit = napTime;
                }
@@ -445,7 +525,7 @@ void busy_sleep(int ms)
 {
        long long then;
        then = timeval_ms();
-       while ((timeval_ms()-then)<ms)
+       while ((timeval_ms()-then) < ms)
        {
                /* busy wait */
        }