X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Flog%2Flog.c;h=0b145e0d3d6013f608935b3b696c3863e887c2a1;hp=b250a9ec26e71beea0761a44ce0efac729b50b2b;hb=679d9dceb5bdf51f118548ca2645dc81088a8974;hpb=307b4b091e0bc298964e90888bf179431e32c134;ds=sidebyside

diff --git a/lib/log/log.c b/lib/log/log.c
index b250a9e..0b145e0 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -1,6 +1,8 @@
 
 #include <assert.h>
 #include <stdarg.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include "log.h"
 
@@ -9,11 +11,19 @@ static bool debug;
 
 static void __log(const char *fmt, va_list ap)
 {
+	char hms[20] = {'\0'};
+	time_t t;
+
 	if (!logf)
 		return;
+
+	/* Add timestamp */
+	t = time(NULL);
+	strftime(hms, sizeof(hms), "%T", localtime(&t));
+	fprintf(logf, "[%s] ", hms);
+
 	vfprintf(logf, fmt, ap);
-	if (debug)
-		fflush(logf);
+	fflush(logf);
 }
 
 void pb_log(const char *fmt, ...)
@@ -24,6 +34,15 @@ void pb_log(const char *fmt, ...)
 	va_end(ap);
 }
 
+void _pb_log_fn(const char *func, const char *fmt, ...)
+{
+	va_list ap;
+	pb_log("%s: ", func);
+	va_start(ap, fmt);
+	__log(fmt, ap);
+	va_end(ap);
+}
+
 void pb_debug(const char *fmt, ...)
 {
 	va_list ap;
@@ -34,6 +53,28 @@ void pb_debug(const char *fmt, ...)
 	va_end(ap);
 }
 
+void _pb_debug_fn(const char *func, const char *fmt, ...)
+{
+	va_list ap;
+	if (!debug)
+		return;
+	pb_log("%s: ", func);
+	va_start(ap, fmt);
+	__log(fmt, ap);
+	va_end(ap);
+}
+
+void _pb_debug_fl(const char *func, int line, const char *fmt, ...)
+{
+	va_list ap;
+	if (!debug)
+		return;
+	pb_log("%s:%d: ", func, line);
+	va_start(ap, fmt);
+	__log(fmt, ap);
+	va_end(ap);
+}
+
 void __pb_log_init(FILE *fp, bool _debug)
 {
 	if (logf)
@@ -42,6 +83,11 @@ void __pb_log_init(FILE *fp, bool _debug)
 	debug = _debug;
 }
 
+void pb_log_set_debug(bool _debug)
+{
+	debug = _debug;
+}
+
 FILE *pb_log_get_stream(void)
 {
 	static FILE *null_stream;