X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=1cf3af96331caf0e782937cb88978f4ee089e411;hp=c567d3952d532ed8aabb16005f6f16f4ad7b4218;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index c567d395..1cf3af96 100644
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -27,58 +27,64 @@
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <babeltrace/compat/string-internal.h>
+#include <babeltrace/types.h>
 
-extern int babeltrace_verbose, babeltrace_debug;
+#define PERROR_BUFLEN	200
 
-#define printf_verbose(fmt, args...)					\
-	do {								\
-		if (babeltrace_verbose)					\
-			fprintf(stdout, "[verbose] " fmt, ## args);	\
-	} while (0)
+#ifndef likely
+# ifdef __GNUC__
+#  define likely(x)      __builtin_expect(!!(x), 1)
+# else
+#  define likely(x)      (!!(x))
+# endif
+#endif
+
+#ifndef unlikely
+# ifdef __GNUC__
+#  define unlikely(x)    __builtin_expect(!!(x), 0)
+# else
+#  define unlikely(x)    (!!(x))
+# endif
+#endif
+
+#ifndef min
+#define min(a, b)	(((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b)	(((a) > (b)) ? (a) : (b))
+#endif
 
-#define printf_debug(fmt, args...)					\
-	do {								\
-		if (babeltrace_debug)					\
-			fprintf(stdout, "[debug] " fmt, ## args);	\
-	} while (0)
+#ifndef max_t
+#define max_t(type, a, b)	\
+	((type) (a) > (type) (b) ? (type) (a) : (type) (b))
+#endif
 
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
+/*
+ * Memory allocation zeroed
+ */
+#define zmalloc(x) calloc(1, x)
 
-struct trace_descriptor;
-struct trace_collection {
-	GPtrArray *array;	/* struct trace_descriptor */
-	GHashTable *clocks;	/* struct ctf_clock */
+/*
+ * BT_HIDDEN: set the hidden attribute for internal functions
+ * On Windows, symbols are local unless explicitly exported,
+ * see https://gcc.gnu.org/wiki/Visibility
+ */
+#if defined(_WIN32) || defined(__CYGWIN__)
+#define BT_HIDDEN
+#else
+#define BT_HIDDEN __attribute__((visibility("hidden")))
+#endif
 
-	uint64_t single_clock_offset_avg;
-	uint64_t offset_first;
-	int64_t delta_offset_first_sum;
-	int offset_nr;
-	int clock_use_offset_avg;
-};
+#ifndef __STRINGIFY
+#define __STRINGIFY(x)	#x
+#endif
 
-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_trace_hostname_field,
-	opt_trace_default_fields,
-	opt_loglevel_field,
-	opt_emf_field,
-	opt_callsite_field,
-	opt_delta_field,
-	opt_clock_cycles,
-	opt_clock_seconds,
-	opt_clock_date,
-	opt_clock_gmt,
-	opt_clock_force_correlate;
+#define TOSTRING(x)	__STRINGIFY(x)
 
-extern uint64_t opt_clock_offset;
+#define BT_UNUSED	__attribute__((unused))
 
 #endif