Add --enable-malloc-logging configure option and update log.c to match.

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

diff --git a/src/helper/log.c b/src/helper/log.c
index e5f6d3d6c58eae398462aff658d03c0fcd51407c..b6bb3479ab44bb70e90f76e03a9da4eafd482030 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -27,19 +27,26 @@
 #include "config.h"
 #endif
 
+#include "replacements.h"
+
 #include "log.h"
 #include "configuration.h"
 #include "time_support.h"
 #include "command.h"
+#include "server.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <stdarg.h>
 
-#define PRINT_MEM() 0
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#else
+#error "malloc.h is required to use --enable-malloc-logging"
+#endif
 #endif
 
 int debug_level = -1;
@@ -54,13 +61,14 @@ static long long start;
 
 static char *log_strings[5] =
 {
-       "User:   ",
-       "Error:  ",
-       "Warning:",
-       "Info:   ",
-       "Debug:  "
+       "User : ",
+       "Error: ",
+       "Warn : ",  /* want a space after each colon, all same width, colons aligned */
+       "Info : ",
+       "Debug: "
 };
 
+
 static int count = 0;
 
 /* The log_puts() serves to somewhat different goals:
@@ -94,23 +102,25 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
                {
                        /* print with count and time information */
                        int t=(int)(timeval_ms()-start);
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
                        struct mallinfo info;
                        info = mallinfo();
 #endif
-                       fprintf(log_output, "%s %d %d %s:%d %s()"
-#if PRINT_MEM()
+                       fprintf(log_output, "%s%d %d %s:%d %s()"
+#ifdef _DEBUG_FREE_SPACE_
                                        " %d"
 #endif
                                        ": %s", log_strings[level+1], count, t, file, line, function,
-#if PRINT_MEM()
+#ifdef _DEBUG_FREE_SPACE_
                                        info.fordblks,
 #endif
                                        string);
                }
-               else
+               else if(server_use_pipes == 0)
                {
-                       if (strcmp(string, "\n")!=0)
+                       /* if we are using gdb through pipes then we do not want any output
+                        * to the pipe otherwise we get repeated strings */
+                       if (strcmp(string, "\n") != 0)
                        {
                                /* print human readable output - but skip empty lines */
                                fprintf(log_output, "%s%s",
@@ -203,6 +213,18 @@ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha
        if (debug_level > 3)
                debug_level = 3;
 
+       if (debug_level >= LOG_LVL_DEBUG && server_use_pipes == 1)
+       {
+               /* if we are enabling debug info then we need to write to a log file
+                * otherwise the pipe will get full and cause issues with gdb */
+               FILE* file = fopen("openocd.log", "w");
+               if (file)
+               {
+                       log_output = file;
+                       LOG_WARNING("enabling log output as we are using pipes");
+               }
+       }
+
        return ERROR_OK;
 }
 
@@ -370,7 +392,7 @@ void keep_alive()
        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);
+               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);
        }
        if (current_time-last_time>500)
        {
@@ -400,15 +422,25 @@ void kept_alive()
 void alive_sleep(int ms)
 {
        int i;
-       for (i=0; i<ms; i+=500)
+       int napTime=10;
+       for (i=0; i<ms; i+=napTime)
        {
                int sleep_a_bit=ms-i;
-               if (sleep_a_bit>500)
+               if (sleep_a_bit>napTime)
                {
-                       sleep_a_bit=500;
+                       sleep_a_bit=napTime;
                }
-               keep_alive();
                usleep(sleep_a_bit*1000);
                keep_alive();
        }
 }
+
+void busy_sleep(int ms)
+{
+       long long then;
+       then=timeval_ms();
+       while ((timeval_ms()-then)<ms)
+       {
+               /* busy wait */
+       }
+}