X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=02f18ed5a9d94e500f522dbe22492af10160f72f;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=af30bd2f82c0817b43bf03f1b22bb325df65fc3e;hpb=fe4df857056b4a03898f1031f136359ce733b0f5;p=babeltrace.git diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c index af30bd2f..02f18ed5 100644 --- a/src/lib/lib-logging.c +++ b/src/lib/lib-logging.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -110,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'; \ @@ -239,7 +240,8 @@ static inline void format_field_class(char **buf_ch, bool extended, BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length)); break; } - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD: { const struct bt_field_class_array_dynamic *array_fc = (const void *) field_class; @@ -260,7 +262,10 @@ static inline void format_field_class(char **buf_ch, bool extended, break; } - case BT_FIELD_CLASS_TYPE_OPTION: + case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { const struct bt_field_class_option *opt_fc = (const void *) field_class; @@ -269,23 +274,29 @@ static inline void format_field_class(char **buf_ch, bool extended, PRFIELD(opt_fc->content_fc), PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type))); - if (opt_fc->selector_fc) { - SET_TMP_PREFIX("selector-fc-"); - format_field_class(buf_ch, extended, tmp_prefix, - opt_fc->selector_fc); - } + if (field_class->type != + BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) { + const struct bt_field_class_option_with_selector_field *opt_with_sel_fc = + (const void *) field_class; - if (opt_fc->selector_field_path) { - SET_TMP_PREFIX("selector-field-path-"); - format_field_path(buf_ch, extended, tmp_prefix, - opt_fc->selector_field_path); + if (opt_with_sel_fc->selector_fc) { + SET_TMP_PREFIX("selector-fc-"); + format_field_class(buf_ch, extended, tmp_prefix, + opt_with_sel_fc->selector_fc); + } + + if (opt_with_sel_fc->selector_field_path) { + SET_TMP_PREFIX("selector-field-path-"); + format_field_path(buf_ch, extended, tmp_prefix, + opt_with_sel_fc->selector_field_path); + } } break; } - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: + case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { const struct bt_field_class_variant *var_fc = (const void *) field_class; @@ -295,9 +306,9 @@ static inline void format_field_class(char **buf_ch, bool extended, PRFIELD(var_fc->common.named_fcs->len)); } - if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR || - field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) { - const struct bt_field_class_variant_with_selector *var_with_sel_fc = + if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD || + field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) { + const struct bt_field_class_variant_with_selector_field *var_with_sel_fc = (const void *) var_fc; if (var_with_sel_fc->selector_fc) { @@ -419,7 +430,8 @@ static inline void format_field(char **buf_ch, bool extended, break; } case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD: { const struct bt_field_array *array_field = (const void *) field; @@ -432,9 +444,9 @@ static inline void format_field(char **buf_ch, bool extended, break; } - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: + case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { const struct bt_field_variant *var_field = (const void *) field; @@ -478,7 +490,7 @@ static inline void format_field_path(char **buf_ch, bool extended, BUF_APPEND("%s", ", "); break; default: - abort(); + bt_common_abort(); } } @@ -898,9 +910,8 @@ static inline void format_value(char **buf_ch, bool extended, } case BT_VALUE_TYPE_ARRAY: { - int64_t count = bt_value_array_get_length(value); + uint64_t count = bt_value_array_get_length(value); - BT_ASSERT(count >= 0); BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count)); break; } @@ -1187,6 +1198,13 @@ static inline void format_graph(char **buf_ch, bool extended, &graph->packet_end_msg_pool); } +static inline void format_message_iterator_class(char **buf_ch, + bool extended, const char *prefix, + const struct bt_message_iterator_class *iterator_class) +{ + /* Empty, the address is automatically printed. */ +} + static inline void format_message_iterator(char **buf_ch, bool extended, const char *prefix, const struct bt_message_iterator *iterator) @@ -1436,6 +1454,9 @@ static inline void handle_conversion_specifier_bt(void *priv_data, case 'n': format_message(buf_ch, extended, prefix, obj); break; + case 'I': + format_message_iterator_class(buf_ch, extended, prefix, obj); + break; case 'i': format_message_iterator(buf_ch, extended, prefix, obj); break; @@ -1470,7 +1491,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: @@ -1511,7 +1532,8 @@ void bt_lib_maybe_log_and_append_cause(const char *func, const char *file, } status = bt_current_thread_error_append_cause_from_unknown( - "Babeltrace library", file, line, "%s", lib_logging_buf); + BT_LIB_LOG_LIBBABELTRACE2_NAME, file, line, "%s", + lib_logging_buf); if (status) { /* * Worst case: this error cause is not appended to the