Merge branch 'tree' into next

[i3/i3] / src / log.c

diff --git a/src/log.c b/src/log.c
index 99c2d4d3d2a5fe1218068e93e54b931bcafc174c..22b7fffe8774986b63fabce036f0cbfcde597cc0 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/time.h>
 
 #include "util.h"
 #include "log.h"
@@ -89,7 +90,13 @@ void vlog(char *fmt, va_list args) {
     struct tm *tmp = localtime(&t);
     /* Generate time prefix */
     strftime(timebuf, sizeof(timebuf), "%x %X - ", tmp);
+#ifdef DEBUG_TIMING
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    printf("%s%d.%d - ", timebuf, tv.tv_sec, tv.tv_usec);
+#else
     printf("%s", timebuf);
+#endif
     vprintf(fmt, args);
 }