X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=29354a4a0eaa5f4503fec218c2aa0489a042d308;hp=58af9c90e3605485d924610ab0a4001aff2e52e5;hb=50052405724a3b901b258c00beb424751c579217;hpb=8c250d8758df3a8a4a5c6aafb63fe198bb21fe22

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 58af9c90..29354a4a 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -1,21 +1,37 @@
 #ifndef _BABELTRACE_INTERNAL_H
 #define _BABELTRACE_INTERNAL_H
 
+/*
+ * babeltrace/babeltrace-internal.h
+ *
+ * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
 #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,20 +39,34 @@ extern int babeltrace_verbose, babeltrace_debug;
 
 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;
+	int clock_use_offset_avg;
+};
 
 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_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_cycles,
+	opt_clock_seconds,
+	opt_clock_date,
+	opt_clock_gmt,
+	opt_clock_force_correlate;
+
+extern uint64_t opt_clock_offset;
 
 #endif