X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=39dc097e73f3e824bd4c6ad59cc5e0ea3d84e324;hp=7c02948ac1ff56fda5e016204a834dbf59f41f0b;hb=3394d22e104e2f6511b656773ef4e74506842f3e;hpb=70bd0a12b09ce7f233189cf07e090fda593ebc48

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 7c02948a..39dc097e 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -6,26 +6,36 @@
 
 extern int babeltrace_verbose, babeltrace_debug;
 
-#define printf_verbose(fmt, args...)				\
-	do {							\
-		if (babeltrace_verbose)				\
-			printf("[verbose] " fmt, ## args);	\
+#define printf_verbose(fmt, args...)					\
+	do {								\
+		if (babeltrace_verbose)					\
+			fprintf(stdout, "[verbose] " fmt, ## args);	\
 	} while (0)
 
-#define printf_debug(fmt, args...)				\
-	do {							\
-		if (babeltrace_debug)				\
-			printf("[debug] " fmt, ## args);	\
+#define printf_debug(fmt, args...)					\
+	do {								\
+		if (babeltrace_debug)					\
+			fprintf(stdout, "[debug] " fmt, ## args);	\
 	} while (0)
 
+#define likely(x)	__builtin_expect(!!(x), 1)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
 struct trace_descriptor;
 struct trace_collection {
-	GPtrArray *array;
+	GPtrArray *array; /* struct trace_descriptor */
 };
 
-int convert_trace(struct trace_descriptor *td_write,
-		  struct trace_collection *trace_collection_read);
-
-extern int opt_field_names;
+extern int opt_all_field_names,
+	opt_scope_field_names,
+	opt_header_field_names,
+	opt_context_field_names,
+	opt_payload_field_names,
+	opt_trace_name,
+	opt_trace_domain,
+	opt_trace_procname,
+	opt_trace_vpid,
+	opt_loglevel,
+	opt_delta;
 
 #endif