X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=913b043cf9d0b46b345015b9619c7c7755fac0be;hp=78adefce346e40bd2dc82d964ebf31fc1730acd2;hb=842c2b97eab577484edae763770dfd1440490818;hpb=cba1661ca1dbb97c676e5318106ae23052be947c

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 78adefce..913b043c 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -3,19 +3,20 @@
 
 #include <stdio.h>
 #include <glib.h>
+#include <stdint.h>
 
 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)
@@ -23,16 +24,28 @@ extern int babeltrace_verbose, babeltrace_debug;
 
 struct trace_descriptor;
 struct trace_collection {
-	GPtrArray *array;
+	GPtrArray *array;	/* struct trace_descriptor */
+	GHashTable *clocks;	/* struct ctf_clock */
+	struct ctf_clock *single_clock;
 };
 
-int convert_trace(struct trace_descriptor *td_write,
-		  struct trace_collection *trace_collection_read);
-
 extern int opt_all_field_names,
 	opt_scope_field_names,
 	opt_header_field_names,
 	opt_context_field_names,
-	opt_payload_field_names;
+	opt_payload_field_names,
+	opt_all_fields,
+	opt_trace_field,
+	opt_trace_domain_field,
+	opt_trace_procname_field,
+	opt_trace_vpid_field,
+	opt_loglevel_field,
+	opt_delta_field,
+	opt_clock_raw,
+	opt_clock_seconds,
+	opt_clock_date,
+	opt_clock_gmt;
+
+extern uint64_t opt_clock_offset;
 
 #endif