X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fbabeltrace-internal.h;h=1cf3af96331caf0e782937cb88978f4ee089e411;hp=ce2648a6cf3bf32ed6b261ea09607ff02aaeb667;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=ff9ce920c95ab70d94a6425182de0ebafed4e2a0 diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace/babeltrace-internal.h index ce2648a6..1cf3af96 100644 --- a/include/babeltrace/babeltrace-internal.h +++ b/include/babeltrace/babeltrace-internal.h @@ -27,114 +27,13 @@ #include #include #include -#include +#include +#include +#include +#include #define PERROR_BUFLEN 200 -extern int babeltrace_verbose, babeltrace_debug; - -#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) \ - fprintf(stdout, "[debug] " fmt, ## args); \ - } while (0) - -#define _bt_printf(fp, kindstr, fmt, args...) \ - fprintf(fp, "[%s]%s%s%s: " fmt "\n", \ - kindstr, \ - babeltrace_debug ? " \"" : "", \ - babeltrace_debug ? __func__ : "", \ - babeltrace_debug ? "\"" : "", \ - ## args) - -#define _bt_printfl(fp, kindstr, lineno, fmt, args...) \ - fprintf(fp, "[%s]%s%s%s at line %u: " fmt "\n", \ - kindstr, \ - babeltrace_debug ? " \"" : "", \ - babeltrace_debug ? __func__ : "", \ - babeltrace_debug ? "\"" : "", \ - lineno, \ - ## args) - -#define _bt_printfe(fp, kindstr, perrorstr, fmt, args...) \ - fprintf(fp, "[%s]%s%s%s: %s: " fmt "\n", \ - kindstr, \ - babeltrace_debug ? " \"" : "", \ - babeltrace_debug ? __func__ : "", \ - babeltrace_debug ? "\"" : "", \ - perrorstr, \ - ## args) - -#define _bt_printfle(fp, kindstr, lineno, perrorstr, fmt, args...) \ - fprintf(fp, "[%s]%s%s%s at line %u: %s: " fmt "\n", \ - kindstr, \ - babeltrace_debug ? " \"" : "", \ - babeltrace_debug ? __func__ : "", \ - babeltrace_debug ? "\"" : "", \ - lineno, \ - perrorstr, \ - ## args) - -#define _bt_printf_perror(fp, fmt, args...) \ - ({ \ - char buf[PERROR_BUFLEN] = "Error in strerror_r()"; \ - compat_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_printfle(fp, "error", lineno, buf, fmt, ## args); \ - }) - -/* printf without lineno information */ -#define printf_fatal(fmt, args...) \ - _bt_printf(stderr, "fatal", fmt, ## args) -#define printf_error(fmt, args...) \ - _bt_printf(stderr, "error", fmt, ## args) -#define printf_warning(fmt, args...) \ - _bt_printf(stderr, "warning", fmt, ## args) -#define printf_perror(fmt, args...) \ - _bt_printf_perror(stderr, fmt, ## args) - -/* printf with lineno information */ -#define printfl_fatal(lineno, fmt, args...) \ - _bt_printfl(stderr, "fatal", lineno, fmt, ## args) -#define printfl_error(lineno, fmt, args...) \ - _bt_printfl(stderr, "error", lineno, fmt, ## args) -#define printfl_warning(lineno, fmt, args...) \ - _bt_printfl(stderr, "warning", lineno, fmt, ## args) -#define printfl_perror(lineno, fmt, args...) \ - _bt_printfl_perror(stderr, lineno, fmt, ## args) - -/* printf with node lineno information */ -#define printfn_fatal(node, fmt, args...) \ - _bt_printfl(stderr, "fatal", (node)->lineno, fmt, ## args) -#define printfn_error(node, fmt, args...) \ - _bt_printfl(stderr, "error", (node)->lineno, fmt, ## args) -#define printfn_warning(node, fmt, args...) \ - _bt_printfl(stderr, "warning", (node)->lineno, fmt, ## args) -#define printfn_perror(node, fmt, args...) \ - _bt_printfl_perror(stderr, (node)->lineno, fmt, ## args) - -/* fprintf with Node lineno information */ -#define fprintfn_fatal(fp, node, fmt, args...) \ - _bt_printfl(fp, "fatal", (node)->lineno, fmt, ## args) -#define fprintfn_error(fp, node, fmt, args...) \ - _bt_printfl(fp, "error", (node)->lineno, fmt, ## args) -#define fprintfn_warning(fp, node, fmt, args...) \ - _bt_printfl(fp, "warning", (node)->lineno, fmt, ## args) -#define fprintfn_perror(fp, node, fmt, args...) \ - _bt_printfl_perror(fp, (node)->lineno, fmt, ## args) - #ifndef likely # ifdef __GNUC__ # define likely(x) __builtin_expect(!!(x), 1) @@ -151,52 +50,41 @@ 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 + * 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 -#define BT_CTF_MAJOR 1 -#define BT_CTF_MINOR 8 - -struct bt_trace_descriptor; -struct trace_collection { - GPtrArray *array; /* struct bt_trace_descriptor */ - GHashTable *clocks; /* struct ctf_clock */ - - int64_t single_clock_offset_avg; - int64_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, - opt_debug_info_full_path; +#define TOSTRING(x) __STRINGIFY(x) -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; +#define BT_UNUSED __attribute__((unused)) #endif