X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=9b9ffbdf4a7cf2213848c0cbd9437957fddaa8a8;hb=65923160260ca0d5928db5d8840e76576cb429c4;hp=6b6fcecfbb3bd24d67066f98824e4fe8085ad68c;hpb=5d6c80a595e870ad50118f5efe827cc6cafab5d5;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 6b6fcecf..9b9ffbdf 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
+#include <string.h>
+
+#define PERROR_BUFLEN	200
 
 extern int babeltrace_verbose, babeltrace_debug;
 
@@ -42,17 +45,149 @@ extern int babeltrace_verbose, babeltrace_debug;
 			fprintf(stdout, "[debug] " fmt, ## args);	\
 	} while (0)
 
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
+#define _bt_printf(fp, kindstr, fmt, args...)				\
+	fprintf(fp, "[%s]%s%s%s: " fmt "\n",				\
+		kindstr,						\
+		babeltrace_debug ? " \"" : "",				\
+		babeltrace_debug ? __func__ : "",			\
+		babeltrace_debug ? "\"" : "",				\
+		## args)
+
+#define _bt_printfl(fp, kindstr, lineno, fmt, args...)			\
+	fprintf(fp, "[%s]%s%s%s at line %u: " fmt "\n",			\
+		kindstr,						\
+		babeltrace_debug ? " \"" : "",				\
+		babeltrace_debug ? __func__ : "",			\
+		babeltrace_debug ? "\"" : "",				\
+		lineno,							\
+		## args)
+
+#define _bt_printfe(fp, kindstr, perrorstr, fmt, args...)		\
+	fprintf(fp, "[%s]%s%s%s: %s: " fmt "\n",			\
+		kindstr,						\
+		babeltrace_debug ? " \"" : "",				\
+		babeltrace_debug ? __func__ : "",			\
+		babeltrace_debug ? "\"" : "",				\
+		perrorstr,						\
+		## args)
+
+#define _bt_printfle(fp, kindstr, lineno, perrorstr, fmt, args...)	\
+	fprintf(fp, "[%s]%s%s%s at line %u: %s: " fmt "\n",		\
+		kindstr,						\
+		babeltrace_debug ? " \"" : "",				\
+		babeltrace_debug ? __func__ : "",			\
+		babeltrace_debug ? "\"" : "",				\
+		lineno,							\
+		perrorstr,						\
+		## args)
+
+#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+
+#define _bt_printf_perror(fp, fmt, args...)				\
+	({								\
+		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
+		strerror_r(errno, buf, sizeof(buf));			\
+		_bt_printfe(fp, "error", buf, fmt, ## args);		\
+	})
+
+#define _bt_printfl_perror(fp, lineno, fmt, args...)			\
+	({								\
+		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
+		strerror_r(errno, buf, sizeof(buf));			\
+		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
+	})
+
+#else
+
+/*
+ * Version using GNU strerror_r, for linux with appropriate defines.
+ */
+
+#define _bt_printf_perror(fp, fmt, args...)				\
+	({								\
+		char *buf;						\
+		char tmp[PERROR_BUFLEN] = "Error in strerror_r()";	\
+		buf = strerror_r(errno, tmp, sizeof(tmp));		\
+		_bt_printfe(fp, "error", buf, fmt, ## args);		\
+	})
+
+#define _bt_printfl_perror(fp, lineno, fmt, args...)			\
+	({								\
+		char *buf;						\
+		char tmp[PERROR_BUFLEN] = "Error in strerror_r()";	\
+		buf = strerror_r(errno, tmp, sizeof(tmp));		\
+		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
+	})
+
+#endif
+
+/* printf without lineno information */
+#define printf_fatal(fmt, args...)					\
+	_bt_printf(stderr, "fatal", fmt, ## args)
+#define printf_error(fmt, args...)					\
+	_bt_printf(stderr, "error", fmt, ## args)
+#define printf_warning(fmt, args...)					\
+	_bt_printf(stderr, "warning", fmt, ## args)
+#define printf_perror(fmt, args...)					\
+	_bt_printf_perror(stderr, fmt, ## args)
+
+/* printf with lineno information */
+#define printfl_fatal(lineno, fmt, args...)				\
+	_bt_printfl(stderr, "fatal", lineno, fmt, ## args)
+#define printfl_error(lineno, fmt, args...)				\
+	_bt_printfl(stderr, "error", lineno, fmt, ## args)
+#define printfl_warning(lineno, fmt, args...)				\
+	_bt_printfl(stderr, "warning", lineno, fmt, ## args)
+#define printfl_perror(lineno, fmt, args...)				\
+	_bt_printfl_perror(stderr, lineno, fmt, ## args)
+
+/* printf with node lineno information */
+#define printfn_fatal(node, fmt, args...)				\
+	_bt_printfl(stderr, "fatal", (node)->lineno, fmt, ## args)
+#define printfn_error(node, fmt, args...)				\
+	_bt_printfl(stderr, "error", (node)->lineno, fmt, ## args)
+#define printfn_warning(node, fmt, args...)				\
+	_bt_printfl(stderr, "warning", (node)->lineno, fmt, ## args)
+#define printfn_perror(node, fmt, args...)				\
+	_bt_printfl_perror(stderr, (node)->lineno, fmt, ## args)
+
+/* fprintf with Node lineno information */
+#define fprintfn_fatal(fp, node, fmt, args...)				\
+	_bt_printfl(fp, "fatal", (node)->lineno, fmt, ## args)
+#define fprintfn_error(fp, node, fmt, args...)				\
+	_bt_printfl(fp, "error", (node)->lineno, fmt, ## args)
+#define fprintfn_warning(fp, node, fmt, args...)			\
+	_bt_printfl(fp, "warning", (node)->lineno, fmt, ## args)
+#define fprintfn_perror(fp, node, fmt, args...)				\
+	_bt_printfl_perror(fp, (node)->lineno, fmt, ## args)
+
+#ifndef likely
+# ifdef __GNUC__
+#  define likely(x)      __builtin_expect(!!(x), 1)
+# else
+#  define likely(x)      (!!(x))
+# endif
+#endif
+
+#ifndef unlikely
+# ifdef __GNUC__
+#  define unlikely(x)    __builtin_expect(!!(x), 0)
+# else
+#  define unlikely(x)    (!!(x))
+# endif
+#endif
 
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
  */
 #define BT_HIDDEN __attribute__((visibility("hidden")))
 
-struct trace_descriptor;
+#define BT_CTF_MAJOR	1
+#define BT_CTF_MINOR	8
+
+struct bt_trace_descriptor;
 struct trace_collection {
-	GPtrArray *array;	/* struct trace_descriptor */
+	GPtrArray *array;	/* struct bt_trace_descriptor */
 	GHashTable *clocks;	/* struct ctf_clock */
 
 	uint64_t single_clock_offset_avg;
@@ -85,5 +220,6 @@ extern int opt_all_field_names,
 	opt_clock_force_correlate;
 
 extern uint64_t opt_clock_offset;
+extern uint64_t opt_clock_offset_ns;
 
 #endif