X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=c9345509009d73eda04ab3df7ac4739980fa4d71;hp=0d06ed58827e3ea1184c7df72df8efac8a67bea9;hb=2654fe9bab8f0eaeb17264ef7abadfd14e245b23;hpb=196409fea0ae7c1f530d356a1502781e5d602326

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 0d06ed58..c9345509 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 <babeltrace/compat/string.h>
+
+#define PERROR_BUFLEN	200
 
 extern int babeltrace_verbose, babeltrace_debug;
 
@@ -45,20 +48,53 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define _bt_printf(fp, kindstr, fmt, args...)				\
 	fprintf(fp, "[%s]%s%s%s: " fmt "\n",				\
 		kindstr,						\
-		(babeltrace_debug ? " \"" : ""),			\
-		(babeltrace_debug ? __func__ : ""),			\
-		(babeltrace_debug ? "\"" : ""),				\
+		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 ? "\"" : ""),				\
+		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)
+
+#define _bt_printf_perror(fp, fmt, args...)				\
+	({								\
+		char buf[PERROR_BUFLEN] = "Error in strerror_r()";	\
+		compat_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()";	\
+		compat_strerror_r(errno, buf, sizeof(buf));		\
+		_bt_printfle(fp, "error", lineno, buf, fmt, ## args);	\
+	})
+
 /* printf without lineno information */
 #define printf_fatal(fmt, args...)					\
 	_bt_printf(stderr, "fatal", fmt, ## args)
@@ -66,6 +102,8 @@ extern int babeltrace_verbose, babeltrace_debug;
 	_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...)				\
@@ -74,6 +112,8 @@ extern int babeltrace_verbose, babeltrace_debug;
 	_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...)				\
@@ -82,6 +122,8 @@ extern int babeltrace_verbose, babeltrace_debug;
 	_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...)				\
@@ -90,6 +132,8 @@ extern int babeltrace_verbose, babeltrace_debug;
 	_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__
@@ -112,6 +156,9 @@ extern int babeltrace_verbose, babeltrace_debug;
  */
 #define BT_HIDDEN __attribute__((visibility("hidden")))
 
+#define BT_CTF_MAJOR	1
+#define BT_CTF_MINOR	8
+
 struct bt_trace_descriptor;
 struct trace_collection {
 	GPtrArray *array;	/* struct bt_trace_descriptor */
@@ -147,5 +194,7 @@ extern int opt_all_field_names,
 	opt_clock_force_correlate;
 
 extern uint64_t opt_clock_offset;
+extern uint64_t opt_clock_offset_ns;
+extern int babeltrace_ctf_console_output;
 
 #endif