X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=6b6fcecfbb3bd24d67066f98824e4fe8085ad68c;hb=dd06413f0a5c638a20f000f3046755ee229c821d;hp=d256bdf55b69ea163068e08f6b3fadfaaa7765f9;hpb=eb31c5e6bbfbb02093ff45616446c26730898c05;p=babeltrace.git

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index d256bdf5..6b6fcecf 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -15,6 +15,14 @@
  *
  * 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>
@@ -37,6 +45,11 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define likely(x)	__builtin_expect(!!(x), 1)
 #define unlikely(x)	__builtin_expect(!!(x), 0)
 
+/*
+ * BT_HIDDEN: set the hidden attribute for internal functions
+ */
+#define BT_HIDDEN __attribute__((visibility("hidden")))
+
 struct trace_descriptor;
 struct trace_collection {
 	GPtrArray *array;	/* struct trace_descriptor */
@@ -46,6 +59,7 @@ struct trace_collection {
 	uint64_t offset_first;
 	int64_t delta_offset_first_sum;
 	int offset_nr;
+	int clock_use_offset_avg;
 };
 
 extern int opt_all_field_names,
@@ -58,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,