From 498e7994d60bd0e9f63c3d5c0fd00eec77ba7c34 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 1 Nov 2019 22:20:33 -0400 Subject: [PATCH] Add bt_common_abort() and use it instead of abort() directly This patch adds bt_common_abort() which, for the moment, only calls abort(). This patch also replaces all the calls to abort() with calls to bt_common_abort(). The purpose is to control how all the parts of Babeltrace abort, eventually adding other actions before calling abort() for example. Signed-off-by: Philippe Proulx Change-Id: I2c8cd7ad760758041ef2dcaaa6b3ef84f89d80e6 Reviewed-on: https://review.lttng.org/c/babeltrace/+/2317 Tested-by: jenkins --- src/argpar/argpar.c | 3 +- .../python/bt2/bt2/native_bt_trace.i.h | 2 +- .../python/bt2/bt2/native_bt_trace_class.i.h | 2 +- src/cli/babeltrace2-cfg-cli-args-connect.c | 2 +- src/cli/babeltrace2-cfg-cli-args.c | 14 +++++----- src/cli/babeltrace2-query.c | 2 +- src/cli/babeltrace2.c | 16 +++++------ src/common/assert.c | 2 +- src/common/common.c | 22 +++++++++------ src/common/common.h | 5 +++- src/compat/fcntl.h | 4 ++- src/compat/mman.c | 13 +++++---- src/ctf-writer/assert-pre.h | 2 +- src/ctf-writer/field-types.c | 4 +-- src/ctf-writer/fields.c | 2 +- src/ctf-writer/resolve.c | 6 ++-- src/ctf-writer/writer.c | 2 +- src/ctfser/ctfser.h | 4 +-- src/lib/assert-post.h | 3 +- src/lib/assert-pre.h | 3 +- src/lib/error.c | 2 +- src/lib/graph/component-descriptor-set.c | 2 +- src/lib/graph/component.c | 10 +++---- src/lib/graph/graph.c | 14 +++++----- src/lib/graph/iterator.c | 20 ++++++------- src/lib/graph/mip.c | 2 +- src/lib/graph/query-executor.c | 2 +- src/lib/lib-logging.c | 6 ++-- src/lib/plugin/plugin-so.c | 28 +++++++++---------- src/lib/plugin/plugin.h | 3 +- src/lib/trace-ir/field.c | 4 +-- src/lib/trace-ir/resolve-field-path.c | 2 +- src/param-parse/param-parse.c | 2 +- src/plugins/common/muxing/muxing.c | 7 +++-- .../param-validation/param-validation.c | 2 +- src/plugins/ctf/common/bfcr/bfcr.c | 12 ++++---- .../metadata/ctf-meta-configure-ir-trace.c | 2 +- .../ctf/common/metadata/ctf-meta-resolve.c | 10 +++---- .../ctf/common/metadata/ctf-meta-translate.c | 4 +-- .../ctf-meta-warn-meaningless-header-fields.c | 2 +- src/plugins/ctf/common/metadata/ctf-meta.h | 10 +++---- .../ctf/common/metadata/visitor-generate-ir.c | 2 +- src/plugins/ctf/common/msg-iter/msg-iter.c | 8 +++--- src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h | 2 +- src/plugins/ctf/fs-sink/fs-sink-stream.c | 2 +- src/plugins/ctf/fs-sink/fs-sink-trace.c | 4 +-- src/plugins/ctf/fs-sink/fs-sink.c | 2 +- .../ctf/fs-sink/translate-ctf-ir-to-tsdl.c | 8 +++--- .../fs-sink/translate-trace-ir-to-ctf-ir.c | 14 +++++----- src/plugins/ctf/fs-src/data-stream-file.c | 2 +- src/plugins/ctf/fs-src/fs.c | 2 +- src/plugins/ctf/lttng-live/lttng-live.c | 10 +++---- src/plugins/ctf/lttng-live/metadata.c | 2 +- .../lttng-utils/debug-info/debug-info.c | 2 +- .../debug-info/trace-ir-data-copy.c | 5 ++-- .../trace-ir-metadata-field-class-copy.c | 6 ++-- src/plugins/text/details/details.c | 4 +-- src/plugins/text/details/write.c | 24 ++++++++-------- src/plugins/text/dmesg/dmesg.c | 2 +- src/plugins/text/pretty/pretty.c | 4 +-- src/plugins/text/pretty/print.c | 6 ++-- src/plugins/utils/muxer/muxer.c | 2 +- src/plugins/utils/trimmer/trimmer.c | 2 +- .../python-plugin-provider.c | 2 +- tests/param-validation/Makefile.am | 2 ++ 65 files changed, 199 insertions(+), 179 deletions(-) diff --git a/src/argpar/argpar.c b/src/argpar/argpar.c index 5fbe8d38..7f4e46b3 100644 --- a/src/argpar/argpar.c +++ b/src/argpar/argpar.c @@ -26,6 +26,7 @@ #include #include "common/assert.h" +#include "common/common.h" #include "argpar.h" @@ -423,7 +424,7 @@ struct bt_argpar_parse_ret bt_argpar_parse(unsigned int argc, parse_ret.error, i, orig_arg); goto error; default: - abort(); + bt_common_abort(); } if (used_next_orig_arg) { diff --git a/src/bindings/python/bt2/bt2/native_bt_trace.i.h b/src/bindings/python/bt2/bt2/native_bt_trace.i.h index e8cd75b7..4b7f7904 100644 --- a/src/bindings/python/bt2/bt2/native_bt_trace.i.h +++ b/src/bindings/python/bt2/bt2/native_bt_trace.i.h @@ -32,7 +32,7 @@ trace_destroyed_listener(const bt_trace *trace, void *py_callable) SWIGTYPE_p_bt_trace, 0); if (!py_trace_ptr) { BT_LOGF_STR("Failed to create a SWIG pointer object."); - abort(); + bt_common_abort(); } py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_ptr); diff --git a/src/bindings/python/bt2/bt2/native_bt_trace_class.i.h b/src/bindings/python/bt2/bt2/native_bt_trace_class.i.h index 1e1eb3c1..48a1734a 100644 --- a/src/bindings/python/bt2/bt2/native_bt_trace_class.i.h +++ b/src/bindings/python/bt2/bt2/native_bt_trace_class.i.h @@ -32,7 +32,7 @@ trace_class_destroyed_listener(const bt_trace_class *trace_class, void *py_calla SWIGTYPE_p_bt_trace_class, 0); if (!py_trace_class_ptr) { BT_LOGF_STR("Failed to create a SWIG pointer object."); - abort(); + bt_common_abort(); } py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_class_ptr); diff --git a/src/cli/babeltrace2-cfg-cli-args-connect.c b/src/cli/babeltrace2-cfg-cli-args-connect.c index b4402b8a..66437532 100644 --- a/src/cli/babeltrace2-cfg-cli-args-connect.c +++ b/src/cli/babeltrace2-cfg-cli-args-connect.c @@ -272,7 +272,7 @@ static struct bt_config_connection *cfg_connection_from_arg(const char *arg) } break; default: - abort(); + bt_common_abort(); } } diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c index e80689be..57ccabf3 100644 --- a/src/cli/babeltrace2-cfg-cli-args.c +++ b/src/cli/babeltrace2-cfg-cli-args.c @@ -452,7 +452,7 @@ void bt_config_destroy(bt_object *obj) } break; default: - abort(); + bt_common_abort(); } g_free(cfg); @@ -886,7 +886,7 @@ void add_run_cfg_comp(struct bt_config *cfg, g_ptr_array_add(cfg->cmd_data.run.sinks, cfg_comp); break; default: - abort(); + bt_common_abort(); } } @@ -1900,7 +1900,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[], dest = BT_CONFIG_COMPONENT_DEST_SINK; break; default: - abort(); + bt_common_abort(); } BT_ASSERT(cur_base_params); @@ -2612,7 +2612,7 @@ int bt_value_to_cli_param_value_append(const bt_value *value, GString *buf) break; } default: - abort(); + bt_common_abort(); } ret = 0; @@ -3424,7 +3424,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], sink_names = g_list_append(sink_names, name_gstr); break; default: - abort(); + bt_common_abort(); } name_gstr = NULL; @@ -3584,7 +3584,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], goto error; } } else { - abort(); + bt_common_abort(); } } @@ -4713,7 +4713,7 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], default_log_level); break; default: - abort(); + bt_common_abort(); } if (config) { diff --git a/src/cli/babeltrace2-query.c b/src/cli/babeltrace2-query.c index 4455bcc4..6afe2114 100644 --- a/src/cli/babeltrace2-query.c +++ b/src/cli/babeltrace2-query.c @@ -124,7 +124,7 @@ bt_query_executor_query_status cli_query(const bt_component_class *comp_cls, default: BT_LOGF("Unknown query status: status=%s", bt_common_func_status_string(status)); - abort(); + bt_common_abort(); } } diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index e721ea3b..a59bb71c 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -193,7 +193,7 @@ const bt_component_class *find_component_class(const char *plugin_name, comp_cls = bt_component_class_sink_as_component_class_const(find_sink_component_class(plugin_name, comp_class_name)); break; default: - abort(); + bt_common_abort(); } return comp_cls; @@ -456,7 +456,7 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent) break; } default: - abort(); + bt_common_abort(); } goto end; @@ -614,7 +614,7 @@ void print_cfg(struct bt_config *cfg) print_cfg_print_lttng_live_sessions(cfg); break; default: - abort(); + bt_common_abort(); } } @@ -2275,7 +2275,7 @@ int cmd_run_ctx_create_components_from_config_components( cfg_comp->comp_cls_name->str); break; default: - abort(); + bt_common_abort(); } if (!comp_cls) { @@ -2310,7 +2310,7 @@ int cmd_run_ctx_create_components_from_config_components( (void *) &comp); break; default: - abort(); + bt_common_abort(); } if (ret) { @@ -2353,7 +2353,7 @@ int cmd_run_ctx_create_components_from_config_components( GUINT_TO_POINTER(quark), (void *) comp); break; default: - abort(); + bt_common_abort(); } comp = NULL; @@ -2697,7 +2697,7 @@ void print_error_causes(void) bt_error_cause_message_iterator_actor_get_component_class_type(cause)); break; default: - abort(); + bt_common_abort(); } /* Print file name and line number */ @@ -2810,7 +2810,7 @@ int main(int argc, const char **argv) break; default: BT_LOGF("Invalid/unknown command: cmd=%d", cfg->command); - abort(); + bt_common_abort(); } BT_LOGI("Command completed: cmd=%d, command-name=\"%s\", ret=%d", diff --git a/src/common/assert.c b/src/common/assert.c index c4a18c4e..1cc1dbaa 100644 --- a/src/common/assert.c +++ b/src/common/assert.c @@ -52,5 +52,5 @@ void bt_common_assert_failed(const char *file, int line, const char *func, bt_common_color_reset(), bt_common_color_fg_red(), bt_common_color_reset()); - abort(); + bt_common_abort(); } diff --git a/src/common/common.c b/src/common/common.c index 90524f2a..641f16fd 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -1256,7 +1256,7 @@ size_t bt_common_get_page_size(int log_level) if (page_size < 0) { BT_LOGF("Cannot get system's page size: ret=%d", page_size); - abort(); + bt_common_abort(); } return page_size; @@ -1417,7 +1417,7 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, BUF_STD_APPEND_SINGLE_ARG(int); break; default: - abort(); + bt_common_abort(); } break; } @@ -1432,7 +1432,7 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, BUF_STD_APPEND_SINGLE_ARG(wchar_t *); break; default: - abort(); + bt_common_abort(); } break; case 'd': @@ -1455,7 +1455,7 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, BUF_STD_APPEND_SINGLE_ARG(size_t); break; default: - abort(); + bt_common_abort(); } break; case 'o': @@ -1480,7 +1480,7 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, BUF_STD_APPEND_SINGLE_ARG(size_t); break; default: - abort(); + bt_common_abort(); } break; case 'f': @@ -1499,7 +1499,7 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, BUF_STD_APPEND_SINGLE_ARG(long double); break; default: - abort(); + bt_common_abort(); } break; case 'p': @@ -1508,11 +1508,11 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch, if (length_mod == LENGTH_MOD_NONE) { BUF_STD_APPEND_SINGLE_ARG(void *); } else { - abort(); + bt_common_abort(); } break; default: - abort(); + bt_common_abort(); } update_rw_fmt: @@ -1901,3 +1901,9 @@ end: g_free(buf); return ret; } + +BT_HIDDEN +void bt_common_abort(void) +{ + abort(); +} diff --git a/src/common/common.h b/src/common/common.h index ab19d098..3b15b284 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -361,6 +361,9 @@ int bt_common_get_term_size(unsigned int *width, unsigned int *height); BT_HIDDEN int bt_common_append_file_content_to_g_string(GString *str, FILE *fp); +BT_HIDDEN +void bt_common_abort(void) __attribute__((noreturn)); + /* * Wraps read() function to handle EINTR and partial reads. * On success, it returns `count` received as parameter. On error, it returns a @@ -589,7 +592,7 @@ GString *bt_common_field_path_string(struct bt_field_path *path) g_string_append(str, ", "); break; default: - abort(); + bt_common_abort(); } } diff --git a/src/compat/fcntl.h b/src/compat/fcntl.h index c5289430..ae76e61e 100644 --- a/src/compat/fcntl.h +++ b/src/compat/fcntl.h @@ -25,6 +25,8 @@ * SOFTWARE. */ +#include "common/common.h" + #ifdef BABELTRACE_HAVE_POSIX_FALLOCATE #include @@ -122,7 +124,7 @@ restore: /* Restore the original file pointer position */ if (!SetFilePointerEx(handle, file_pos, NULL, FILE_BEGIN)) { /* We moved the file pointer but failed to restore it. */ - abort(); + bt_common_abort(); } end: diff --git a/src/compat/mman.c b/src/compat/mman.c index d2019d2b..1051913d 100644 --- a/src/compat/mman.c +++ b/src/compat/mman.c @@ -31,6 +31,7 @@ #include "logging/log.h" #include "common/macros.h" +#include "common/common.h" #ifdef __APPLE__ /* @@ -90,11 +91,11 @@ void mapping_clean(struct mmap_mapping *mapping) if (mapping) { if (!CloseHandle(mapping->map_handle)) { BT_LOGF_STR("Failed to close mmap map_handle."); - abort(); + bt_common_abort(); } if (!CloseHandle(mapping->file_handle)) { BT_LOGF_STR("Failed to close mmap file_handle."); - abort(); + bt_common_abort(); } free(mapping); mapping = NULL; @@ -112,7 +113,7 @@ void addr_clean(void *addr) */ BT_LOG_WRITE_CUR_LVL(BT_LOG_FATAL, BT_LOG_FATAL, BT_LOG_TAG, "Failed to unmap mmap mapping."); - abort(); + bt_common_abort(); } } @@ -121,7 +122,7 @@ void mmap_lock(int log_level) { if (pthread_mutex_lock(&mmap_mutex)) { BT_LOG_WRITE_CUR_LVL(BT_LOG_FATAL, log_level, BT_LOG_TAG, "Failed to acquire mmap_mutex."); - abort(); + bt_common_abort(); } } @@ -130,7 +131,7 @@ void mmap_unlock(int log_level) { if (pthread_mutex_unlock(&mmap_mutex)) { BT_LOG_WRITE_CUR_LVL(BT_LOG_FATAL, log_level, BT_LOG_TAG, "Failed to release mmap_mutex."); - abort(); + bt_common_abort(); } } @@ -292,7 +293,7 @@ int bt_munmap(void *addr, size_t length) /* Remove it. */ if (!g_hash_table_remove(mmap_mappings, addr)) { BT_LOGF_STR("Failed to remove mapping from hashtable."); - abort(); + bt_common_abort(); } end: diff --git a/src/ctf-writer/assert-pre.h b/src/ctf-writer/assert-pre.h index edb306df..54870832 100644 --- a/src/ctf-writer/assert-pre.h +++ b/src/ctf-writer/assert-pre.h @@ -94,7 +94,7 @@ BT_CTF_ASSERT_PRE_MSG("CTF writer precondition not satisfied; error is:"); \ BT_CTF_ASSERT_PRE_MSG((_fmt), ##__VA_ARGS__); \ BT_CTF_ASSERT_PRE_MSG("Aborting..."); \ - abort(); \ + bt_common_abort(); \ } \ } while (0) diff --git a/src/ctf-writer/field-types.c b/src/ctf-writer/field-types.c index e5767cfc..4eff50c5 100644 --- a/src/ctf-writer/field-types.c +++ b/src/ctf-writer/field-types.c @@ -740,7 +740,7 @@ int bt_ctf_field_type_enumeration_mapping_iterator_next( default: BT_LOGF("Invalid enumeration field type mapping iterator type: " "type=%d", iter->type); - abort(); + bt_common_abort(); } } @@ -3941,7 +3941,7 @@ int bt_ctf_field_type_common_validate_single_clock_class( break; default: BT_LOGF("Unexpected field type ID: id=%d", ft->id); - abort(); + bt_common_abort(); } BT_ASSERT_DBG(sub_ft); diff --git a/src/ctf-writer/fields.c b/src/ctf-writer/fields.c index bed77b0d..5d76c1cd 100644 --- a/src/ctf-writer/fields.c +++ b/src/ctf-writer/fields.c @@ -964,7 +964,7 @@ int bt_ctf_field_floating_point_serialize(struct bt_ctf_field_common *field, byte_order == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN ? LITTLE_ENDIAN : BIG_ENDIAN); } else { - abort(); + bt_common_abort(); } if (G_UNLIKELY(ret)) { diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c index 4636e1c5..ccb55a24 100644 --- a/src/ctf-writer/resolve.c +++ b/src/ctf-writer/resolve.c @@ -975,7 +975,7 @@ int validate_target_field_path(struct bt_ctf_field_path *target_field_path, } break; default: - abort(); + bt_common_abort(); } end: @@ -1012,7 +1012,7 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type_common *type, bt_ctf_field_type_common_variant_get_tag_name(type); break; default: - abort(); + bt_common_abort(); } if (!pathstr) { @@ -1087,7 +1087,7 @@ int resolve_sequence_or_variant_type(struct bt_ctf_field_type_common *type, } break; default: - abort(); + bt_common_abort(); } end: diff --git a/src/ctf-writer/writer.c b/src/ctf-writer/writer.c index 246d4ca1..e3f5b326 100644 --- a/src/ctf-writer/writer.c +++ b/src/ctf-writer/writer.c @@ -447,7 +447,7 @@ const char *bt_ctf_get_byte_order_string(enum bt_ctf_byte_order byte_order) string = "native"; break; default: - abort(); + bt_common_abort(); } return string; diff --git a/src/ctfser/ctfser.h b/src/ctfser/ctfser.h index 9fc3315f..ac71eac8 100644 --- a/src/ctfser/ctfser.h +++ b/src/ctfser/ctfser.h @@ -251,7 +251,7 @@ int _bt_ctfser_write_byte_aligned_unsigned_int_no_align( break; } default: - abort(); + bt_common_abort(); } _bt_ctfser_incr_offset(ctfser, size_bits); @@ -313,7 +313,7 @@ int _bt_ctfser_write_byte_aligned_signed_int_no_align( break; } default: - abort(); + bt_common_abort(); } _bt_ctfser_incr_offset(ctfser, size_bits); diff --git a/src/lib/assert-post.h b/src/lib/assert-post.h index 94bdf4ef..2cc359b4 100644 --- a/src/lib/assert-post.h +++ b/src/lib/assert-post.h @@ -43,6 +43,7 @@ #include #include #include "common/macros.h" +#include "common/common.h" /* * Prints the details of an unsatisfied postcondition without @@ -96,7 +97,7 @@ BT_ASSERT_POST_MSG("Babeltrace 2 library postcondition not satisfied; error is:"); \ BT_ASSERT_POST_MSG(_fmt, ##__VA_ARGS__); \ BT_ASSERT_POST_MSG("Aborting..."); \ - abort(); \ + bt_common_abort(); \ } \ } while (0) diff --git a/src/lib/assert-pre.h b/src/lib/assert-pre.h index 0b85d861..03d86de3 100644 --- a/src/lib/assert-pre.h +++ b/src/lib/assert-pre.h @@ -42,6 +42,7 @@ #include #include #include +#include "common/common.h" #include "common/macros.h" /* @@ -95,7 +96,7 @@ BT_ASSERT_PRE_MSG("Babeltrace 2 library precondition not satisfied; error is:"); \ BT_ASSERT_PRE_MSG(_fmt, ##__VA_ARGS__); \ BT_ASSERT_PRE_MSG("Aborting..."); \ - abort(); \ + bt_common_abort(); \ } \ } while (0) diff --git a/src/lib/error.c b/src/lib/error.c index 7cdf95bc..3972b26c 100644 --- a/src/lib/error.c +++ b/src/lib/error.c @@ -261,7 +261,7 @@ void append_component_class_id_str(GString *str, type_str = "sink"; break; default: - abort(); + bt_common_abort(); } if (comp_class_id->plugin_name->len > 0) { diff --git a/src/lib/graph/component-descriptor-set.c b/src/lib/graph/component-descriptor-set.c index 2585ccfe..9dcbabf5 100644 --- a/src/lib/graph/component-descriptor-set.c +++ b/src/lib/graph/component-descriptor-set.c @@ -188,7 +188,7 @@ bt_component_descriptor_set_add_descriptor_with_initialize_method_data( comp_descr_array = comp_descr_set->sinks; break; default: - abort(); + bt_common_abort(); } BT_ASSERT(comp_descr_array); diff --git a/src/lib/graph/component.c b/src/lib/graph/component.c index cc951e06..d9f233ee 100644 --- a/src/lib/graph/component.c +++ b/src/lib/graph/component.c @@ -100,7 +100,7 @@ void finalize_component(struct bt_component *comp) break; } default: - abort(); + bt_common_abort(); } if (method) { @@ -501,7 +501,7 @@ bt_component_port_connected( method = (method_t) src_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -518,7 +518,7 @@ bt_component_port_connected( method = (method_t) flt_cc->methods.output_port_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -532,13 +532,13 @@ bt_component_port_connected( method = (method_t) sink_cc->methods.input_port_connected; break; default: - abort(); + bt_common_abort(); } break; } default: - abort(); + bt_common_abort(); } if (method) { diff --git a/src/lib/graph/graph.c b/src/lib/graph/graph.c index 4cdb06c1..869a71d6 100644 --- a/src/lib/graph/graph.c +++ b/src/lib/graph/graph.c @@ -1100,7 +1100,7 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added( listeners = graph->listeners.source_output_port_added; break; default: - abort(); + bt_common_abort(); } break; @@ -1115,7 +1115,7 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added( listeners = graph->listeners.filter_output_port_added; break; default: - abort(); + bt_common_abort(); } break; @@ -1127,13 +1127,13 @@ enum bt_graph_listener_func_status bt_graph_notify_port_added( listeners = graph->listeners.sink_input_port_added; break; default: - abort(); + bt_common_abort(); } break; } default: - abort(); + bt_common_abort(); } for (i = 0; i < listeners->len; i++) { @@ -1188,7 +1188,7 @@ enum bt_graph_listener_func_status bt_graph_notify_ports_connected( graph->listeners.source_sink_ports_connected; break; default: - abort(); + bt_common_abort(); } break; @@ -1205,13 +1205,13 @@ enum bt_graph_listener_func_status bt_graph_notify_ports_connected( graph->listeners.filter_sink_ports_connected; break; default: - abort(); + bt_common_abort(); } break; } default: - abort(); + bt_common_abort(); } for (i = 0; i < listeners->len; i++) { diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index 376052fc..121e4bd9 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -191,7 +191,7 @@ void bt_self_component_port_input_message_iterator_try_finalize( /* Finalizing */ BT_LIB_LOGF("Message iterator is already being finalized: " "%!+i", iterator); - abort(); + bt_common_abort(); default: break; } @@ -222,7 +222,7 @@ void bt_self_component_port_input_message_iterator_try_finalize( } default: /* Unreachable */ - abort(); + bt_common_abort(); } if (method) { @@ -428,7 +428,7 @@ int create_self_component_input_port_message_iterator( break; } default: - abort(); + bt_common_abort(); } if (iterator->methods.seek_ns_from_origin && @@ -466,7 +466,7 @@ int create_self_component_input_port_message_iterator( } default: /* Unreachable */ - abort(); + bt_common_abort(); } if (init_method) { @@ -936,7 +936,7 @@ bt_self_component_port_input_message_iterator_next( goto end; default: /* Unknown non-error status */ - abort(); + bt_common_abort(); } end: @@ -1101,7 +1101,7 @@ void set_iterator_state_after_seeking( new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED; break; default: - abort(); + bt_common_abort(); } set_self_comp_port_input_msg_iterator_state(iterator, new_state); @@ -1385,7 +1385,7 @@ int auto_seek_handle_message( break; } default: - abort(); + bt_common_abort(); } BT_ASSERT_DBG(clk_snapshot); @@ -1589,7 +1589,7 @@ int find_message_ge_ns_from_origin( case BT_FUNC_STATUS_END: goto end; default: - abort(); + bt_common_abort(); } for (i = 0; i < user_count; i++) { @@ -1799,7 +1799,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } /* @@ -1943,7 +1943,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } } diff --git a/src/lib/graph/mip.c b/src/lib/graph/mip.c index 6107dfbc..46347652 100644 --- a/src/lib/graph/mip.c +++ b/src/lib/graph/mip.c @@ -116,7 +116,7 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors, break; } default: - abort(); + bt_common_abort(); } if (!method) { diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c index 406a38c6..60f85659 100644 --- a/src/lib/graph/query-executor.c +++ b/src/lib/graph/query-executor.c @@ -209,7 +209,7 @@ enum bt_query_executor_query_status bt_query_executor_query( break; } default: - abort(); + bt_common_abort(); } if (!method) { diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c index c648e336..242f88d6 100644 --- a/src/lib/lib-logging.c +++ b/src/lib/lib-logging.c @@ -111,7 +111,7 @@ static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE]; prefix, (_prefix2)); \ \ if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \ - abort(); \ + bt_common_abort(); \ } \ \ tmp_prefix[TMP_PREFIX_LEN - 1] = '\0'; \ @@ -490,7 +490,7 @@ static inline void format_field_path(char **buf_ch, bool extended, BUF_APPEND("%s", ", "); break; default: - abort(); + bt_common_abort(); } } @@ -1481,7 +1481,7 @@ static inline void handle_conversion_specifier_bt(void *priv_data, format_error_cause(buf_ch, extended, prefix, obj); break; default: - abort(); + bt_common_abort(); } update_fmt: diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c index 5df77b12..60f3e4da 100644 --- a/src/lib/plugin/plugin-so.c +++ b/src/lib/plugin/plugin-so.c @@ -507,7 +507,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_get_supported_mip_versions_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INITIALIZE_METHOD: @@ -525,7 +525,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_initialize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD: @@ -543,7 +543,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_finalize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD: @@ -561,7 +561,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_query_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INPUT_PORT_CONNECTED_METHOD: @@ -575,7 +575,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_input_port_connected_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_OUTPUT_PORT_CONNECTED_METHOD: @@ -589,7 +589,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_output_port_connected_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GRAPH_IS_CONFIGURED_METHOD: @@ -599,7 +599,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_graph_is_configured_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_INITIALIZE_METHOD: @@ -613,7 +613,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_initialize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_FINALIZE_METHOD: @@ -627,7 +627,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_finalize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_SEEK_NS_FROM_ORIGIN_METHOD: @@ -641,7 +641,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_seek_ns_from_origin_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_SEEK_BEGINNING_METHOD: @@ -655,7 +655,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_seek_beginning_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_CAN_SEEK_NS_FROM_ORIGIN_METHOD: @@ -669,7 +669,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_can_seek_ns_from_origin_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_CAN_SEEK_BEGINNING_METHOD: @@ -683,7 +683,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_msg_iter_can_seek_beginning_method; break; default: - abort(); + bt_common_abort(); } break; default: @@ -1203,7 +1203,7 @@ int bt_plugin_so_init(struct bt_plugin *plugin, break; default: - abort(); + bt_common_abort(); } /* diff --git a/src/lib/plugin/plugin.h b/src/lib/plugin/plugin.h index ffdcbd60..b91adf4b 100644 --- a/src/lib/plugin/plugin.h +++ b/src/lib/plugin/plugin.h @@ -25,6 +25,7 @@ */ #include "common/macros.h" +#include "common/common.h" #include "lib/graph/component-class.h" #include #include @@ -349,7 +350,7 @@ int bt_plugin_add_component_class( comp_classes = plugin->sink_comp_classes; break; default: - abort(); + bt_common_abort(); } /* Set component class's original plugin name */ diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c index b5542486..8db595ec 100644 --- a/src/lib/trace-ir/field.c +++ b/src/lib/trace-ir/field.c @@ -272,7 +272,7 @@ struct bt_field *bt_field_create(struct bt_field_class *fc) field = create_variant_field(fc); break; default: - abort(); + bt_common_abort(); } if (!field) { @@ -1365,7 +1365,7 @@ void bt_field_destroy(struct bt_field *field) destroy_variant_field(field); break; default: - abort(); + bt_common_abort(); } } diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c index 4bc0c9c2..9e8e4729 100644 --- a/src/lib/trace-ir/resolve-field-path.c +++ b/src/lib/trace-ir/resolve-field-path.c @@ -230,7 +230,7 @@ struct bt_field_class *borrow_root_field_class( case BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD: return ctx->event_payload; default: - abort(); + bt_common_abort(); } return NULL; diff --git a/src/param-parse/param-parse.c b/src/param-parse/param-parse.c index c2e0ec59..976b5bdf 100644 --- a/src/param-parse/param-parse.c +++ b/src/param-parse/param-parse.c @@ -551,7 +551,7 @@ int ini_handle_state(struct ini_parsing_state *state) state->expecting = INI_EXPECT_MAP_KEY; goto success; default: - abort(); + bt_common_abort(); } error: diff --git a/src/plugins/common/muxing/muxing.c b/src/plugins/common/muxing/muxing.c index 6257a28a..93ba1a34 100644 --- a/src/plugins/common/muxing/muxing.c +++ b/src/plugins/common/muxing/muxing.c @@ -27,6 +27,7 @@ #include #include "common/assert.h" +#include "common/common.h" #include "common/macros.h" #include "common/uuid.h" @@ -74,7 +75,7 @@ int message_type_weight(const bt_message_type msg_type) weight = 0; break; default: - abort(); + bt_common_abort(); } return weight; @@ -460,7 +461,7 @@ const bt_stream *borrow_stream(const bt_message *msg) case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY: goto end; default: - abort(); + bt_common_abort(); } end: @@ -832,7 +833,7 @@ int compare_messages_same_type(struct messages_to_compare *msgs) break; } default: - abort(); + bt_common_abort(); } end: diff --git a/src/plugins/common/param-validation/param-validation.c b/src/plugins/common/param-validation/param-validation.c index c37a44f0..4b6eed73 100644 --- a/src/plugins/common/param-validation/param-validation.c +++ b/src/plugins/common/param-validation/param-validation.c @@ -96,7 +96,7 @@ void append_scope_to_string(GString *str, g_string_append_printf(str, "[%" PRIu64 "]", elem->array_index); break; default: - abort(); + bt_common_abort(); } } diff --git a/src/plugins/ctf/common/bfcr/bfcr.c b/src/plugins/ctf/common/bfcr/bfcr.c index 99245571..a95079e1 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.c +++ b/src/plugins/ctf/common/bfcr/bfcr.c @@ -293,7 +293,7 @@ int64_t get_compound_field_class_length(struct bt_bfcr *bfcr, bfcr->user.data); break; default: - abort(); + bt_common_abort(); } return length; @@ -476,7 +476,7 @@ void read_unsigned_bitfield(struct bt_bfcr *bfcr, const uint8_t *buf, size_t at, bt_bitfield_read_le(buf, uint8_t, at, field_size, v); break; default: - abort(); + bt_common_abort(); } BT_COMP_LOGT("Read unsigned bit array: cur=%zu, size=%u, " @@ -495,7 +495,7 @@ void read_signed_bitfield(struct bt_bfcr *bfcr, const uint8_t *buf, size_t at, bt_bitfield_read_le(buf, uint8_t, at, field_size, v); break; default: - abort(); + bt_common_abort(); } BT_COMP_LOGT("Read signed bit array: cur=%zu, size=%u, " @@ -594,7 +594,7 @@ enum bt_bfcr_status read_basic_float_and_call_cb(struct bt_bfcr *bfcr, } default: /* Only 32-bit and 64-bit fields are supported currently */ - abort(); + bt_common_abort(); } BT_COMP_LOGT("Read floating point number value: bfcr=%p, cur=%zu, val=%f", @@ -948,7 +948,7 @@ enum bt_bfcr_status read_basic_begin_state(struct bt_bfcr *bfcr) status = read_basic_string_class_and_call(bfcr, true); break; default: - abort(); + bt_common_abort(); } return status; @@ -973,7 +973,7 @@ enum bt_bfcr_status read_basic_continue_state(struct bt_bfcr *bfcr) status = read_basic_string_class_and_call(bfcr, false); break; default: - abort(); + bt_common_abort(); } return status; diff --git a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.c b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.c index 727a5014..4a00ca23 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.c +++ b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.c @@ -46,7 +46,7 @@ int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, env_entry->value.str->str); break; default: - abort(); + bt_common_abort(); } if (ret) { diff --git a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c index 074c5dd1..bc303c15 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c +++ b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c @@ -240,7 +240,7 @@ struct ctf_field_class *borrow_class_from_ctx(struct resolve_context *ctx, case CTF_SCOPE_EVENT_PAYLOAD: return ctx->scopes.event_payload; default: - abort(); + bt_common_abort(); } return NULL; @@ -520,7 +520,7 @@ int absolute_ptokens_to_field_path(GList *ptokens, break; default: - abort(); + bt_common_abort(); } /* Skip absolute path tokens */ @@ -944,7 +944,7 @@ int validate_target_field_path(struct ctf_field_path *target_field_path, break; } default: - abort(); + bt_common_abort(); } end: @@ -983,7 +983,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc, break; } default: - abort(); + bt_common_abort(); } if (!pathstr) { @@ -1046,7 +1046,7 @@ int resolve_sequence_or_variant_field_class(struct ctf_field_class *fc, break; } default: - abort(); + bt_common_abort(); } end: diff --git a/src/plugins/ctf/common/metadata/ctf-meta-translate.c b/src/plugins/ctf/common/metadata/ctf-meta-translate.c index 1ac7aac3..1499a7f9 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-translate.c +++ b/src/plugins/ctf/common/metadata/ctf-meta-translate.c @@ -427,7 +427,7 @@ bt_field_class *ctf_field_class_to_ir(struct ctx *ctx, ir_fc = ctf_field_class_variant_to_ir(ctx, (void *) fc); break; default: - abort(); + bt_common_abort(); } fc->ir_fc = ir_fc; @@ -485,7 +485,7 @@ bt_field_class *scope_ctf_field_class_to_ir(struct ctx *ctx) fc = ctx->ec->payload_fc; break; default: - abort(); + bt_common_abort(); } if (fc && ctf_field_class_struct_has_immediate_member_in_ir( diff --git a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c index 9a9d765a..bc2539e1 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c +++ b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c @@ -118,7 +118,7 @@ void warn_meaningless_fields(struct ctf_field_class *fc, const char *name, break; } default: - abort(); + bt_common_abort(); } end: diff --git a/src/plugins/ctf/common/metadata/ctf-meta.h b/src/plugins/ctf/common/metadata/ctf-meta.h index 71232b03..3a5fec2d 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta.h +++ b/src/plugins/ctf/common/metadata/ctf-meta.h @@ -684,7 +684,7 @@ void ctf_field_class_destroy(struct ctf_field_class *fc) _ctf_field_class_variant_destroy((void *) fc); break; default: - abort(); + bt_common_abort(); } } @@ -1056,7 +1056,7 @@ uint64_t ctf_field_class_compound_get_field_class_count(struct ctf_field_class * field_count = 1; break; default: - abort(); + bt_common_abort(); } return field_count; @@ -1152,7 +1152,7 @@ const char *ctf_scope_string(enum ctf_scope scope) case CTF_SCOPE_EVENT_PAYLOAD: return "EVENT_PAYLOAD"; default: - abort(); + bt_common_abort(); } } @@ -1211,7 +1211,7 @@ struct ctf_field_class *ctf_field_path_borrow_field_class( fc = ec->payload_fc; break; default: - abort(); + bt_common_abort(); } BT_ASSERT_DBG(fc); @@ -1474,7 +1474,7 @@ struct ctf_field_class *ctf_field_class_copy(struct ctf_field_class *fc) copy_fc = (void *) _ctf_field_class_variant_copy((void *) fc); break; default: - abort(); + bt_common_abort(); } copy_fc->type = fc->type; diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c index abac12ae..604388b4 100644 --- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -3495,7 +3495,7 @@ int auto_map_fields_to_trace_clock_class(struct ctx *ctx, named_fc = ctf_field_class_variant_borrow_option_by_index( var_fc, i); } else { - abort(); + bt_common_abort(); } if (strcmp(named_fc->name->str, field_name) == 0) { diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index cbca3cf1..5f60f950 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -1805,7 +1805,7 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *msg_it) default: BT_COMP_LOGF("Unknown CTF plugin message iterator state: " "msg-it-addr=%p, state=%d", msg_it, msg_it->state); - abort(); + bt_common_abort(); } BT_COMP_LOGT("Handled state: msg-it-addr=%p, status=%s, " @@ -1901,7 +1901,7 @@ bt_field *borrow_next_field(struct bt_msg_iter *msg_it) next_field = bt_field_variant_borrow_selected_option_field( base_field); } else { - abort(); + bt_common_abort(); } BT_ASSERT_DBG(next_field); @@ -2009,7 +2009,7 @@ enum bt_bfcr_status bfcr_unsigned_int_cb(uint64_t value, msg_it->cur_exp_packet_content_size = value; break; default: - abort(); + bt_common_abort(); } update_def_clock: @@ -3114,7 +3114,7 @@ enum bt_msg_iter_status decode_until_state( struct bt_msg_iter *msg_it, /* We should never get to the STATE_DONE state. */ BT_COMP_LOGF("Unexpected state: msg-it-addr=%p, state=%s", msg_it, state_string(msg_it->state)); - abort(); + bt_common_abort(); } } while (true); diff --git a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h index 063fb03a..d480e0fa 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h +++ b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h @@ -621,7 +621,7 @@ void fs_sink_ctf_field_class_destroy(struct fs_sink_ctf_field_class *fc) _fs_sink_ctf_field_class_variant_destroy((void *) fc); break; default: - abort(); + bt_common_abort(); } } diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.c b/src/plugins/ctf/fs-sink/fs-sink-stream.c index 64aecd47..eec834e3 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-stream.c +++ b/src/plugins/ctf/fs-sink/fs-sink-stream.c @@ -449,7 +449,7 @@ int write_field(struct fs_sink_stream *stream, ret = write_variant_field(stream, (void *) fc, field); break; default: - abort(); + bt_common_abort(); } return ret; diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.c b/src/plugins/ctf/fs-sink/fs-sink-trace.c index 1bc01d2f..c21c168f 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-trace.c +++ b/src/plugins/ctf/fs-sink/fs-sink-trace.c @@ -520,7 +520,7 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace) BT_COMP_LOGF_ERRNO("In trace destruction listener: " "cannot open metadata file for writing", ": path=\"%s\"", trace->metadata_path->str); - abort(); + bt_common_abort(); } len = fwrite(tsdl->str, sizeof(*tsdl->str), tsdl->len, fh); @@ -528,7 +528,7 @@ void fs_sink_trace_destroy(struct fs_sink_trace *trace) BT_COMP_LOGF_ERRNO("In trace destruction listener: " "cannot write metadata file", ": path=\"%s\"", trace->metadata_path->str); - abort(); + bt_common_abort(); } if (!trace->fs_sink->quiet) { diff --git a/src/plugins/ctf/fs-sink/fs-sink.c b/src/plugins/ctf/fs-sink/fs-sink.c index 532e542c..9f1ef423 100644 --- a/src/plugins/ctf/fs-sink/fs-sink.c +++ b/src/plugins/ctf/fs-sink/fs-sink.c @@ -1041,7 +1041,7 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume( fs_sink, msg); break; default: - abort(); + bt_common_abort(); } BT_MESSAGE_PUT_REF_AND_RESET(msgs[i]); diff --git a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c index d7a9b848..bfab450c 100644 --- a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c +++ b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c @@ -138,7 +138,7 @@ void append_integer_field_class_from_props(struct ctx *ctx, unsigned int size, g_string_append(ctx->tsdl, "x"); break; default: - abort(); + bt_common_abort(); } g_string_append_c(ctx->tsdl, ';'); @@ -589,7 +589,7 @@ void append_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class *fc) append_variant_field_class(ctx, (void *) fc); break; default: - abort(); + bt_common_abort(); } } @@ -683,7 +683,7 @@ void append_event_class(struct ctx *ctx, struct fs_sink_ctf_event_class *ec) level = 14; break; default: - abort(); + bt_common_abort(); } g_string_append_printf(ctx->tsdl, "%u;\n", level); @@ -976,7 +976,7 @@ void translate_trace_ctf_ir_to_tsdl(struct fs_sink_ctf_trace *trace, * This is checked in * translate_trace_trace_ir_to_ctf_ir(). */ - abort(); + bt_common_abort(); } g_string_append(tsdl, ";\n"); diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c index d1e969f8..c808ef0a 100644 --- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c +++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c @@ -307,7 +307,7 @@ int create_relative_field_ref(struct ctx *ctx, tgt_fc = ctx->cur_ec->payload_fc; break; default: - abort(); + bt_common_abort(); } i = 0; @@ -355,7 +355,7 @@ int create_relative_field_ref(struct ctx *ctx, break; } default: - abort(); + bt_common_abort(); } if (named_fc) { @@ -479,7 +479,7 @@ int create_absolute_field_ref(struct ctx *ctx, g_string_assign(tgt_field_ref, "event.fields"); break; default: - abort(); + bt_common_abort(); } BT_ASSERT(fc); @@ -513,7 +513,7 @@ int create_absolute_field_ref(struct ctx *ctx, bt_field_path_item_index_get_index(fp_item)); break; default: - abort(); + bt_common_abort(); } BT_ASSERT(named_fc); @@ -633,7 +633,7 @@ void append_to_parent_field_class(struct ctx *ctx, break; } default: - abort(); + bt_common_abort(); } } @@ -1337,7 +1337,7 @@ int translate_field_class(struct ctx *ctx) BT_FIELD_CLASS_TYPE_VARIANT)) { ret = translate_variant_field_class(ctx); } else { - abort(); + bt_common_abort(); } return ret; @@ -1407,7 +1407,7 @@ int set_field_ref(struct fs_sink_ctf_field_class *fc, const char *fc_name, break; } default: - abort(); + bt_common_abort(); } BT_ASSERT(field_ref); diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c index 6588c13b..ff2b3d8b 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.c +++ b/src/plugins/ctf/fs-src/data-stream-file.c @@ -770,7 +770,7 @@ bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next( * medium-specific; there is nothing for the user to do * and it should have been handled upstream. */ - abort(); + bt_common_abort(); case BT_MSG_ITER_STATUS_INVAL: case BT_MSG_ITER_STATUS_ERROR: default: diff --git a/src/plugins/ctf/fs-src/fs.c b/src/plugins/ctf/fs-src/fs.c index 28e2b811..c9315227 100644 --- a/src/plugins/ctf/fs-src/fs.c +++ b/src/plugins/ctf/fs-src/fs.c @@ -1490,7 +1490,7 @@ int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace, ds_file->msg_iter, cs); break; default: - abort(); + bt_common_abort(); } if (iter_status) { ret = -1; diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c index 699c5c92..c28af3d5 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.c +++ b/src/plugins/ctf/lttng-live/lttng-live.c @@ -82,7 +82,7 @@ const char *print_live_iterator_status(enum lttng_live_iterator_status status) case LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED: return "LTTNG_LIVE_ITERATOR_STATUS_UNSUPPORTED"; default: - abort(); + bt_common_abort(); } } @@ -359,11 +359,11 @@ enum lttng_live_iterator_status lttng_live_iterator_next_check_stream_state( case LTTNG_LIVE_STREAM_ACTIVE_NO_DATA: /* Invalid state. */ BT_COMP_LOGF("Unexpected stream state \"ACTIVE_NO_DATA\""); - abort(); + bt_common_abort(); case LTTNG_LIVE_STREAM_QUIESCENT_NO_DATA: /* Invalid state. */ BT_COMP_LOGF("Unexpected stream state \"QUIESCENT_NO_DATA\""); - abort(); + bt_common_abort(); case LTTNG_LIVE_STREAM_EOF: break; } @@ -1458,7 +1458,7 @@ end: put_messages(msgs, *count); break; default: - abort(); + bt_common_abort(); } no_session: @@ -1545,7 +1545,7 @@ bt_component_class_message_iterator_initialize_method_status lttng_live_msg_iter lttng_live->params.url->str); break; default: - abort(); + bt_common_abort(); } } diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c index b9278467..de8f3dc9 100644 --- a/src/plugins/ctf/lttng-live/metadata.c +++ b/src/plugins/ctf/lttng-live/metadata.c @@ -191,7 +191,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update( case LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR: goto error; default: - abort(); + bt_common_abort(); } } diff --git a/src/plugins/lttng-utils/debug-info/debug-info.c b/src/plugins/lttng-utils/debug-info/debug-info.c index e91b04c6..374ec222 100644 --- a/src/plugins/lttng-utils/debug-info/debug-info.c +++ b/src/plugins/lttng-utils/debug-info/debug-info.c @@ -1697,7 +1697,7 @@ const bt_message *handle_message(struct debug_info_msg_iter *debug_it, out_message = handle_discarded_packets_message(debug_it, in_message); break; default: - abort(); + bt_common_abort(); break; } diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c index 19ad1f2f..a513adcf 100644 --- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c +++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c @@ -32,6 +32,7 @@ #include #include "common/assert.h" +#include "common/common.h" #include "trace-ir-data-copy.h" @@ -103,7 +104,7 @@ enum debug_info_trace_ir_mapping_status copy_trace_content( out_trace, value_name, bt_value_string_get(value)); } else { - abort(); + bt_common_abort(); } if (set_env_status != BT_TRACE_SET_ENVIRONMENT_ENTRY_STATUS_OK) { @@ -455,7 +456,7 @@ enum debug_info_trace_ir_mapping_status copy_field_content( goto end; } } else { - abort(); + bt_common_abort(); } BT_COMP_LOGT("Copied content of field: in-f-addr=%p, out-f-addr=%p", diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c index 73f3515c..7ae0c46e 100644 --- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c +++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c @@ -94,7 +94,7 @@ const bt_field_class *walk_field_path(struct trace_ir_metadata_maps *md_maps, curr_fc); break; } else { - abort(); + bt_common_abort(); } } @@ -132,7 +132,7 @@ const bt_field_class *resolve_field_path_to_field_class(const bt_field_path *fp, fc_resolving_ctx->event_payload); break; default: - abort(); + bt_common_abort(); } return fc; @@ -962,7 +962,7 @@ enum debug_info_trace_ir_mapping_status copy_field_class_content_internal( status = field_class_variant_copy(md_maps, in_field_class, out_field_class); } else { - abort(); + bt_common_abort(); } return status; diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c index 875ed6bf..c29a02f3 100644 --- a/src/plugins/text/details/details.c +++ b/src/plugins/text/details/details.c @@ -384,7 +384,7 @@ bt_component_class_initialize_method_status details_init( status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; break; default: - abort(); + bt_common_abort(); } details_comp = create_details_comp(comp); @@ -518,7 +518,7 @@ details_consume(bt_self_component_sink *comp) ret = BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_MEMORY_ERROR; goto end; default: - abort(); + bt_common_abort(); } end: diff --git a/src/plugins/text/details/write.c b/src/plugins/text/details/write.c index 3eef84a8..faf59f36 100644 --- a/src/plugins/text/details/write.c +++ b/src/plugins/text/details/write.c @@ -102,7 +102,7 @@ void format_uint(char *buf, uint64_t value, unsigned int base) break; default: - abort(); + bt_common_abort(); } sprintf(buf_start, spec, value); @@ -155,7 +155,7 @@ void format_int(char *buf, int64_t value, unsigned int base) break; default: - abort(); + bt_common_abort(); } sprintf(buf_start, spec, abs_value); @@ -483,7 +483,7 @@ void write_value(struct details_write_ctx *ctx, const bt_value *value, break; } default: - abort(); + bt_common_abort(); } g_ptr_array_free(keys, TRUE); @@ -531,7 +531,7 @@ void write_int_field_class_props(struct details_write_ctx *ctx, write_uint_prop_value(ctx, 16); break; default: - abort(); + bt_common_abort(); } if (close) { @@ -788,7 +788,7 @@ void write_field_path(struct details_write_ctx *ctx, write_str_prop_value(ctx, "Event payload"); break; default: - abort(); + bt_common_abort(); } g_string_append(ctx->str, ": "); @@ -810,7 +810,7 @@ void write_field_path(struct details_write_ctx *ctx, write_str_prop_value(ctx, ""); break; default: - abort(); + bt_common_abort(); } } @@ -975,7 +975,7 @@ void write_field_class(struct details_write_ctx *ctx, const bt_field_class *fc) type = "Variant (signed integer selector)"; break; default: - abort(); + bt_common_abort(); } g_string_append_printf(ctx->str, "%s%s%s", @@ -1317,7 +1317,7 @@ void write_event_class(struct details_write_ctx *ctx, const bt_event_class *ec) ll_str = "Debug"; break; default: - abort(); + bt_common_abort(); } write_str_prop_line(ctx, "Log level", ll_str); @@ -1823,7 +1823,7 @@ void write_field(struct details_write_ctx *ctx, const bt_field *field, fmt_base = 16; break; default: - abort(); + bt_common_abort(); } if (bt_field_class_type_is(fc_type, @@ -1918,7 +1918,7 @@ void write_field(struct details_write_ctx *ctx, const bt_field *field, bt_field_variant_borrow_selected_option_field_const( field), NULL); } else { - abort(); + bt_common_abort(); } } @@ -2136,7 +2136,7 @@ void write_trace(struct details_write_ctx *ctx, const bt_trace *trace) write_str_prop_value(ctx, bt_value_string_get(value)); } else { - abort(); + bt_common_abort(); } write_nl(ctx); @@ -2575,7 +2575,7 @@ int details_write_message(struct details_comp *details_comp, ret = write_discarded_packets_message(&ctx, msg); break; default: - abort(); + bt_common_abort(); } /* diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c index 02666ada..c516672c 100644 --- a/src/plugins/text/dmesg/dmesg.c +++ b/src/plugins/text/dmesg/dmesg.c @@ -375,7 +375,7 @@ bt_component_class_initialize_method_status create_port( status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR; break; default: - abort(); + bt_common_abort(); } return status; diff --git a/src/plugins/text/pretty/pretty.c b/src/plugins/text/pretty/pretty.c index d496734f..8cb3b472 100644 --- a/src/plugins/text/pretty/pretty.c +++ b/src/plugins/text/pretty/pretty.c @@ -430,7 +430,7 @@ bt_component_class_initialize_method_status apply_params( pretty->options.print_scope_field_names = false; break; default: - abort(); + bt_common_abort(); } apply_one_bool_if_specified("name-payload", params, @@ -492,7 +492,7 @@ bt_component_class_initialize_method_status apply_params( pretty->options.print_callsite_field = false; break; default: - abort(); + bt_common_abort(); } apply_one_bool_if_specified("field-trace", params, diff --git a/src/plugins/text/pretty/print.c b/src/plugins/text/pretty/print.c index 6fb1e9fd..c2f202ae 100644 --- a/src/plugins/text/pretty/print.c +++ b/src/plugins/text/pretty/print.c @@ -708,7 +708,7 @@ int print_enum(struct pretty_component *pretty, &label_array, &label_count); break; default: - abort(); + bt_common_abort(); } if (ret) { @@ -1383,7 +1383,7 @@ int pretty_print_discarded_items(struct pretty_component *pretty, elem_type = "packet"; break; default: - abort(); + bt_common_abort(); } BT_ASSERT(stream); @@ -1411,7 +1411,7 @@ int pretty_print_discarded_items(struct pretty_component *pretty, break; default: - abort(); + bt_common_abort(); } print_discarded_elements_msg(pretty, stream, begin, end, diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c index 18e716bd..a2db3cb9 100644 --- a/src/plugins/utils/muxer/muxer.c +++ b/src/plugins/utils/muxer/muxer.c @@ -714,7 +714,7 @@ int validate_clock_class(struct muxer_msg_iter *muxer_msg_iter, BT_COMP_LOGF("Unexpected clock class expectation: " "expectation-code=%d", muxer_msg_iter->clock_class_expectation); - abort(); + bt_common_abort(); } goto end; diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c index 892781d0..a3016212 100644 --- a/src/plugins/utils/trimmer/trimmer.c +++ b/src/plugins/utils/trimmer/trimmer.c @@ -1934,7 +1934,7 @@ bt_component_class_message_iterator_next_method_status trimmer_msg_iter_next( status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END; break; default: - abort(); + bt_common_abort(); } } diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c index 11a74821..eb736399 100644 --- a/src/python-plugin-provider/python-plugin-provider.c +++ b/src/python-plugin-provider/python-plugin-provider.c @@ -143,7 +143,7 @@ int init_python(void) ret = BT_FUNC_STATUS_ERROR; goto end; default: - abort(); + bt_common_abort(); } /* diff --git a/tests/param-validation/Makefile.am b/tests/param-validation/Makefile.am index 7dbf58ac..b2f96a88 100644 --- a/tests/param-validation/Makefile.am +++ b/tests/param-validation/Makefile.am @@ -6,4 +6,6 @@ test_param_validation_LDADD = \ $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \ $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ + $(top_builddir)/src/common/libbabeltrace2-common.la \ + $(top_builddir)/src/logging/libbabeltrace2-logging.la \ $(top_builddir)/tests/utils/tap/libtap.la -- 2.34.1