X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcommon.h;h=b447ec889e51fa68d2ed5963b073b95759aec8f2;hb=5046c776430ff9f1c0580bad8cd36511fae636f8;hp=19f4c128443acafbac5b0efe1bd8f6dd42d61539;hpb=6375b9429f8332f3eacc2ec795aa1924c73d9cc8;p=babeltrace.git diff --git a/src/common/common.h b/src/common/common.h index 19f4c128..b447ec88 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -113,14 +113,12 @@ struct bt_common_lttng_live_url_parts { * Checks if the current process has setuid or setgid access rights. * Returns `true` if so. */ -BT_HIDDEN bool bt_common_is_setuid_setgid(void); /* * Returns the system-wide plugin path, e.g. * `/usr/lib/babeltrace2/plugins`. Do not free the return value. */ -BT_HIDDEN const char *bt_common_get_system_plugin_path(void); /* @@ -128,7 +126,6 @@ const char *bt_common_get_system_plugin_path(void); * `/home/user/.local/lib/babeltrace2/plugins`. You need to free the * return value. */ -BT_HIDDEN char *bt_common_get_home_plugin_path(int log_level); /* @@ -136,92 +133,64 @@ char *bt_common_get_home_plugin_path(int log_level); * `paths` is a list of directories separated by `:`. Returns 0 on * success. */ -BT_HIDDEN int bt_common_append_plugin_path_dirs(const char *paths, GPtrArray *dirs); /* * Returns `true` if terminal color codes are supported for this * process. */ -BT_HIDDEN bool bt_common_colors_supported(void); -BT_HIDDEN const char *bt_common_color_reset(void); -BT_HIDDEN const char *bt_common_color_bold(void); -BT_HIDDEN const char *bt_common_color_fg_default(void); -BT_HIDDEN const char *bt_common_color_fg_red(void); -BT_HIDDEN const char *bt_common_color_fg_green(void); -BT_HIDDEN const char *bt_common_color_fg_yellow(void); -BT_HIDDEN const char *bt_common_color_fg_blue(void); -BT_HIDDEN const char *bt_common_color_fg_magenta(void); -BT_HIDDEN const char *bt_common_color_fg_cyan(void); -BT_HIDDEN const char *bt_common_color_fg_light_gray(void); -BT_HIDDEN const char *bt_common_color_fg_bright_red(void); -BT_HIDDEN const char *bt_common_color_fg_bright_green(void); -BT_HIDDEN const char *bt_common_color_fg_bright_yellow(void); -BT_HIDDEN const char *bt_common_color_fg_bright_blue(void); -BT_HIDDEN const char *bt_common_color_fg_bright_magenta(void); -BT_HIDDEN const char *bt_common_color_fg_bright_cyan(void); -BT_HIDDEN const char *bt_common_color_fg_bright_light_gray(void); -BT_HIDDEN const char *bt_common_color_bg_default(void); -BT_HIDDEN const char *bt_common_color_bg_red(void); -BT_HIDDEN const char *bt_common_color_bg_green(void); -BT_HIDDEN const char *bt_common_color_bg_yellow(void); -BT_HIDDEN const char *bt_common_color_bg_blue(void); -BT_HIDDEN const char *bt_common_color_bg_magenta(void); -BT_HIDDEN const char *bt_common_color_bg_cyan(void); -BT_HIDDEN const char *bt_common_color_bg_light_gray(void); -BT_HIDDEN void bt_common_color_get_codes(struct bt_common_color_codes *codes, enum bt_common_color_when use_colors); @@ -231,7 +200,6 @@ void bt_common_color_get_codes(struct bt_common_color_codes *codes, * found in `escapable_chars`, and sets `*end_pos` to the position of * the end (from `input`). The caller owns the returned GString. */ -BT_HIDDEN GString *bt_common_string_until(const char *input, const char *escapable_chars, const char *end_chars, size_t *end_pos); @@ -242,21 +210,18 @@ GString *bt_common_string_until(const char *input, const char *escapable_chars, * prepend and append them manually, although they are not always * required. The caller owns the returned GString. */ -BT_HIDDEN GString *bt_common_shell_quote(const char *input, bool with_single_quotes); /* * Returns `true` if `input` is a string made only of printable * characters. */ -BT_HIDDEN bool bt_common_string_is_printable(const char *input); /* * Destroys the parts of an LTTng live URL as returned by * bt_common_parse_lttng_live_url(). */ -BT_HIDDEN void bt_common_destroy_lttng_live_url_parts( struct bt_common_lttng_live_url_parts *parts); @@ -266,7 +231,6 @@ void bt_common_destroy_lttng_live_url_parts( * up to `error_buf_size` bytes. You must destroy the returned value * with bt_common_destroy_lttng_live_url_parts(). */ -BT_HIDDEN struct bt_common_lttng_live_url_parts bt_common_parse_lttng_live_url( const char *url, char *error_buf, size_t error_buf_size); @@ -274,14 +238,12 @@ struct bt_common_lttng_live_url_parts bt_common_parse_lttng_live_url( * Normalizes (in place) a star globbing pattern to be used with * bt_common_star_glob_match(). This function always succeeds. */ -BT_HIDDEN void bt_common_normalize_star_glob_pattern(char *pattern); /* * Returns `true` if `candidate` (of size `candidate_len`) matches * the star globbing pattern `pattern` (of size `pattern_len`). */ -BT_HIDDEN bool bt_common_star_glob_match(const char *pattern, size_t pattern_len, const char *candidate, size_t candidate_len); @@ -297,7 +259,6 @@ bool bt_common_star_glob_match(const char *pattern, size_t pattern_len, * * The caller owns the returned GString. */ -BT_HIDDEN GString *bt_common_normalize_path(const char *path, const char *wd); typedef void (* bt_common_handle_custom_specifier_func)(void *priv_data, @@ -352,7 +313,6 @@ typedef void (* bt_common_handle_custom_specifier_func)(void *priv_data, * do not return error codes: they abort when there's any error (bad * format string, for example). */ -BT_HIDDEN void bt_common_custom_vsnprintf(char *buf, size_t buf_size, char intro, bt_common_handle_custom_specifier_func handle_specifier, @@ -361,7 +321,6 @@ void bt_common_custom_vsnprintf(char *buf, size_t buf_size, /* * Variadic form of bt_common_custom_vsnprintf(). */ -BT_HIDDEN void bt_common_custom_snprintf(char *buf, size_t buf_size, char intro, bt_common_handle_custom_specifier_func handle_specifier, @@ -370,7 +329,6 @@ void bt_common_custom_snprintf(char *buf, size_t buf_size, /* * Returns the system page size. */ -BT_HIDDEN size_t bt_common_get_page_size(int log_level); /* @@ -386,7 +344,6 @@ size_t bt_common_get_page_size(int log_level); * `strlen(str)` must not be 0. `digits_per_group` must not be 0. `sep` * must not be `\0`. */ -BT_HIDDEN void bt_common_sep_digits(char *str, unsigned int digits_per_group, char sep); /* @@ -402,7 +359,6 @@ void bt_common_sep_digits(char *str, unsigned int digits_per_group, char sep); * * The returned string, on success, is owned by the caller. */ -BT_HIDDEN GString *bt_common_fold(const char *str, unsigned int total_length, unsigned int indent); @@ -410,7 +366,6 @@ GString *bt_common_fold(const char *str, unsigned int total_length, * Writes the terminal's width to `*width`, its height to `*height`, * and returns 0 on success, or returns -1 on error. */ -BT_HIDDEN int bt_common_get_term_size(unsigned int *width, unsigned int *height); /* @@ -419,10 +374,8 @@ int bt_common_get_term_size(unsigned int *width, unsigned int *height); * * This function does NOT rewind `fp` once it's done or on error. */ -BT_HIDDEN int bt_common_append_file_content_to_g_string(GString *str, FILE *fp); -BT_HIDDEN void bt_common_abort(void) __attribute__((noreturn)); /* @@ -485,14 +438,20 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ return "BOOL"; case BT_FIELD_CLASS_TYPE_BIT_ARRAY: return "BIT_ARRAY"; + case BT_FIELD_CLASS_TYPE_INTEGER: + return "INTEGER"; case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER: return "UNSIGNED_INTEGER"; case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER: return "SIGNED_INTEGER"; + case BT_FIELD_CLASS_TYPE_ENUMERATION: + return "ENUMERATION"; case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION: return "UNSIGNED_ENUMERATION"; case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION: return "SIGNED_ENUMERATION"; + case BT_FIELD_CLASS_TYPE_REAL: + return "REAL"; case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL: return "SINGLE_PRECISION_REAL"; case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL: @@ -501,29 +460,47 @@ const char *bt_common_field_class_type_string(enum bt_field_class_type class_typ return "STRING"; case BT_FIELD_CLASS_TYPE_STRUCTURE: return "STRUCTURE"; + case BT_FIELD_CLASS_TYPE_ARRAY: + return "ARRAY"; case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: return "STATIC_ARRAY"; + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: + return "DYNAMIC_ARRAY"; case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD: return "DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD"; case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD: return "DYNAMIC_ARRAY_WITH_LENGTH_FIELD"; + case BT_FIELD_CLASS_TYPE_OPTION: + return "OPTION"; case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD: return "OPTION_WITHOUT_SELECTOR_FIELD"; + case BT_FIELD_CLASS_TYPE_OPTION_WITH_SELECTOR_FIELD: + return "OPTION_WITH_SELECTOR_FIELD"; case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD: return "OPTION_WITH_BOOL_SELECTOR_FIELD"; + case BT_FIELD_CLASS_TYPE_OPTION_WITH_INTEGER_SELECTOR_FIELD: + return "OPTION_WITH_INTEGER_SELECTOR_FIELD"; case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: return "OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD"; case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD: return "OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD"; + case BT_FIELD_CLASS_TYPE_VARIANT: + return "VARIANT"; case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD: return "VARIANT_WITHOUT_SELECTOR_FIELD"; + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SELECTOR_FIELD: + return "VARIANT_WITH_SELECTOR_FIELD"; + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_INTEGER_SELECTOR_FIELD: + return "VARIANT_WITH_INTEGER_SELECTOR_FIELD"; case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: return "VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD"; case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: return "VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD"; - default: - return "(unknown)"; + case __BT_FIELD_CLASS_TYPE_BIG_VALUE: + bt_common_abort (); } + + bt_common_abort(); }; static inline @@ -538,9 +515,9 @@ const char *bt_common_field_class_integer_preferred_display_base_string(enum bt_ return "DECIMAL"; case BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL: return "HEXADECIMAL"; - default: - return "(unknown)"; } + + bt_common_abort(); } static inline @@ -555,9 +532,9 @@ const char *bt_common_scope_string(enum bt_field_path_scope scope) return "EVENT_SPECIFIC_CONTEXT"; case BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD: return "EVENT_PAYLOAD"; - default: - return "(unknown)"; } + + bt_common_abort(); } static inline @@ -595,9 +572,9 @@ const char *bt_common_event_class_log_level_string( return "DEBUG_LINE"; case BT_EVENT_CLASS_LOG_LEVEL_DEBUG: return "DEBUG"; - default: - return "(unknown)"; } + + bt_common_abort(); }; static inline @@ -608,6 +585,8 @@ const char *bt_common_value_type_string(enum bt_value_type type) return "NULL"; case BT_VALUE_TYPE_BOOL: return "BOOL"; + case BT_VALUE_TYPE_INTEGER: + return "INTEGER"; case BT_VALUE_TYPE_UNSIGNED_INTEGER: return "UNSIGNED_INTEGER"; case BT_VALUE_TYPE_SIGNED_INTEGER: @@ -620,9 +599,9 @@ const char *bt_common_value_type_string(enum bt_value_type type) return "ARRAY"; case BT_VALUE_TYPE_MAP: return "MAP"; - default: - return "(unknown)"; } + + bt_common_abort(); }; static inline @@ -682,9 +661,9 @@ const char *bt_common_logging_level_string( return "FATAL"; case BT_LOGGING_LEVEL_NONE: return "NONE"; - default: - return "(unknown)"; } + + bt_common_abort(); }; static inline @@ -693,8 +672,6 @@ const char *bt_common_func_status_string(int status) switch (status) { case __BT_FUNC_STATUS_OVERFLOW_ERROR: return "OVERFLOW"; - case __BT_FUNC_STATUS_UNKNOWN_OBJECT: - return "UNKNOWN_OBJECT"; case __BT_FUNC_STATUS_MEMORY_ERROR: return "MEMORY_ERROR"; case __BT_FUNC_STATUS_USER_ERROR: @@ -707,13 +684,17 @@ const char *bt_common_func_status_string(int status) return "END"; case __BT_FUNC_STATUS_NOT_FOUND: return "NOT_FOUND"; - case __BT_FUNC_STATUS_AGAIN: - return "AGAIN"; case __BT_FUNC_STATUS_INTERRUPTED: return "INTERRUPTED"; - default: - return "(unknown)"; + case __BT_FUNC_STATUS_NO_MATCH: + return "NO_MATCH"; + case __BT_FUNC_STATUS_AGAIN: + return "AGAIN"; + case __BT_FUNC_STATUS_UNKNOWN_OBJECT: + return "UNKNOWN_OBJECT"; } + + bt_common_abort(); } #define NS_PER_S_I INT64_C(1000000000) @@ -811,7 +792,7 @@ end: * bt_g_string_append_printf cannot be inlined because it expects a * variadic argument list. */ -BT_HIDDEN __BT_ATTR_FORMAT_PRINTF(2, 3) +__BT_ATTR_FORMAT_PRINTF(2, 3) int bt_common_g_string_append_printf(GString *str, const char *fmt, ...); static inline @@ -864,9 +845,34 @@ const char *bt_common_component_class_type_string( return "SINK"; case BT_COMPONENT_CLASS_TYPE_FILTER: return "FILTER"; - default: - return "(unknown)"; } + + bt_common_abort(); +} + +static inline +const char *bt_common_message_type_string(enum bt_message_type type) +{ + switch (type) { + case BT_MESSAGE_TYPE_STREAM_BEGINNING: + return "STREAM_BEGINNING"; + case BT_MESSAGE_TYPE_STREAM_END: + return "STREAM_END"; + case BT_MESSAGE_TYPE_EVENT: + return "EVENT"; + case BT_MESSAGE_TYPE_PACKET_BEGINNING: + return "PACKET_BEGINNING"; + case BT_MESSAGE_TYPE_PACKET_END: + return "PACKET_END"; + case BT_MESSAGE_TYPE_DISCARDED_EVENTS: + return "DISCARDED_EVENTS"; + case BT_MESSAGE_TYPE_DISCARDED_PACKETS: + return "DISCARDED_PACKETS"; + case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: + return "MESSAGE_ITERATOR_INACTIVITY"; + } + + bt_common_abort(); } #ifdef __cplusplus