X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=6219b3a22eb0e41fe6a3a8496502df83610f2f97;hb=0d69b916c5ba44b63a26aa038d416d6ee286306b;hp=06a5654a8803252df268d13effa0cf773a0cc05c;hpb=82ace6d6d97ecb15d093232c76c5d4a3c31e6948;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index 06a5654a..6219b3a2 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -1,6 +1,29 @@
 #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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
@@ -22,15 +45,21 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
 
-struct trace_descriptor;
+/*
+ * BT_HIDDEN: set the hidden attribute for internal functions
+ */
+#define BT_HIDDEN __attribute__((visibility("hidden")))
+
+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;
 	uint64_t offset_first;
 	int64_t delta_offset_first_sum;
 	int offset_nr;
+	int clock_use_offset_avg;
 };
 
 extern int opt_all_field_names,
@@ -43,9 +72,13 @@ extern int opt_all_field_names,
 	opt_trace_domain_field,
 	opt_trace_procname_field,
 	opt_trace_vpid_field,
+	opt_trace_hostname_field,
+	opt_trace_default_fields,
 	opt_loglevel_field,
+	opt_emf_field,
+	opt_callsite_field,
 	opt_delta_field,
-	opt_clock_raw,
+	opt_clock_cycles,
 	opt_clock_seconds,
 	opt_clock_date,
 	opt_clock_gmt,