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

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 6b6fcecf..0d06ed58 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -42,17 +42,79 @@ 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)
+
+/* 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)
+
+/* 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)
+
+/* 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)
+
+/* 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)
+
+#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;
+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;