small line ending cleanup.

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

diff --git a/src/helper/log.c b/src/helper/log.c
index fe475130e815d33dc070bad87772fd44b511674f..2a77a2704e339d4606200de553eefe97284b371b 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -33,56 +33,93 @@
 int debug_level = -1;
 
 static FILE* log_output;
+static log_callback_t *log_callbacks = NULL;
 
-static void *privData;
-static logCallback callback;
+static time_t start;
 
-void log_setCallback(logCallback c, void *p)
+static char *log_strings[5] =
 {
-       callback = c;
-       privData = p;
-}
-
-static char *log_strings[5] = 
-{
-       "User:  ",
+       "User:   ",
        "Error:  ",
        "Warning:",
        "Info:   ",
        "Debug:  "
 };
 
-void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+static int count = 0;
+
+static void log_printfv(enum log_levels level, const char *file, int line, const char *function, const char *format, va_list args)
 {
-       static int count = 0;
-       count++;
-       va_list args;
        char buffer[512];
+       log_callback_t *cb;
 
-       if (level > debug_level)
-               return;
-
-       va_start(args, format);
        vsnprintf(buffer, 512, format, args);
 
+       if (level == LOG_OUTPUT)
+       {
+               /* do not prepend any headers, just print out what we were given and return */
+               fputs(buffer, log_output);
+               fflush(log_output);
+               return;
+       }
+
        char *f = strrchr(file, '/');
        if (f != NULL)
                file = f + 1;
 
-       fprintf(log_output, "%s %d %ld %s:%d %s(): %s\n", log_strings[level+1], count, time(NULL), file, line, function, buffer);
+       if (debug_level >= LOG_DEBUG)
+       {
+               /* print with count and time information */
+               int t=(int)(time(NULL)-start);
+               fprintf(log_output, "%s %d %d %s:%d %s(): %s", log_strings[level+1], count, t, file, line, function, buffer);
+       }
+       else
+       {
+               /* do not print count and time */
+               fprintf(log_output, "%s %s:%d %s(): %s", log_strings[level+1], file, line, function, buffer);
+       }
+
        fflush(log_output);
        
-       va_end(args);
-
        /* Never forward LOG_DEBUG, too verbose and they can be found in the log if need be */
-       if (callback && (level <= LOG_INFO))
+       if (level <= LOG_INFO)
        {
-               va_start(args, format);
-               callback(privData, file, line, function, format, args);
-               va_end(args);
+               for (cb = log_callbacks; cb; cb = cb->next)
+               {
+                       cb->fn(cb->priv, file, line, function, format, args);
+               }
        }
 }
 
+void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+{
+       count++;
+       if (level > debug_level)
+               return;
+
+       va_list args;
+       va_start(args, format);
+       log_printfv(level, file, line, function, format, args);
+       va_end(args);
+       
+}
+
+void log_printfnl(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+{
+       count++;
+       if (level > debug_level)
+               return;
+       
+       char *t=malloc(strlen(format)+2);
+       strcpy(t, format);
+       strcat(t, "\n");
+       
+       va_list args;
+       va_start(args, format);
+       log_printfv(level, file, line, function, t, args);
+       va_end(args);
+}
+
 /* change the current debug level on the fly
  * 0: only ERRORS
  * 1: + WARNINGS
@@ -123,6 +160,7 @@ int handle_log_output_command(struct command_context_s *cmd_ctx, char *cmd, char
 
 int log_register_commands(struct command_context_s *cmd_ctx)
 {
+       start = time(NULL);
        register_command(cmd_ctx, NULL, "log_output", handle_log_output_command,
                COMMAND_ANY, "redirect logging to <file> (default: stderr)");
        register_command(cmd_ctx, NULL, "debug_level", handle_debug_level_command,
@@ -151,8 +189,51 @@ int set_log_output(struct command_context_s *cmd_ctx, FILE *output)
        return ERROR_OK;
 }
 
+/* add/remove log callback handler */
+int log_add_callback(log_callback_fn fn, void *priv)
+{
+       log_callback_t *cb;
+
+       /* prevent the same callback to be registered more than once, just for sure */
+       for (cb = log_callbacks; cb; cb = cb->next)
+       {
+               if (cb->fn == fn && cb->priv == priv)
+                       return ERROR_INVALID_ARGUMENTS;
+       }
+
+       /* 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)
+               return ERROR_BUF_TOO_SMALL;
+
+       /* add item to the beginning of the linked list */
+       cb->fn = fn;
+       cb->priv = priv;
+       cb->next = log_callbacks;
+       log_callbacks = cb;
+
+       return ERROR_OK;
+}
+
+int log_remove_callback(log_callback_fn fn, void *priv)
+{
+       log_callback_t *cb, **p;
+
+       for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
+       {
+           if (cb->fn == fn && cb->priv == priv)
+           {
+               *p = cb->next;
+                       free(cb);
+                       return ERROR_OK;
+               }
+       }
+
+       /* no such item */
+       return ERROR_INVALID_ARGUMENTS;
+}
+
 /* return allocated string w/printf() result */
-char *allocPrintf(const char *fmt, va_list ap)
+char *alloc_printf(const char *fmt, va_list ap)
 {
        char *string = NULL;