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

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 7c02948a..8996afcd 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -3,29 +3,53 @@
 
 #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)
+#define unlikely(x)	__builtin_expect(!!(x), 0)
+
 struct trace_descriptor;
 struct trace_collection {
-	GPtrArray *array;
-};
+	GPtrArray *array;	/* struct trace_descriptor */
+	GHashTable *clocks;	/* struct ctf_clock */
 
-int convert_trace(struct trace_descriptor *td_write,
-		  struct trace_collection *trace_collection_read);
+	uint64_t single_clock_offset_avg;
+	uint64_t offset_first;
+	int64_t delta_offset_first_sum;
+	int offset_nr;
+};
 
-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_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