X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=logging%2Flog.c;h=78a0361de7c5e89d3586028fbd6e49a9a03999cf;hb=4f1c7f2eef8e85bc294f47ad780761820364171f;hp=6d09e56b57beb2c0ca44a3a9adf310be31f1fb84;hpb=beb0fb75663091c20765a8508162711ba828f456;p=babeltrace.git

diff --git a/logging/log.c b/logging/log.c
index 6d09e56b..78a0361d 100644
--- a/logging/log.c
+++ b/logging/log.c
@@ -5,6 +5,12 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/common-internal.h>
+#include <pthread.h>
+
+#ifdef __CYGWIN__
+extern unsigned long pthread_getsequence_np(pthread_t *);
+#endif
 
 /* When defined, Android log (android/log.h) will be used by default instead of
  * stderr (ignored on non-Android platforms). Date, time, pid and tid (context)
@@ -291,6 +297,9 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+
+#define BT_LOG_OUTPUT_LEVEL dummy
+
 #include <babeltrace/logging-internal.h>
 #include <babeltrace/logging.h>
 
@@ -301,6 +310,8 @@
 	#include <sys/time.h>
 	#if defined(__linux__)
 		#include <linux/limits.h>
+	#elif (defined(__sun__) || defined(__CYGWIN__))
+		/* Solaris and Cygwin have no sys/syslimits.h */
 	#else
 		#include <sys/syslimits.h>
 	#endif
@@ -479,7 +490,8 @@
 	#define memccpy _memccpy
 #endif
 
-#if (defined(_MSC_VER) && !defined(__INTEL_COMPILER)) || defined(__MINGW64__)
+#if (defined(_MSC_VER) && !defined(__INTEL_COMPILER)) || \
+		(defined(__MINGW64__) && !defined(__USE_MINGW_ANSI_STDIO))
 	#define vsnprintf(s, sz, fmt, va) fake_vsnprintf(s, sz, fmt, va)
 	static int fake_vsnprintf(char *s, size_t sz, const char *fmt, va_list ap)
 	{
@@ -673,6 +685,7 @@ static const bt_log_output out_stderr = {BT_LOG_OUT_STDERR};
 	BT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL = 0;
 #endif
 
+BT_HIDDEN
 const bt_log_spec _bt_log_stderr_spec =
 {
 	BT_LOG_GLOBAL_FORMAT,
@@ -731,7 +744,7 @@ static char lvl_char(const int lvl)
 #define TCACHE_FLUID (0x40000000 | 0x80000000)
 static unsigned g_tcache_mode = TCACHE_STALE;
 static struct timeval g_tcache_tv = {0, 0};
-static struct tm g_tcache_tm = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static struct tm g_tcache_tm = {0};
 
 static INLINE int tcache_get(const struct timeval *const tv, struct tm *const tm)
 {
@@ -819,6 +832,11 @@ static void pid_callback(int *const pid, int *const tid)
 #else
 	#if defined(_WIN32) || defined(_WIN64)
 	*tid = GetCurrentThreadId();
+	#elif defined(__CYGWIN__)
+	pthread_t thr = pthread_self();
+	*tid = (int)pthread_getsequence_np(&thr);
+	#elif defined(__sun__)
+	*tid = (int)pthread_self();
 	#elif defined(__ANDROID__)
 	*tid = gettid();
 	#elif defined(__linux__)
@@ -889,7 +907,7 @@ static char *put_integer_r(unsigned v, const int sign,
 						   const unsigned w, const char wc, char *const e)
 {
 	static const char _signs[] = {'-', '0', '+'};
-	static const char *const signs = _signs + 1;
+	const char *const signs = _signs + 1;
 	char *p = e;
 	do { *--p = '0' + v % 10; } while (0 != (v /= 10));
 	if (0 == sign) return put_padding_r(w, wc, p, e);
@@ -1250,6 +1268,31 @@ static void _bt_log_write_imp(
 	msg.lvl = lvl;
 	msg.tag = tag;
 	g_buffer_cb(&msg, buf);
+	const char *rst_color_p = bt_common_color_reset();
+	const char *rst_color_e = rst_color_p + strlen(rst_color_p);
+	const char *color_p = "";
+	const char *color_e = color_p;
+
+	switch (lvl) {
+	case BT_LOG_INFO:
+		color_p = bt_common_color_fg_blue();
+		color_e = color_p + strlen(color_p);
+		break;
+	case BT_LOG_WARN:
+		color_p = bt_common_color_fg_yellow();
+		color_e = color_p + strlen(color_p);
+		break;
+	case BT_LOG_ERROR:
+	case BT_LOG_FATAL:
+		color_p = bt_common_color_fg_red();
+		color_e = color_p + strlen(color_p);
+		break;
+	default:
+		break;
+	}
+
+	msg.p = put_stringn(color_p, color_e, msg.p, msg.e);
+
 	if (BT_LOG_PUT_CTX & mask)
 	{
 		put_ctx(&msg);
@@ -1266,6 +1309,7 @@ static void _bt_log_write_imp(
 	{
 		put_msg(&msg, fmt, va);
 	}
+	msg.p = put_stringn(rst_color_p, rst_color_e, msg.p, msg.e);
 	log->output->callback(&msg, log->output->arg);
 	if (0 != mem && BT_LOG_PUT_MSG & mask)
 	{