X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=df73244b22e969978054b679d7330c97357d1f6e;hb=867eb7632255f6a84234542198bd7edaac1bce12;hp=ee11fad0ce5b0b682a0837f2acaf8dadf3b0c306;hpb=f80e9ec14e8608e514891297246112606975b5f8;p=babeltrace.git diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c index ee11fad0..df73244b 100644 --- a/src/lib/lib-logging.c +++ b/src/lib/lib-logging.c @@ -1,23 +1,7 @@ /* - * Copyright 2018 Philippe Proulx - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * SPDX-License-Identifier: MIT * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright 2018 Philippe Proulx */ #define BT_LOG_TAG "LIB/LIB-LOGGING" @@ -28,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -36,8 +21,7 @@ #include #include "logging.h" -#include "assert-pre.h" -#include "assert-post.h" +#include "assert-cond.h" #include "value.h" #include "integer-range-set.h" #include "object-pool.h" @@ -73,7 +57,6 @@ #include "trace-ir/trace.h" #include "trace-ir/utils.h" #include "error.h" -#include "assert-pre.h" #define LIB_LOGGING_BUF_SIZE (4096 * 4) @@ -110,7 +93,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'; \ @@ -346,6 +329,8 @@ static inline void format_field_integer_extended(char **buf_ch, fmt = ", %svalue=%" PRIx64; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" if (field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || field_class->common.type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION) { if (!fmt) { @@ -360,6 +345,7 @@ static inline void format_field_integer_extended(char **buf_ch, BUF_APPEND(fmt, PRFIELD(integer->value.u)); } +#pragma GCC diagnostic pop } static inline void format_field(char **buf_ch, bool extended, @@ -489,7 +475,7 @@ static inline void format_field_path(char **buf_ch, bool extended, BUF_APPEND("%s", ", "); break; default: - abort(); + bt_common_abort(); } } @@ -946,7 +932,7 @@ static inline void format_message(char **buf_ch, bool extended, char tmp_prefix[TMP_PREFIX_LEN]; BUF_APPEND(", %stype=%s", - PRFIELD(bt_message_type_string(msg->type))); + PRFIELD(bt_common_message_type_string(msg->type))); if (!extended) { return; @@ -1071,7 +1057,7 @@ static inline void format_component_class(char **buf_ch, bool extended, char tmp_prefix[TMP_PREFIX_LEN]; BUF_APPEND(", %stype=%s, %sname=\"%s\"", - PRFIELD(bt_component_class_type_string(comp_class->type)), + PRFIELD(bt_common_component_class_type_string(comp_class->type)), PRFIELD_GSTRING(comp_class->name)); if (comp_class->description) { @@ -1197,12 +1183,19 @@ 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) { char tmp_prefix[TMP_PREFIX_LEN]; - const struct bt_self_component_port_input_message_iterator * + const struct bt_message_iterator * port_in_iter = (const void *) iterator; if (port_in_iter->upstream_component) { @@ -1342,7 +1335,7 @@ static inline void format_error_cause(char **buf_ch, bool extended, if (comp_class_id) { BUF_APPEND(", %scomp-cls-type=%s, %scomp-cls-name=\"%s\", " "%splugin-name=\"%s\"", - PRFIELD(bt_component_class_type_string( + PRFIELD(bt_common_component_class_type_string( comp_class_id->type)), PRFIELD_GSTRING(comp_class_id->name), PRFIELD_GSTRING(comp_class_id->plugin_name)); @@ -1446,6 +1439,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; @@ -1480,7 +1476,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: @@ -1488,6 +1484,15 @@ update_fmt: *out_fmt_ch = fmt_ch; } +void bt_lib_log_v(const char *func, const char *file, unsigned line, + int lvl, const char *tag, const char *fmt, va_list *args) +{ + BT_ASSERT(fmt); + bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!', + handle_conversion_specifier_bt, NULL, fmt, args); + _bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf); +} + void bt_lib_log(const char *func, const char *file, unsigned line, int lvl, const char *tag, const char *fmt, ...) { @@ -1495,10 +1500,8 @@ void bt_lib_log(const char *func, const char *file, unsigned line, BT_ASSERT(fmt); va_start(args, fmt); - bt_common_custom_vsnprintf(lib_logging_buf, LIB_LOGGING_BUF_SIZE, '!', - handle_conversion_specifier_bt, NULL, fmt, &args); + bt_lib_log_v(func, file, line, lvl, tag, fmt, &args); va_end(args); - _bt_log_write_d(func, file, line, lvl, tag, "%s", lib_logging_buf); } void bt_lib_maybe_log_and_append_cause(const char *func, const char *file, @@ -1521,7 +1524,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