debug.[ch]: remove dependancies from bits.h

c/debug.c

@@ -19,27 +19,57 @@
 #define DEBUG_DEBUG
 #endif
 
-#include "bits.h"
 #include "debug.h"
 
-#define NANOSEC  1000000000                       /* nano sec in sec */
-#define MILLISEC 1000000                          /* milli sec in sec */
-
 static long long timer_start;                     /* in nanosecond */
-static u32 debug_level=0;
+static int level = 0;                             /* output log when < level */
+static int flush = false;                         /* force flush after logs */
+static FILE *stream = NULL;                       /* stream to use */
 
-void debug_level_set(u32 level)
+/**
+ * debug_level_set() - set debug level.
+ * @_level: debug level (integer).
+ */
+void debug_level_set(int _level)
 {
-    debug_level = level;
+    level = _level;
-
+#   ifdef DEBUG_DEBUG_C
-    log(1, "debug level set to %u\n", level);
+    log(0, "debug level set to %u\n", level);
+#   endif
 }
 
-void debug_init(u32 level)
+/**
+ * debug_level_get() - get debug level.
+ * @return: current level debug (integer).
+ */
+int debug_level_get(void)
+{
+    return level;
+}
+
+void debug_stream_set(FILE *_stream)
+{
+    stream = _stream;
+#   ifdef DEBUG_DEBUG_C
+    log(0, "stream set to %d\n", stream? fileno(stream): -1);
+#   endif
+}
+
+void debug_flush_set(bool _flush)
+{
+    flush = _flush;
+#   ifdef DEBUG_DEBUG_C
+    log(0, "debug flush %s.\n", flush? "set": "unset");
+#   endif
+}
+
+void debug_init(int _level, FILE *_stream, bool _flush)
 {
     struct timespec timer;
 
-    debug_level_set(level);
+    debug_stream_set(_stream);
+    debug_level_set(_level);
+    debug_flush_set(_flush);
     if (!clock_gettime(CLOCK_MONOTONIC, &timer)) {
         timer_start = timer.tv_sec * NANOSEC + timer.tv_nsec;
     }
@@ -49,7 +79,7 @@ void debug_init(u32 level)
     log(0, "timer started.\n");
 }
 
-inline static long long timer_elapsed()
+long long debug_timer_elapsed(void)
 {
     struct timespec timer;
 
@@ -57,38 +87,42 @@ inline static long long timer_elapsed()
     return (timer.tv_sec * NANOSEC + timer.tv_nsec) - timer_start;
 }
 
-/* void debug - log function
+/**
- * @timestamp : boolean
+ * debug() - log function
- * @indent    : indent level (2 spaces each)
+ * @lev: log level
- * @src       : source file/func name (or NULL)
+ * @timestamp: boolean, print timestamp if true
- * @line      : line number
+ * @indent: indent level (2 spaces each)
+ * @src: source file/func name (or NULL)
+ * @line: line number
  */
-void debug(u32 level, bool timestamp, u32 indent, const char *src,
+void debug(int lev, bool timestamp, int indent, const char *src,
-           u32 line, const char *fmt, ...)
+           int line, const char *fmt, ...)
 {
-    if (level > debug_level)
+    if (!stream || lev > level)
         return;
 
     va_list ap;
 
     if (indent)
-        printf("%*s", 2*(indent-1), "");
+        fprintf(stream, "%*s", 2*(indent-1), "");
 
     if (timestamp) {
-        long long diff = timer_elapsed();
+        long long diff = debug_timer_elapsed();
-        printf("%lld.%03lld ", diff/NANOSEC, (diff/1000000)%1000);
+        fprintf(stream, "%lld.%03lld ", diff/NANOSEC, (diff/1000000)%1000);
-        printf("%010lld ", diff);
+        fprintf(stream, "%010lld ", diff);
     }
 
     if (src) {
         if (line)
-            printf("[%s:%u] ", src, line);
+            fprintf(stream, "[%s:%u] ", src, line);
         else
-            printf("[%s] ", src);
+            fprintf(stream, "[%s] ", src);
     }
     va_start(ap, fmt);
-    vprintf(fmt, ap);
+    vfprintf(stream, fmt, ap);
     va_end(ap);
+    if (flush)
+        fflush(stream);
 }
 
 #ifdef BIN_debug

c/include/debug.h

@@ -14,29 +14,45 @@
 #ifndef DEBUG_H
 #define DEBUG_H
 
+#include <stdio.h>
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <bits.h>
+#include <br.h>
+
+#define NANOSEC  1000000000                       /* nano sec in sec */
+#define MILLISEC 1000000                          /* milli sec in sec */
 
-#define _unused __attribute__((__unused__))
 #define _printf __attribute__ ((format (printf, 6, 7)))
 
 #ifdef DEBUG_DEBUG
-void debug_init(u32 level);
+
-void debug_level_set(u32 level);
+void debug_init(int level, FILE *stream, bool flush);
-u32  debug_level_get(void);
+void debug_level_set(int level);
-void _printf debug(u32 level, bool timestamp,
+int debug_level_get(void);
-                   u32 indent, const char *src,
+void debug_stream_set(FILE *stream);
-                   u32 line, const char *fmt, ...);
+long long debug_timer_elapsed(void);
+void debug_flush_set(bool flush);
+void _printf debug(int level, bool timestamp,
+                   int indent, const char *src,
+                   int line, const char *fmt, ...);
+
 #else  /* DEBUG_DEBUG */
-static inline void debug_init(_unused u32 level) {}
+
-static inline void debug_level_set(_unused u32 level) {}
+static inline void debug_init(__unused int level,
-static inline void _printf debug(_unused u32 level, _unused bool timestamp,
+                              __unused FILE *stream,
-                                 _unused u32 indent, _unused const char *src,
+                              __unused bool flush) {}
-                                 _unused u32 line, _unused const char *fmt, ...) {}
+static inline void debug_level_set(__unused int level) {}
+static inline int debug_level_get(void) {return 0;}
+static inline void debug_stream_set(__unused FILE *stream) {}
+static inline long long debug_timer_elapsed(void) {return 0LL;}
+static inline void debug_flush_set(__unused bool level) {}
+static inline void _printf debug(__unused int level, __unused bool timestamp,
+                                 __unused int indent, __unused const char *src,
+                                 __unused int line, __unused const char *fmt, ...) {}
+
 #endif  /* DEBUG_DEBUG */
-#undef _unused
+
 #undef _printf
 
 /**