Put Python plugin support in a separate shared object

[babeltrace.git] / include / babeltrace / babeltrace-internal.h

diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h
index c9345509009d73eda04ab3df7ac4739980fa4d71..535f99094970161856927d5adcd6d1fb7753cc0d 100644 (file)
--- a/include/babeltrace/babeltrace-internal.h
+++ b/include/babeltrace/babeltrace-internal.h
@@ -27,11 +27,14 @@
 #include <stdio.h>
 #include <glib.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdbool.h>
 #include <babeltrace/compat/string.h>
 
 #define PERROR_BUFLEN  200
 
-extern int babeltrace_verbose, babeltrace_debug;
+extern bool babeltrace_verbose, babeltrace_debug;
 
 #define printf_verbose(fmt, args...)                                   \
        do {                                                            \
@@ -84,14 +87,14 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define _bt_printf_perror(fp, fmt, args...)                            \
        ({                                                              \
                char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               compat_strerror_r(errno, buf, sizeof(buf));             \
+               bt_strerror_r(errno, buf, sizeof(buf));         \
                _bt_printfe(fp, "error", buf, fmt, ## args);            \
        })
 
 #define _bt_printfl_perror(fp, lineno, fmt, args...)                   \
        ({                                                              \
                char buf[PERROR_BUFLEN] = "Error in strerror_r()";      \
-               compat_strerror_r(errno, buf, sizeof(buf));             \
+               bt_strerror_r(errno, buf, sizeof(buf));         \
                _bt_printfle(fp, "error", lineno, buf, fmt, ## args);   \
        })
 
@@ -151,6 +154,24 @@ extern int babeltrace_verbose, babeltrace_debug;
 # endif
 #endif
 
+#ifndef min
+#define min(a, b)      (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b)      (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef max_t
+#define max_t(type, a, b)      \
+       ((type) (a) > (type) (b) ? (type) (a) : (type) (b))
+#endif
+
+/*
+ * Memory allocation zeroed
+ */
+#define zmalloc(x) calloc(1, x)
+
 /*
  * BT_HIDDEN: set the hidden attribute for internal functions
  */
@@ -159,13 +180,16 @@ extern int babeltrace_verbose, babeltrace_debug;
 #define BT_CTF_MAJOR   1
 #define BT_CTF_MINOR   8
 
+#define __STRINGIFY(x) #x
+#define TOSTRING(x)    __STRINGIFY(x)
+
 struct bt_trace_descriptor;
 struct trace_collection {
        GPtrArray *array;       /* struct bt_trace_descriptor */
        GHashTable *clocks;     /* struct ctf_clock */
 
-       uint64_t single_clock_offset_avg;
-       uint64_t offset_first;
+       int64_t single_clock_offset_avg;
+       int64_t offset_first;
        int64_t delta_offset_first_sum;
        int offset_nr;
        int clock_use_offset_avg;
@@ -191,10 +215,13 @@ extern int opt_all_field_names,
        opt_clock_seconds,
        opt_clock_date,
        opt_clock_gmt,
-       opt_clock_force_correlate;
+       opt_clock_force_correlate,
+       opt_debug_info_full_path;
 
-extern uint64_t opt_clock_offset;
-extern uint64_t opt_clock_offset_ns;
+extern int64_t opt_clock_offset;
+extern int64_t opt_clock_offset_ns;
 extern int babeltrace_ctf_console_output;
+extern char *opt_debug_info_dir;
+extern char *opt_debug_info_target_prefix;
 
 #endif