command: capture command now handles both types commands

[fw/openocd] / src / helper / log.h

diff --git a/src/helper/log.h b/src/helper/log.h
index aabd1be250c2a40efa29819ec2e317f814c6b406..2852140b0d3f47c06e3698f53d6e87896488b82a 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -26,7 +26,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include "command.h"
+#include <helper/command.h>
 
 /* To achieve C99 printf compatibility in MinGW, gnu_printf should be
  * used for __attribute__((format( ... ))), with GCC v4.4 or later
@@ -59,41 +59,35 @@ enum log_levels
        LOG_LVL_DEBUG = 3
 };
 
-void log_printf(enum log_levels level, const char *file, int line,
+void log_printf(enum log_levels level, const char *file, unsigned line,
        const char *function, const char *format, ...)
 __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
-void log_printf_lf(enum log_levels level, const char *file, int line,
+void log_printf_lf(enum log_levels level, const char *file, unsigned line,
        const char *function, const char *format, ...)
 __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 
-int log_init(struct command_context_s *cmd_ctx);
-int set_log_output(struct command_context_s *cmd_ctx, FILE *output);
+/**
+ * Initialize logging module.  Call during program startup.
+ */
+void log_init(void);
+int set_log_output(struct command_context *cmd_ctx, FILE *output);
 
-int log_register_commands(struct command_context_s *cmd_ctx);
+int log_register_commands(struct command_context *cmd_ctx);
 
 void keep_alive(void);
 void kept_alive(void);
 
-void alive_sleep(int ms);
-void busy_sleep(int ms);
-
-/* log entries can be paused and replayed roughly according to the try/catch/rethrow
- * concepts in C++
- */
-void log_try(void);
-void log_catch(void);
-void log_rethrow(void);
-
+void alive_sleep(uint64_t ms);
+void busy_sleep(uint64_t ms);
 
 typedef void (*log_callback_fn)(void *priv, const char *file, unsigned line,
                const char *function, const char *string);
 
-typedef struct log_callback_s
-{
+struct log_callback {
        log_callback_fn fn;
        void *priv;
-       struct log_callback_s *next;
-} log_callback_t;
+       struct log_callback *next;
+};
 
 int log_add_callback(log_callback_fn fn, void *priv);
 int log_remove_callback(log_callback_fn fn, void *priv);
@@ -109,7 +103,12 @@ extern int debug_level;
 #define LOG_LEVEL_IS(FOO)  ((debug_level) >= (FOO))
 
 #define LOG_DEBUG(expr ...) \
-               ((debug_level >= LOG_LVL_DEBUG) ? log_printf_lf (LOG_LVL_DEBUG, __FILE__, __LINE__, __FUNCTION__, expr) , 0 : 0)
+               do { \
+                       if (debug_level >= LOG_LVL_DEBUG) \
+                               log_printf_lf(LOG_LVL_DEBUG, \
+                                       __FILE__, __LINE__, __func__, \
+                                       expr); \
+               } while (0)
 
 #define LOG_INFO(expr ...) \
                log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr)