summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/include/debug.h15
-rw-r--r--source4/lib/debug.c32
2 files changed, 42 insertions, 5 deletions
diff --git a/source4/include/debug.h b/source4/include/debug.h
index ccd1c90040..eaf53bad6a 100644
--- a/source4/include/debug.h
+++ b/source4/include/debug.h
@@ -35,15 +35,24 @@ struct debug_ops {
void (*log_task_id)(int fd);
};
+void do_debug_header(int level);
void do_debug(const char *, ...) PRINTF_ATTRIBUTE(1,2);
extern int DEBUGLEVEL;
#define DEBUGLVL(level) ((level) <= DEBUGLEVEL)
-#define DEBUG(level, body) do { if (DEBUGLVL(level)) do_debug body; } while (0)
-#define DEBUGADD(level, body) DEBUG(level, body)
+#define _DEBUG(level, body, header) do { \
+ if (DEBUGLVL(level)) { \
+ if (header) { \
+ do_debug_header(level); \
+ } \
+ do_debug body; \
+ } \
+} while (0)
+#define DEBUG(level, body) _DEBUG(level, body, True)
+#define DEBUGADD(level, body) _DEBUG(level, body, False)
#define DEBUGC(class, level, body) DEBUG(level, body)
-#define DEBUGADDC(class, level, body) DEBUG(level, body)
+#define DEBUGADDC(class, level, body) DEBUGADD(level, body)
#define DEBUGTAB(n) do_debug_tab(n)
enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2};
diff --git a/source4/lib/debug.c b/source4/lib/debug.c
index a775c46854..d0288f7ddc 100644
--- a/source4/lib/debug.c
+++ b/source4/lib/debug.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "system/filesys.h"
+#include "system/time.h"
#include "dynconfig.h"
/* this global variable determines what messages are printed */
@@ -44,6 +45,16 @@ static struct {
the backend for debug messages. Note that the DEBUG() macro has already
ensured that the log level has been met before this is called
*/
+void do_debug_header(int level)
+{
+ log_timestring(level);
+ log_task_id();
+}
+
+/*
+ the backend for debug messages. Note that the DEBUG() macro has already
+ ensured that the log level has been met before this is called
+*/
void do_debug(const char *format, ...)
{
va_list ap;
@@ -59,8 +70,6 @@ void do_debug(const char *format, ...)
vasprintf(&s, format, ap);
va_end(ap);
- log_task_id();
-
write(state.fd, s, strlen(s));
free(s);
}
@@ -153,6 +162,24 @@ void print_suspicious_usage(const char* from, const char* info)
}
}
+void log_timestring(int level)
+{
+ char *t = NULL;
+ char *s = NULL;
+
+ if (state.logtype != DEBUG_FILE) return;
+
+ t = timestring(NULL, time(NULL));
+ if (!t) return;
+
+ asprintf(&s, "[%s, %d]\n", t, level);
+ talloc_free(t);
+ if (!s) return;
+
+ write(state.fd, s, strlen(s));
+ free(s);
+}
+
uint32_t get_task_id(void)
{
if (debug_handlers.ops.get_task_id) {
@@ -167,6 +194,7 @@ void log_task_id(void)
debug_handlers.ops.log_task_id(state.fd);
}
}
+
/*
register a set of debug handlers.
*/