From ef267d12284b855bc52ee429a5dc12da1d1e3b95 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 20 Jun 2019 14:23:39 -0400 Subject: [PATCH] Rename VERBOSE log level to TRACE Some people reported that they have a hard time guessing whether the VERBOSE log level is more or less verbose than the DEBUG log level. The existing logging frameworks I looked at (Apache Log4j 2, SLF4J, `java.util.logging`, syslog, Python, Ruby, Boost.Test, ASP.NET Core, to name a few popular ones) do not have the VERBOSE level; they almost always have the DEBUG level, and sometimes the TRACE level. To conform with the common practice, let's use TRACE instead of VERBOSE. It is my wish that DEBUG vs. TRACE will speak to more developers than DEBUG vs. VERBOSE. This means that BT_LOGV() and its variants become BT_LOGT(). Also, the log level environment variables and the CLI's `--log-level` parameter accept `T` and `TRACE` instead of `V` and `VERBOSE`. In the log output, the messages contain `T` instead of `V`: 06-20 14:31:23.356 3612 3612 T PLUGIN/CTF/BFCR read_unsigned_bitfield@bfcr.c:483 [N/A] Read unsigned bit array: cur=32, size=8, bo=1, val=33 `CONTRIBUTING.adoc` is updated to document the TRACE level instead of the VERBOSE level. Signed-off-by: Philippe Proulx Change-Id: I20460c4569f8b755440511c6621a68a1ef6424fc Reviewed-on: https://review.lttng.org/c/babeltrace/+/1524 CI-Build: Simon Marchi CI-Build: Jonathan Rajotte Julien Reviewed-by: Francis Deslauriers Tested-by: jenkins --- CONTRIBUTING.adoc | 60 ++++---- configure.ac | 6 +- doc/man/babeltrace2.1.txt | 8 +- include/babeltrace2/logging.h | 2 +- src/bindings/python/bt2/bt2/logging.py | 4 +- .../python/bt2/bt2/native_bt_logging.i | 2 +- src/bindings/python/bt2/bt2/utils.py | 2 +- src/cli/babeltrace2-cfg-cli-args.c | 12 +- src/cli/babeltrace2.c | 20 +-- src/common/common.h | 4 +- src/ctf-writer/clock-class.c | 42 +++--- src/ctf-writer/event-class.c | 10 +- src/ctf-writer/event-class.h | 14 +- src/ctf-writer/event.c | 12 +- src/ctf-writer/event.h | 8 +- src/ctf-writer/field-types.c | 138 +++++++++--------- src/ctf-writer/fields.c | 28 ++-- src/ctf-writer/fields.h | 2 +- src/ctf-writer/object-pool.h | 24 +-- src/ctf-writer/object.h | 24 +-- src/ctf-writer/resolve.c | 38 ++--- src/ctf-writer/stream-class.c | 10 +- src/ctf-writer/stream-class.h | 16 +- src/ctf-writer/stream.c | 76 +++++----- src/ctf-writer/stream.h | 2 +- src/ctf-writer/trace.c | 16 +- src/ctf-writer/utils.c | 2 +- src/ctf-writer/validation.c | 20 +-- src/ctf-writer/values.c | 34 ++--- src/lib/logging.h | 2 +- src/lib/object-pool.h | 16 +- src/lib/object.h | 16 +- src/lib/value.c | 38 ++--- src/logging/log.c | 8 +- src/logging/log.h | 64 ++++---- src/plugins/comp-logging.h | 16 +- src/plugins/ctf/common/bfcr/bfcr.c | 82 +++++------ .../ctf/common/metadata/ctf-meta-resolve.c | 4 +- src/plugins/ctf/common/metadata/decoder.c | 2 +- src/plugins/ctf/common/metadata/lexer.l | 2 +- src/plugins/ctf/common/metadata/logging.h | 8 +- src/plugins/ctf/common/metadata/parser.y | 14 +- .../ctf/common/metadata/visitor-generate-ir.c | 4 +- src/plugins/ctf/common/msg-iter/msg-iter.c | 54 +++---- .../debug-info/trace-ir-data-copy.c | 4 +- src/plugins/utils/muxer/muxer.c | 6 +- 46 files changed, 488 insertions(+), 488 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index c800b70e..f821e7c8 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -246,7 +246,7 @@ can find the cause of a bug faster. While <> when placing _DEBUG_ to _FATAL_ logging statements, you should liberally instrument your -Babeltrace module with _VERBOSE_ logging statements to help future you +Babeltrace module with _TRACE_ logging statements to help future you and other developers understand what's happening at run time. @@ -315,10 +315,10 @@ order of severity: |Internal API enumerator |Public API enumerator -|_VERBOSE_ -|`V` -|`BT_LOG_VERBOSE` -|`BT_LOGGING_LEVEL_VERBOSE` +|_TRACE_ +|`T` +|`BT_LOG_TRACE` +|`BT_LOGGING_LEVEL_TRACE` |_DEBUG_ |`D` @@ -475,8 +475,8 @@ See <> and <> to learn how to be able to use the following macros. -`+BT_LOGV("format string", ...)+`:: - Generic verbose logging statement. +`+BT_LOGT("format string", ...)+`:: + Generic trace logging statement. `+BT_LOGD("format string", ...)+`:: Generic debug logging statement. @@ -493,8 +493,8 @@ file (generic)>> to learn how to be able to use the following macros. `+BT_LOGF("format string", ...)+`:: Generic fatal logging statement. -`+BT_LOGV_STR("preformatted string")+`:: - Generic preformatted string verbose logging statement. +`+BT_LOGT_STR("preformatted string")+`:: + Generic preformatted string trace logging statement. `+BT_LOGD_STR("preformatted string")+`:: Generic preformatted string debug logging statement. @@ -511,8 +511,8 @@ file (generic)>> to learn how to be able to use the following macros. `+BT_LOGF_STR("preformatted string")+`:: Generic preformatted string fatal logging statement. -`+BT_LOGV_MEM(data_ptr, data_size, "format string", ...)+`:: - Generic memory verbose logging statement. +`+BT_LOGT_MEM(data_ptr, data_size, "format string", ...)+`:: + Generic memory trace logging statement. `+BT_LOGD_MEM(data_ptr, data_size, "format string", ...)+`:: Generic memory debug logging statement. @@ -529,8 +529,8 @@ file (generic)>> to learn how to be able to use the following macros. `+BT_LOGF_MEM(data_ptr, data_size, "format string", ...)+`:: Generic memory fatal logging statement. -`+BT_LOGV_ERRNO("initial message", "format string", ...)+`:: - Generic `errno` string verbose logging statement. +`+BT_LOGT_ERRNO("initial message", "format string", ...)+`:: + Generic `errno` string trace logging statement. `+BT_LOGD_ERRNO("initial message", "format string", ...)+`:: Generic `errno` string debug logging statement. @@ -562,8 +562,8 @@ learn how to be able to use the following macros. The library logging statement macros are named `+BT_LIB_LOG*()+` instead of `+BT_LOG*()+`: -`+BT_LIB_LOGV("format string", ...)+`:: - Library verbose logging statement. +`+BT_LIB_LOGT("format string", ...)+`:: + Library trace logging statement. `+BT_LIB_LOGD("format string", ...)+`:: Library debug logging statement. @@ -753,8 +753,8 @@ following macros. The component logging statement macros are named `+BT_COMP_LOG*()+` instead of `+BT_LOG*()+`: -`+BT_COMP_LOGV("format string", ...)+`:: - Component verbose logging statement. +`+BT_COMP_LOGT("format string", ...)+`:: + Component trace logging statement. `+BT_COMP_LOGD("format string", ...)+`:: Component debug logging statement. @@ -771,8 +771,8 @@ instead of `+BT_LOG*()+`: `+BT_COMP_LOGF("format string", ...)+`:: Component fatal logging statement. -`+BT_COMP_LOGV_STR("preformatted string")+`:: - Component preformatted string verbose logging statement. +`+BT_COMP_LOGT_STR("preformatted string")+`:: + Component preformatted string trace logging statement. `+BT_COMP_LOGD_STR("preformatted string")+`:: Component preformatted string debug logging statement. @@ -789,8 +789,8 @@ instead of `+BT_LOG*()+`: `+BT_COMP_LOGF_STR("preformatted string")+`:: Component preformatted string fatal logging statement. -`+BT_COMP_LOGV_ERRNO("initial message", "format string", ...)+`:: - Component `errno` string verbose logging statement. +`+BT_COMP_LOGT_ERRNO("initial message", "format string", ...)+`:: + Component `errno` string trace logging statement. `+BT_COMP_LOGD_ERRNO("initial message", "format string", ...)+`:: Component `errno` string debug logging statement. @@ -807,8 +807,8 @@ instead of `+BT_LOG*()+`: `+BT_COMP_LOGF_ERRNO("initial message", "format string", ...)+`:: Component `errno` string fatal logging statement. -`+BT_COMP_LOGV_MEM(data_ptr, data_size, "format string", ...)+`:: - Component memory verbose logging statement. +`+BT_COMP_LOGT_MEM(data_ptr, data_size, "format string", ...)+`:: + Component memory trace logging statement. `+BT_COMP_LOGD_MEM(data_ptr, data_size, "format string", ...)+`:: Component memory debug logging statement. @@ -857,7 +857,7 @@ block. The available definitions for build-time conditions are: -* `BT_LOG_ENABLED_VERBOSE` +* `BT_LOG_ENABLED_TRACE` * `BT_LOG_ENABLED_DEBUG` * `BT_LOG_ENABLED_INFO` * `BT_LOG_ENABLED_WARN` @@ -879,7 +879,7 @@ noticeable impact on performance. The available definitions for run-time conditions are: -* `BT_LOG_ON_VERBOSE` +* `BT_LOG_ON_TRACE` * `BT_LOG_ON_DEBUG` * `BT_LOG_ON_INFO` * `BT_LOG_ON_WARN` @@ -991,8 +991,8 @@ int some_function(int x) { /* ... */ -#ifdef BT_LOGV - BT_LOGV(...); +#ifdef BT_LOGT + BT_LOGT(...); #endif /* ... */ @@ -1327,11 +1327,11 @@ an _INFO_ build. * Calling user methods and logging the result. * Setting object properties (except fields and values). | -Noticeable, but not as much as the _VERBOSE_ level: could be executed +Noticeable, but not as much as the _TRACE_ level: could be executed in production if you're going to need a thorough log for support tickets without having to rebuild the project. -|_VERBOSE_ +|_TRACE_ | Low-level debugging context information (anything that does not fit the other log levels). More appropriate for tracing in general. @@ -1353,7 +1353,7 @@ For example, a public function to get some object or property from an object by name or key that fails to find the value is not a warning scenario: the user could legitimately use this function to check if the name/key exists in the object. In this case, use the -_VERBOSE_ level (or do not log at all). +_TRACE_ level (or do not log at all). -- diff --git a/configure.ac b/configure.ac index 693fa641..c265be67 100644 --- a/configure.ac +++ b/configure.ac @@ -386,16 +386,16 @@ AC_ARG_VAR([PLUGINSDIR], [built-in plugins install directory [LIBDIR/babeltrace2 AS_IF([test "x$PLUGINSDIR" = x], [PLUGINSDIR='$(libdir)/babeltrace2/plugins']) # BABELTRACE_MINIMAL_LOG_LEVEL: -AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (VERBOSE, DEBUG (default), INFO, WARN, ERROR, FATAL, or NONE)]) +AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (TRACE, DEBUG (default), INFO, WARN, ERROR, FATAL, or NONE)]) AS_IF([test "x$BABELTRACE_MINIMAL_LOG_LEVEL" = x], [BABELTRACE_MINIMAL_LOG_LEVEL="DEBUG"]) -AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "VERBOSE" && \ +AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "TRACE" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "DEBUG" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "INFO" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "WARN" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "ERROR" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "FATAL" && \ test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "NONE"], - [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use VERBOSE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.])] + [AC_MSG_ERROR([Invalid BABELTRACE_MINIMAL_LOG_LEVEL value ($BABELTRACE_MINIMAL_LOG_LEVEL): use TRACE, DEBUG, INFO, WARN, ERROR, FATAL, or NONE.])] ) AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level]) diff --git a/doc/man/babeltrace2.1.txt b/doc/man/babeltrace2.1.txt index 413930c9..b2d69de0 100644 --- a/doc/man/babeltrace2.1.txt +++ b/doc/man/babeltrace2.1.txt @@ -49,7 +49,7 @@ OPTIONS opt:-d, opt:--debug:: Turn the debugging mode on. + -This is equivalent to opt:--log-level=`VERBOSE`. +This is equivalent to opt:--log-level=`TRACE`. opt:-l 'LVL', opt:--log-level='LVL':: Set the log level of all known Babeltrace loggers to 'LVL'. You @@ -91,10 +91,10 @@ The available values for 'LVL' are: `DEBUG`:: `D`:: Debugging information, with a higher level of details than the - `VERBOSE` level. This level should :not: be enabled in production. + `TRACE` level. This level should :not: be enabled in production. -`VERBOSE`:: -`V`:: +`TRACE`:: +`T`:: Low-level debugging context information. This level should :not: be enabled in production. -- diff --git a/include/babeltrace2/logging.h b/include/babeltrace2/logging.h index b6b89287..5001e139 100644 --- a/include/babeltrace2/logging.h +++ b/include/babeltrace2/logging.h @@ -62,7 +62,7 @@ current global log level and the minimal log level are not executed. */ typedef enum bt_logging_level { /// Additional, low-level debugging context information. - BT_LOGGING_LEVEL_VERBOSE = 1, + BT_LOGGING_LEVEL_TRACE = 1, /** Debugging information, only useful when searching for the diff --git a/src/bindings/python/bt2/bt2/logging.py b/src/bindings/python/bt2/bt2/logging.py index 51d898cc..f2a87e86 100644 --- a/src/bindings/python/bt2/bt2/logging.py +++ b/src/bindings/python/bt2/bt2/logging.py @@ -25,7 +25,7 @@ import bt2 class LoggingLevel: - VERBOSE = native_bt.LOGGING_LEVEL_VERBOSE + TRACE = native_bt.LOGGING_LEVEL_TRACE DEBUG = native_bt.LOGGING_LEVEL_DEBUG INFO = native_bt.LOGGING_LEVEL_INFO WARN = native_bt.LOGGING_LEVEL_WARN @@ -44,7 +44,7 @@ def get_global_logging_level(): def set_global_logging_level(level): levels = ( - LoggingLevel.VERBOSE, + LoggingLevel.TRACE, LoggingLevel.DEBUG, LoggingLevel.INFO, LoggingLevel.WARN, diff --git a/src/bindings/python/bt2/bt2/native_bt_logging.i b/src/bindings/python/bt2/bt2/native_bt_logging.i index df364bdf..5867cacf 100644 --- a/src/bindings/python/bt2/bt2/native_bt_logging.i +++ b/src/bindings/python/bt2/bt2/native_bt_logging.i @@ -28,7 +28,7 @@ /* Log levels */ enum bt_logging_level { - BT_LOGGING_LEVEL_VERBOSE = 1, + BT_LOGGING_LEVEL_TRACE = 1, BT_LOGGING_LEVEL_DEBUG = 2, BT_LOGGING_LEVEL_INFO = 3, BT_LOGGING_LEVEL_WARN = 4, diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py index 4329d93f..636e9213 100644 --- a/src/bindings/python/bt2/bt2/utils.py +++ b/src/bindings/python/bt2/bt2/utils.py @@ -132,7 +132,7 @@ def _check_log_level(log_level): _check_int(log_level) log_levels = ( - bt2.logging.LoggingLevel.VERBOSE, + bt2.logging.LoggingLevel.TRACE, bt2.logging.LoggingLevel.DEBUG, bt2.logging.LoggingLevel.INFO, bt2.logging.LoggingLevel.WARN, diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c index 6e9aac95..a6e61c10 100644 --- a/src/cli/babeltrace2-cfg-cli-args.c +++ b/src/cli/babeltrace2-cfg-cli-args.c @@ -4421,13 +4421,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[], stream_intersection_mode = true; break; case OPT_VERBOSE: - if (*default_log_level != BT_LOG_VERBOSE && + if (*default_log_level != BT_LOG_TRACE && *default_log_level != BT_LOG_DEBUG) { *default_log_level = BT_LOG_INFO; } break; case OPT_DEBUG: - *default_log_level = BT_LOG_VERBOSE; + *default_log_level = BT_LOG_TRACE; break; default: break; @@ -4986,17 +4986,17 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], if (strcmp(cur_arg, "-d") == 0 || strcmp(cur_arg, "--debug") == 0) { - default_log_level = BT_LOG_VERBOSE; + default_log_level = BT_LOG_TRACE; } else if (strcmp(cur_arg, "-v") == 0 || strcmp(cur_arg, "--verbose") == 0) { - if (default_log_level != BT_LOG_VERBOSE && + if (default_log_level != BT_LOG_TRACE && default_log_level != BT_LOG_DEBUG) { /* * Legacy: do not override a previous * --debug because --verbose and --debug * can be specified together (in this * case we want the lowest log level to - * apply, VERBOSE). + * apply, TRACE). */ default_log_level = BT_LOG_INFO; } @@ -5138,7 +5138,7 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[], } if (config) { - BT_ASSERT(default_log_level >= BT_LOG_VERBOSE); + BT_ASSERT(default_log_level >= BT_LOG_TRACE); config->log_level = default_log_level; config->command_name = command_name; } diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index c8c8e821..396673d0 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -2374,7 +2374,7 @@ int cmd_run_ctx_create_components_from_config_components( goto error; } - BT_ASSERT(cfg_comp->log_level >= BT_LOG_VERBOSE); + BT_ASSERT(cfg_comp->log_level >= BT_LOG_TRACE); switch (cfg_comp->type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: @@ -2646,7 +2646,7 @@ int cmd_run(struct bt_config *cfg) printf("%s", bt_common_color_reset()); fflush(stdout); fprintf(stderr, "%s", bt_common_color_reset()); - BT_LOGV("bt_graph_run() returned: status=%s", + BT_LOGT("bt_graph_run() returned: status=%s", bt_graph_status_str(graph_status)); switch (graph_status) { @@ -2662,7 +2662,7 @@ int cmd_run(struct bt_config *cfg) } if (cfg->cmd_data.run.retry_duration_us > 0) { - BT_LOGV("Got BT_GRAPH_STATUS_AGAIN: sleeping: " + BT_LOGT("Got BT_GRAPH_STATUS_AGAIN: sleeping: " "time-us=%" PRIu64, cfg->cmd_data.run.retry_duration_us); @@ -2739,7 +2739,7 @@ void set_auto_log_levels(struct bt_config *cfg) */ if (getenv("BABELTRACE_DEBUG") && strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) { - cfg->log_level = BT_LOG_VERBOSE; + cfg->log_level = BT_LOG_TRACE; } else if (getenv("BABELTRACE_VERBOSE") && strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) { cfg->log_level = BT_LOG_INFO; @@ -2751,15 +2751,15 @@ void set_auto_log_levels(struct bt_config *cfg) * --verbose. So: * * --verbose: INFO log level - * --debug: VERBOSE log level (includes DEBUG, which is - * is less verbose than VERBOSE in the internal + * --debug: TRACE log level (includes DEBUG, which is + * is less verbose than TRACE in the internal * logging framework) */ if (!getenv("LIBBABELTRACE2_INIT_LOG_LEVEL")) { if (cfg->verbose) { bt_logging_set_global_level(BT_LOG_INFO); } else if (cfg->debug) { - bt_logging_set_global_level(BT_LOG_VERBOSE); + bt_logging_set_global_level(BT_LOG_TRACE); } else { /* * Set library's default log level if not @@ -2773,7 +2773,7 @@ void set_auto_log_levels(struct bt_config *cfg) if (cfg->verbose) { bt_cli_log_level = BT_LOG_INFO; } else if (cfg->debug) { - bt_cli_log_level = BT_LOG_VERBOSE; + bt_cli_log_level = BT_LOG_TRACE; } else { /* * Set CLI's default log level if not explicitly @@ -2788,9 +2788,9 @@ void set_auto_log_levels(struct bt_config *cfg) while (*env_var_name) { if (!getenv(*env_var_name)) { if (cfg->verbose) { - g_setenv(*env_var_name, "I", 1); + g_setenv(*env_var_name, "INFO", 1); } else if (cfg->debug) { - g_setenv(*env_var_name, "V", 1); + g_setenv(*env_var_name, "TRACE", 1); } else { char val[2] = { 0 }; diff --git a/src/common/common.h b/src/common/common.h index 31448a45..6f9fb65d 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -573,8 +573,8 @@ const char *bt_common_logging_level_string( enum bt_logging_level level) { switch (level) { - case BT_LOGGING_LEVEL_VERBOSE: - return "BT_LOGGING_LEVEL_VERBOSE"; + case BT_LOGGING_LEVEL_TRACE: + return "BT_LOGGING_LEVEL_TRACE"; case BT_LOGGING_LEVEL_DEBUG: return "BT_LOGGING_LEVEL_DEBUG"; case BT_LOGGING_LEVEL_INFO: diff --git a/src/ctf-writer/clock-class.c b/src/ctf-writer/clock-class.c index 9ffb9f67..c4332c53 100644 --- a/src/ctf-writer/clock-class.c +++ b/src/ctf-writer/clock-class.c @@ -89,7 +89,7 @@ int bt_ctf_clock_class_set_name(struct bt_ctf_clock_class *clock_class, } } - BT_LOGV("Set clock class's name: addr=%p, name=\"%s\"", + BT_LOGT("Set clock class's name: addr=%p, name=\"%s\"", clock_class, name); end: @@ -215,7 +215,7 @@ int bt_ctf_clock_class_set_description(struct bt_ctf_clock_class *clock_class, clock_class->description = g_string_new(desc); ret = clock_class->description ? 0 : -1; - BT_LOGV("Set clock class's description: addr=%p, " + BT_LOGT("Set clock class's description: addr=%p, " "name=\"%s\", desc=\"%s\"", clock_class, bt_ctf_clock_class_get_name(clock_class), desc); end: @@ -266,7 +266,7 @@ int bt_ctf_clock_class_set_frequency(struct bt_ctf_clock_class *clock_class, } clock_class->frequency = freq; - BT_LOGV("Set clock class's frequency: addr=%p, name=\"%s\", freq=%" PRIu64, + BT_LOGT("Set clock class's frequency: addr=%p, name=\"%s\", freq=%" PRIu64, clock_class, bt_ctf_clock_class_get_name(clock_class), freq); end: return ret; @@ -310,7 +310,7 @@ int bt_ctf_clock_class_set_precision(struct bt_ctf_clock_class *clock_class, } clock_class->precision = precision; - BT_LOGV("Set clock class's precision: addr=%p, name=\"%s\", precision=%" PRIu64, + BT_LOGT("Set clock class's precision: addr=%p, name=\"%s\", precision=%" PRIu64, clock_class, bt_ctf_clock_class_get_name(clock_class), precision); end: @@ -357,7 +357,7 @@ int bt_ctf_clock_class_set_offset_s(struct bt_ctf_clock_class *clock_class, } clock_class->offset_s = offset_s; - BT_LOGV("Set clock class's offset (seconds): " + BT_LOGT("Set clock class's offset (seconds): " "addr=%p, name=\"%s\", offset-s=%" PRId64, clock_class, bt_ctf_clock_class_get_name(clock_class), offset_s); @@ -405,7 +405,7 @@ int bt_ctf_clock_class_set_offset_cycles(struct bt_ctf_clock_class *clock_class, } clock_class->offset = offset; - BT_LOGV("Set clock class's offset (cycles): addr=%p, name=\"%s\", offset-cycles=%" PRId64, + BT_LOGT("Set clock class's offset (cycles): addr=%p, name=\"%s\", offset-cycles=%" PRId64, clock_class, bt_ctf_clock_class_get_name(clock_class), offset); end: return ret; @@ -446,7 +446,7 @@ int bt_ctf_clock_class_set_is_absolute(struct bt_ctf_clock_class *clock_class, } clock_class->absolute = !!is_absolute; - BT_LOGV("Set clock class's absolute flag: addr=%p, name=\"%s\", is-absolute=%d", + BT_LOGT("Set clock class's absolute flag: addr=%p, name=\"%s\", is-absolute=%d", clock_class, bt_ctf_clock_class_get_name(clock_class), is_absolute); end: @@ -466,7 +466,7 @@ const unsigned char *bt_ctf_clock_class_get_uuid( } if (!clock_class->uuid_set) { - BT_LOGV("Clock class's UUID is not set: addr=%p, name=\"%s\"", + BT_LOGT("Clock class's UUID is not set: addr=%p, name=\"%s\"", clock_class, bt_ctf_clock_class_get_name(clock_class)); ret = NULL; goto end; @@ -501,7 +501,7 @@ int bt_ctf_clock_class_set_uuid(struct bt_ctf_clock_class *clock_class, memcpy(clock_class->uuid, uuid, BABELTRACE_UUID_LEN); clock_class->uuid_set = 1; - BT_LOGV("Set clock class's UUID: addr=%p, name=\"%s\", " + BT_LOGT("Set clock class's UUID: addr=%p, name=\"%s\", " "uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"", clock_class, bt_ctf_clock_class_get_name(clock_class), (unsigned int) uuid[0], @@ -566,7 +566,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Name */ if (strcmp(clock_class_a->name->str, clock_class_b->name->str) != 0) { - BT_LOGV("Clock classes differ: different names: " + BT_LOGT("Clock classes differ: different names: " "cc-a-name=\"%s\", cc-b-name=\"%s\"", clock_class_a->name->str, clock_class_b->name->str); @@ -576,14 +576,14 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Description */ if (clock_class_a->description) { if (!clock_class_b->description) { - BT_LOGV_STR("Clock classes differ: clock class A has a " + BT_LOGT_STR("Clock classes differ: clock class A has a " "description, but clock class B does not."); goto end; } if (strcmp(clock_class_a->name->str, clock_class_b->name->str) != 0) { - BT_LOGV("Clock classes differ: different descriptions: " + BT_LOGT("Clock classes differ: different descriptions: " "cc-a-descr=\"%s\", cc-b-descr=\"%s\"", clock_class_a->description->str, clock_class_b->description->str); @@ -591,7 +591,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, } } else { if (clock_class_b->description) { - BT_LOGV_STR("Clock classes differ: clock class A has " + BT_LOGT_STR("Clock classes differ: clock class A has " "no description, but clock class B has one."); goto end; } @@ -599,7 +599,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Frequency */ if (clock_class_a->frequency != clock_class_b->frequency) { - BT_LOGV("Clock classes differ: different frequencies: " + BT_LOGT("Clock classes differ: different frequencies: " "cc-a-freq=%" PRIu64 ", cc-b-freq=%" PRIu64, clock_class_a->frequency, clock_class_b->frequency); @@ -608,7 +608,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Precision */ if (clock_class_a->precision != clock_class_b->precision) { - BT_LOGV("Clock classes differ: different precisions: " + BT_LOGT("Clock classes differ: different precisions: " "cc-a-freq=%" PRIu64 ", cc-b-freq=%" PRIu64, clock_class_a->precision, clock_class_b->precision); @@ -617,7 +617,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Offset (seconds) */ if (clock_class_a->offset_s != clock_class_b->offset_s) { - BT_LOGV("Clock classes differ: different offsets (seconds): " + BT_LOGT("Clock classes differ: different offsets (seconds): " "cc-a-offset-s=%" PRId64 ", cc-b-offset-s=%" PRId64, clock_class_a->offset_s, clock_class_b->offset_s); @@ -626,7 +626,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Offset (cycles) */ if (clock_class_a->offset != clock_class_b->offset) { - BT_LOGV("Clock classes differ: different offsets (cycles): " + BT_LOGT("Clock classes differ: different offsets (cycles): " "cc-a-offset-s=%" PRId64 ", cc-b-offset-s=%" PRId64, clock_class_a->offset, clock_class_b->offset); @@ -636,14 +636,14 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* UUIDs */ if (clock_class_a->uuid_set) { if (!clock_class_b->uuid_set) { - BT_LOGV_STR("Clock classes differ: clock class A has a " + BT_LOGT_STR("Clock classes differ: clock class A has a " "UUID, but clock class B does not."); goto end; } if (memcmp(clock_class_a->uuid, clock_class_b->uuid, BABELTRACE_UUID_LEN) != 0) { - BT_LOGV("Clock classes differ: different UUIDs: " + BT_LOGT("Clock classes differ: different UUIDs: " "cc-a-uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\", " "cc-b-uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"", (unsigned int) clock_class_a->uuid[0], @@ -682,7 +682,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, } } else { if (clock_class_b->uuid_set) { - BT_LOGV_STR("Clock classes differ: clock class A has " + BT_LOGT_STR("Clock classes differ: clock class A has " "no UUID, but clock class B has one."); goto end; } @@ -690,7 +690,7 @@ int bt_ctf_clock_class_compare(struct bt_ctf_clock_class *clock_class_a, /* Absolute */ if (!!clock_class_a->absolute != !!clock_class_b->absolute) { - BT_LOGV("Clock classes differ: one is absolute, the other " + BT_LOGT("Clock classes differ: one is absolute, the other " "is not: cc-a-is-absolute=%d, cc-b-is-absolute=%d", !!clock_class_a->absolute, !!clock_class_b->absolute); diff --git a/src/ctf-writer/event-class.c b/src/ctf-writer/event-class.c index 3830ea55..ac5d8926 100644 --- a/src/ctf-writer/event-class.c +++ b/src/ctf-writer/event-class.c @@ -353,7 +353,7 @@ int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class, ret = bt_ctf_field_type_structure_add_field( (void *) event_class->common.payload_field_type, (void *) type, name); - BT_LOGV("Added field to event class's payload field type: " + BT_LOGT("Added field to event class's payload field type: " "event-class-addr=%p, event-class-name=\"%s\", " "event-class-id=%" PRId64 ", field-name=\"%s\", ft-addr=%p", event_class, bt_ctf_event_class_get_name(event_class), @@ -374,7 +374,7 @@ int64_t bt_ctf_event_class_get_payload_type_field_count( } if (!event_class->common.payload_field_type) { - BT_LOGV("Event class has no payload field type: " + BT_LOGT("Event class has no payload field type: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_get_name(event_class), bt_ctf_event_class_get_id(event_class)); @@ -405,7 +405,7 @@ int bt_ctf_event_class_get_payload_type_field_by_index( } if (!event_class->common.payload_field_type) { - BT_LOGV("Event class has no payload field type: " + BT_LOGT("Event class has no payload field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", index=%" PRIu64, event_class, bt_ctf_event_class_get_name(event_class), bt_ctf_event_class_get_id(event_class), index); @@ -439,7 +439,7 @@ bt_ctf_event_class_get_payload_type_field_type_by_name( } if (!event_class->common.payload_field_type) { - BT_LOGV("Event class has no payload field type: " + BT_LOGT("Event class has no payload field type: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_get_name(event_class), bt_ctf_event_class_get_id(event_class)); @@ -559,7 +559,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name( } if (!event_class->common.payload_field_type) { - BT_LOGV("Event class has no payload field type: " + BT_LOGT("Event class has no payload field type: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_get_name(event_class), diff --git a/src/ctf-writer/event-class.h b/src/ctf-writer/event-class.h index e37e754d..35c1de5d 100644 --- a/src/ctf-writer/event-class.h +++ b/src/ctf-writer/event-class.h @@ -140,7 +140,7 @@ int bt_ctf_event_class_common_set_id( } event_class->id = id; - BT_LOGV("Set event class's ID: " + BT_LOGT("Set event class's ID: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_common_get_name(event_class), id); @@ -206,7 +206,7 @@ int bt_ctf_event_class_common_set_log_level( } event_class->log_level = log_level; - BT_LOGV("Set event class's log level: " + BT_LOGT("Set event class's log level: " "addr=%p, name=\"%s\", id=%" PRId64 ", log-level=%s", event_class, bt_ctf_event_class_common_get_name(event_class), bt_ctf_event_class_common_get_id(event_class), @@ -261,13 +261,13 @@ int bt_ctf_event_class_common_set_emf_uri( if (emf_uri) { g_string_assign(event_class->emf_uri, emf_uri); - BT_LOGV("Set event class's EMF URI: " + BT_LOGT("Set event class's EMF URI: " "addr=%p, name=\"%s\", id=%" PRId64 ", emf-uri=\"%s\"", event_class, bt_ctf_event_class_common_get_name(event_class), bt_ctf_event_class_common_get_id(event_class), emf_uri); } else { g_string_assign(event_class->emf_uri, ""); - BT_LOGV("Reset event class's EMF URI: " + BT_LOGT("Reset event class's EMF URI: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_common_get_name(event_class), bt_ctf_event_class_common_get_id(event_class)); @@ -286,7 +286,7 @@ struct bt_ctf_field_type_common *bt_ctf_event_class_common_borrow_context_field_ BT_CTF_ASSERT_PRE_NON_NULL(event_class, "Event class"); if (!event_class->context_field_type) { - BT_LOGV("Event class has no context field type: " + BT_LOGT("Event class has no context field type: " "addr=%p, name=\"%s\", id=%" PRId64, event_class, bt_ctf_event_class_common_get_name(event_class), bt_ctf_event_class_common_get_id(event_class)); @@ -337,7 +337,7 @@ int bt_ctf_event_class_common_set_context_field_type( bt_ctf_object_put_ref(event_class->context_field_type); event_class->context_field_type = context_ft; bt_ctf_object_get_ref(event_class->context_field_type); - BT_LOGV("Set event class's context field type: " + BT_LOGT("Set event class's context field type: " "event-class-addr=%p, event-class-name=\"%s\", " "event-class-id=%" PRId64 ", context-ft-addr=%p", event_class, bt_ctf_event_class_common_get_name(event_class), @@ -384,7 +384,7 @@ int bt_ctf_event_class_common_set_payload_field_type( bt_ctf_object_put_ref(event_class->payload_field_type); event_class->payload_field_type = payload_ft; bt_ctf_object_get_ref(event_class->payload_field_type); - BT_LOGV("Set event class's payload field type: " + BT_LOGT("Set event class's payload field type: " "event-class-addr=%p, event-class-name=\"%s\", " "event-class-id=%" PRId64 ", payload-ft-addr=%p", event_class, bt_ctf_event_class_common_get_name(event_class), diff --git a/src/ctf-writer/event.c b/src/ctf-writer/event.c index c68b87ad..a4706876 100644 --- a/src/ctf-writer/event.c +++ b/src/ctf-writer/event.c @@ -719,7 +719,7 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event, BT_ASSERT(event); BT_ASSERT(ctfser); - BT_LOGV_STR("Serializing event's context field."); + BT_LOGT_STR("Serializing event's context field."); if (event->common.context_field) { ret = bt_ctf_field_serialize_recursive( (void *) event->common.context_field, ctfser, @@ -735,7 +735,7 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event, } } - BT_LOGV_STR("Serializing event's payload field."); + BT_LOGT_STR("Serializing event's payload field."); if (event->common.payload_field) { ret = bt_ctf_field_serialize_recursive( (void *) event->common.payload_field, ctfser, @@ -791,7 +791,7 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event, bt_ctf_object_put_ref(event->common.header_field->field); event->common.header_field->field = bt_ctf_object_get_ref(header); - BT_LOGV("Set event's header field: event-addr=%p, " + BT_LOGT("Set event's header field: event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "header-field-addr=%p", event, bt_ctf_event_class_common_get_name(event->common.class), @@ -825,7 +825,7 @@ int bt_ctf_event_common_set_payload(struct bt_ctf_event *event, bt_ctf_object_put_ref(event->common.payload_field); event->common.payload_field = bt_ctf_object_get_ref(payload); - BT_LOGV("Set event's payload field: event-addr=%p, " + BT_LOGT("Set event's payload field: event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "payload-field-addr=%p", event, bt_ctf_event_class_common_get_name(event->common.class), @@ -858,7 +858,7 @@ int bt_ctf_event_set_context(struct bt_ctf_event *event, bt_ctf_object_put_ref(event->common.context_field); event->common.context_field = bt_ctf_object_get_ref(context); - BT_LOGV("Set event's context field: event-addr=%p, " + BT_LOGT("Set event's context field: event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "context-field-addr=%p", event, bt_ctf_event_class_common_get_name(event->common.class), @@ -893,7 +893,7 @@ int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event, bt_ctf_object_put_ref(event->common.stream_event_context_field); event->common.stream_event_context_field = bt_ctf_object_get_ref(stream_event_context); - BT_LOGV("Set event's stream event context field: event-addr=%p, " + BT_LOGT("Set event's stream event context field: event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "stream-event-context-field-addr=%p", event, bt_ctf_event_class_common_get_name(event->common.class), diff --git a/src/ctf-writer/event.h b/src/ctf-writer/event.h index 69077a84..0bfbb007 100644 --- a/src/ctf-writer/event.h +++ b/src/ctf-writer/event.h @@ -115,7 +115,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_payload( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->payload_field) { - BT_LOGV("Event has no current payload field: addr=%p, " + BT_LOGT("Event has no current payload field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -137,7 +137,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_header( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->header_field) { - BT_LOGV("Event has no current header field: addr=%p, " + BT_LOGT("Event has no current header field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -159,7 +159,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_context( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->context_field) { - BT_LOGV("Event has no current context field: addr=%p, " + BT_LOGT("Event has no current context field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); @@ -181,7 +181,7 @@ struct bt_ctf_field_common *bt_ctf_event_common_borrow_stream_event_context( BT_CTF_ASSERT_PRE_NON_NULL(event, "Event"); if (!event->stream_event_context_field) { - BT_LOGV("Event has no current stream event context field: addr=%p, " + BT_LOGT("Event has no current stream event context field: addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, event, bt_ctf_event_class_common_get_name(event->class), bt_ctf_event_class_common_get_id(event->class)); diff --git a/src/ctf-writer/field-types.c b/src/ctf-writer/field-types.c index 7270aec8..535267d4 100644 --- a/src/ctf-writer/field-types.c +++ b/src/ctf-writer/field-types.c @@ -467,7 +467,7 @@ void check_ranges_overlap(gpointer element, gpointer query) mapping->string == overlap_query->mapping_name; if (overlap_query->overlaps) { - BT_LOGV("Overlapping enumeration field type mappings: " + BT_LOGT("Overlapping enumeration field type mappings: " "mapping-name=\"%s\", " "mapping-a-range-start=%" PRId64 ", " "mapping-a-range-end=%" PRId64 ", " @@ -575,7 +575,7 @@ int add_structure_variant_member(GArray *members, g_hash_table_insert(field_name_to_index, GUINT_TO_POINTER(name_quark), GUINT_TO_POINTER(members->len - 1)); - BT_LOGV("Added structure/variant field type member: member-ft-addr=%p, " + BT_LOGT("Added structure/variant field type member: member-ft-addr=%p, " "member-name=\"%s\"", field_type, field_name); end: @@ -852,7 +852,7 @@ void bt_ctf_field_type_common_enumeration_set_range_overlap( int64_t i, j, len; int is_signed; - BT_LOGV("Setting enumeration field type's overlap flag: addr=%p", + BT_LOGT("Setting enumeration field type's overlap flag: addr=%p", ft); len = ft->entries->len; is_signed = bt_ctf_field_type_common_integer_is_signed( @@ -888,9 +888,9 @@ void bt_ctf_field_type_common_enumeration_set_range_overlap( end: if (ft->has_overlapping_ranges) { - BT_LOGV_STR("Enumeration field type has overlapping ranges."); + BT_LOGT_STR("Enumeration field type has overlapping ranges."); } else { - BT_LOGV_STR("Enumeration field type has no overlapping ranges."); + BT_LOGT_STR("Enumeration field type has no overlapping ranges."); } } @@ -1113,7 +1113,7 @@ int bt_ctf_field_type_common_validate(struct bt_ctf_field_type_common *ft) if (ret == 0 && ft->frozen) { /* Field type is valid */ - BT_LOGV("Marking field type as valid: addr=%p", ft); + BT_LOGT("Marking field type as valid: addr=%p", ft); ft->valid = 1; } @@ -1172,7 +1172,7 @@ int bt_ctf_field_type_common_integer_set_is_signed(struct bt_ctf_field_type_comm } int_ft->is_signed = !!is_signed; - BT_LOGV("Set integer field type's signedness: addr=%p, is-signed=%d", + BT_LOGT("Set integer field type's signedness: addr=%p, is-signed=%d", ft, is_signed); end: @@ -1215,7 +1215,7 @@ int bt_ctf_field_type_common_integer_set_size(struct bt_ctf_field_type_common *f } int_ft->size = size; - BT_LOGV("Set integer field type's size: addr=%p, size=%u", + BT_LOGT("Set integer field type's size: addr=%p, size=%u", ft, size); end: @@ -1278,7 +1278,7 @@ int bt_ctf_field_type_common_integer_set_base(struct bt_ctf_field_type_common *f ret = -1; } - BT_LOGV("Set integer field type's base: addr=%p, base=%s", + BT_LOGT("Set integer field type's base: addr=%p, base=%s", ft, bt_ctf_integer_base_string(base)); end: @@ -1335,7 +1335,7 @@ int bt_ctf_field_type_common_integer_set_encoding(struct bt_ctf_field_type_commo } int_ft->encoding = encoding; - BT_LOGV("Set integer field type's encoding: addr=%p, encoding=%s", + BT_LOGT("Set integer field type's encoding: addr=%p, encoding=%s", ft, bt_ctf_string_encoding_string(encoding)); end: @@ -1386,7 +1386,7 @@ int bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen( bt_ctf_object_put_ref(int_ft->mapped_clock_class); int_ft->mapped_clock_class = bt_ctf_object_get_ref(clock_class); - BT_LOGV("Set integer field type's mapped clock class: ft-addr=%p, " + BT_LOGT("Set integer field type's mapped clock class: ft-addr=%p, " "clock-class-addr=%p, clock-class-name=\"%s\"", ft, clock_class, bt_ctf_clock_class_get_name(clock_class)); @@ -1584,7 +1584,7 @@ int bt_ctf_field_type_common_enumeration_signed_add_mapping( g_ptr_array_add(enum_ft->entries, mapping); g_ptr_array_sort(enum_ft->entries, (GCompareFunc) compare_enumeration_mappings_signed); - BT_LOGV("Added mapping to signed enumeration field type: addr=%p, " + BT_LOGT("Added mapping to signed enumeration field type: addr=%p, " "name=\"%s\", range-start=%" PRId64 ", " "range-end=%" PRId64, ft, string, range_start, range_end); @@ -1674,7 +1674,7 @@ int bt_ctf_field_type_common_enumeration_unsigned_add_mapping( g_ptr_array_add(enum_ft->entries, mapping); g_ptr_array_sort(enum_ft->entries, (GCompareFunc) compare_enumeration_mappings_unsigned); - BT_LOGV("Added mapping to unsigned enumeration field type: addr=%p, " + BT_LOGT("Added mapping to unsigned enumeration field type: addr=%p, " "name=\"%s\", range-start=%" PRIu64 ", " "range-end=%" PRIu64, ft, string, range_start, range_end); @@ -1749,7 +1749,7 @@ int bt_ctf_field_type_common_floating_point_set_exponent_digits( } flt_ft->exp_dig = exponent_digits; - BT_LOGV("Set floating point number field type's exponent size: addr=%p, " + BT_LOGT("Set floating point number field type's exponent size: addr=%p, " "exp-size=%u", ft, exponent_digits); end: @@ -1806,7 +1806,7 @@ int bt_ctf_field_type_common_floating_point_set_mantissa_digits( } flt_ft->mant_dig = mantissa_digits; - BT_LOGV("Set floating point number field type's mantissa size: addr=%p, " + BT_LOGT("Set floating point number field type's mantissa size: addr=%p, " "mant-size=%u", ft, mantissa_digits); end: @@ -1899,7 +1899,7 @@ int bt_ctf_field_type_common_structure_add_field(struct bt_ctf_field_type_common goto end; } - BT_LOGV("Added structure field type field: struct-ft-addr=%p, " + BT_LOGT("Added structure field type field: struct-ft-addr=%p, " "field-ft-addr=%p, field-name=\"%s\"", ft, field_type, field_name); @@ -1966,7 +1966,7 @@ bt_ctf_field_type_common_structure_borrow_field_type_by_name( "Field type"); name_quark = g_quark_try_string(name); if (!name_quark) { - BT_LOGV("No such structure field type field name: " + BT_LOGT("No such structure field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); goto end; @@ -1974,7 +1974,7 @@ bt_ctf_field_type_common_structure_borrow_field_type_by_name( if (!g_hash_table_lookup_extended(struct_ft->field_name_to_index, GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) { - BT_LOGV("No such structure field type field name: " + BT_LOGT("No such structure field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); goto end; @@ -2000,7 +2000,7 @@ bt_ctf_field_type_common_variant_borrow_tag_field_type( "Field type"); if (!var_ft->tag_ft) { - BT_LOGV("Variant field type has no tag field type: " + BT_LOGT("Variant field type has no tag field type: " "addr=%p", ft); goto end; } @@ -2023,7 +2023,7 @@ const char *bt_ctf_field_type_common_variant_get_tag_name( "Field type"); if (var_ft->tag_name->len == 0) { - BT_LOGV("Variant field type has no tag field name: " + BT_LOGT("Variant field type has no tag field name: " "addr=%p", ft); goto end; } @@ -2070,7 +2070,7 @@ int bt_ctf_field_type_common_variant_set_tag_name( } g_string_assign(var_ft->tag_name, name); - BT_LOGV("Set variant field type's tag field name: addr=%p, " + BT_LOGT("Set variant field type's tag field name: addr=%p, " "tag-field-name=\"%s\"", ft, name); end: @@ -2157,7 +2157,7 @@ int bt_ctf_field_type_common_variant_add_field(struct bt_ctf_field_type_common * goto end; } - BT_LOGV("Added variant field type field: variant-ft-addr=%p, " + BT_LOGT("Added variant field type field: variant-ft-addr=%p, " "field-ft-addr=%p, field-name=\"%s\"", ft, field_type, field_name); @@ -2183,7 +2183,7 @@ bt_ctf_field_type_common_variant_borrow_field_type_by_name( "Field type"); name_quark = g_quark_try_string(field_name); if (!name_quark) { - BT_LOGV("No such variant field type field name: " + BT_LOGT("No such variant field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, field_name); goto end; @@ -2191,7 +2191,7 @@ bt_ctf_field_type_common_variant_borrow_field_type_by_name( if (!g_hash_table_lookup_extended(var_ft->choice_name_to_index, GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) { - BT_LOGV("No such variant field type field name: " + BT_LOGT("No such variant field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, field_name); goto end; @@ -2350,7 +2350,7 @@ int bt_ctf_field_type_common_array_set_element_field_type( } array_ft->element_ft = bt_ctf_object_get_ref(element_ft); - BT_LOGV("Set array field type's element field type: array-ft-addr=%p, " + BT_LOGT("Set array field type's element field type: array-ft-addr=%p, " "element-ft-addr=%p", ft, element_ft); end: @@ -2414,7 +2414,7 @@ int bt_ctf_field_type_common_sequence_set_element_field_type( seq_ft->element_ft = element_ft; bt_ctf_object_get_ref(seq_ft->element_ft); - BT_LOGV("Set sequence field type's element field type: sequence-ft-addr=%p, " + BT_LOGT("Set sequence field type's element field type: sequence-ft-addr=%p, " "element-ft-addr=%p", ft, element_ft); end: @@ -2476,7 +2476,7 @@ int bt_ctf_field_type_common_string_set_encoding(struct bt_ctf_field_type_common } string_ft->encoding = encoding; - BT_LOGV("Set string field type's encoding: addr=%p, encoding=%s", + BT_LOGT("Set string field type's encoding: addr=%p, encoding=%s", ft, bt_ctf_string_encoding_string(encoding)); end: @@ -2620,7 +2620,7 @@ int bt_ctf_field_type_common_set_alignment(struct bt_ctf_field_type_common *ft, ft->alignment = alignment; ret = 0; - BT_LOGV("Set field type's alignment: addr=%p, align=%u", + BT_LOGT("Set field type's alignment: addr=%p, align=%u", ft, alignment); end: @@ -2710,7 +2710,7 @@ int bt_ctf_field_type_common_set_byte_order(struct bt_ctf_field_type_common *ft, ft->methods->set_byte_order(ft, byte_order); } - BT_LOGV("Set field type's byte order: addr=%p, bo=%s", + BT_LOGT("Set field type's byte order: addr=%p, bo=%s", ft, bt_ctf_byte_order_string(byte_order)); end: @@ -2846,7 +2846,7 @@ int bt_ctf_field_type_common_structure_get_field_name_index( name_quark = g_quark_try_string(name); if (!name_quark) { - BT_LOGV("No such structure field type field name: " + BT_LOGT("No such structure field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); ret = -1; @@ -2856,7 +2856,7 @@ int bt_ctf_field_type_common_structure_get_field_name_index( if (!g_hash_table_lookup_extended(struct_ft->field_name_to_index, GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) { - BT_LOGV("No such structure field type field name: " + BT_LOGT("No such structure field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); ret = -1; @@ -2884,7 +2884,7 @@ int bt_ctf_field_type_common_variant_get_field_name_index( "Field type"); name_quark = g_quark_try_string(name); if (!name_quark) { - BT_LOGV("No such variant field type field name: " + BT_LOGT("No such variant field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); ret = -1; @@ -2894,7 +2894,7 @@ int bt_ctf_field_type_common_variant_get_field_name_index( if (!g_hash_table_lookup_extended(var_ft->choice_name_to_index, GUINT_TO_POINTER(name_quark), NULL, (gpointer *) &index)) { - BT_LOGV("No such variant field type field name: " + BT_LOGT("No such variant field type field name: " "ft-addr=%p, field-name=\"%s\"", ft, name); ret = -1; @@ -2930,7 +2930,7 @@ int bt_ctf_field_type_common_sequence_set_length_field_path( bt_ctf_object_get_ref(path); BT_CTF_OBJECT_MOVE_REF(seq_ft->length_field_path, path); - BT_LOGV("Set sequence field type's length field path: ft-addr=%p, " + BT_LOGT("Set sequence field type's length field path: ft-addr=%p, " "field-path-addr=%p", ft, path); end: @@ -2961,7 +2961,7 @@ int bt_ctf_field_type_common_variant_set_tag_field_path( bt_ctf_object_get_ref(path); BT_CTF_OBJECT_MOVE_REF(var_ft->tag_field_path, path); - BT_LOGV("Set variant field type's tag field path: ft-addr=%p, " + BT_LOGT("Set variant field type's tag field path: ft-addr=%p, " "field-path-addr=%p", ft, path); end: @@ -2998,7 +2998,7 @@ int bt_ctf_field_type_common_variant_set_tag_field_type( bt_ctf_object_put_ref(var_ft->tag_ft); var_ft->tag_ft = bt_ctf_object_get_ref(tag_ft); - BT_LOGV("Set variant field type's tag field type: variant-ft-addr=%p, " + BT_LOGT("Set variant field type's tag field type: variant-ft-addr=%p, " "tag-ft-addr=%p", ft, tag_ft); end: @@ -3251,7 +3251,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Length */ if (int_ft_a->size != int_ft_b->size) { - BT_LOGV("Integer field types differ: different sizes: " + BT_LOGT("Integer field types differ: different sizes: " "ft-a-size=%u, ft-b-size=%u", int_ft_a->size, int_ft_b->size); goto end; @@ -3259,7 +3259,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Byte order */ if (int_ft_a->user_byte_order != int_ft_b->user_byte_order) { - BT_LOGV("Integer field types differ: different byte orders: " + BT_LOGT("Integer field types differ: different byte orders: " "ft-a-bo=%s, ft-b-bo=%s", bt_ctf_byte_order_string(int_ft_a->user_byte_order), bt_ctf_byte_order_string(int_ft_b->user_byte_order)); @@ -3268,7 +3268,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Signedness */ if (int_ft_a->is_signed != int_ft_b->is_signed) { - BT_LOGV("Integer field types differ: different signedness: " + BT_LOGT("Integer field types differ: different signedness: " "ft-a-is-signed=%d, ft-b-is-signed=%d", int_ft_a->is_signed, int_ft_b->is_signed); @@ -3277,7 +3277,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Base */ if (int_ft_a->base != int_ft_b->base) { - BT_LOGV("Integer field types differ: different bases: " + BT_LOGT("Integer field types differ: different bases: " "ft-a-base=%s, ft-b-base=%s", bt_ctf_integer_base_string(int_ft_a->base), bt_ctf_integer_base_string(int_ft_b->base)); @@ -3286,7 +3286,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Encoding */ if (int_ft_a->encoding != int_ft_b->encoding) { - BT_LOGV("Integer field types differ: different encodings: " + BT_LOGT("Integer field types differ: different encodings: " "ft-a-encoding=%s, ft-b-encoding=%s", bt_ctf_string_encoding_string(int_ft_a->encoding), bt_ctf_string_encoding_string(int_ft_b->encoding)); @@ -3296,7 +3296,7 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft /* Mapped clock class */ if (int_ft_a->mapped_clock_class) { if (!int_ft_b->mapped_clock_class) { - BT_LOGV_STR("Integer field types differ: field type A " + BT_LOGT_STR("Integer field types differ: field type A " "has a mapped clock class, but field type B " "does not."); goto end; @@ -3304,12 +3304,12 @@ int bt_ctf_field_type_common_integer_compare(struct bt_ctf_field_type_common *ft if (bt_ctf_clock_class_compare(int_ft_a->mapped_clock_class, int_ft_b->mapped_clock_class) != 0) { - BT_LOGV_STR("Integer field types differ: different " + BT_LOGT_STR("Integer field types differ: different " "mapped clock classes."); } } else { if (int_ft_b->mapped_clock_class) { - BT_LOGV_STR("Integer field types differ: field type A " + BT_LOGT_STR("Integer field types differ: field type A " "has no description, but field type B has one."); goto end; } @@ -3335,7 +3335,7 @@ int bt_ctf_field_type_common_floating_point_compare( /* Byte order */ if (flt_ft_a->user_byte_order != flt_ft_b->user_byte_order) { - BT_LOGV("Floating point number field types differ: different byte orders: " + BT_LOGT("Floating point number field types differ: different byte orders: " "ft-a-bo=%s, ft-b-bo=%s", bt_ctf_byte_order_string(flt_ft_a->user_byte_order), bt_ctf_byte_order_string(flt_ft_b->user_byte_order)); @@ -3344,7 +3344,7 @@ int bt_ctf_field_type_common_floating_point_compare( /* Exponent length */ if (flt_ft_a->exp_dig != flt_ft_b->exp_dig) { - BT_LOGV("Floating point number field types differ: different exponent sizes: " + BT_LOGT("Floating point number field types differ: different exponent sizes: " "ft-a-exp-size=%u, ft-b-exp-size=%u", flt_ft_a->exp_dig, flt_ft_b->exp_dig); goto end; @@ -3352,7 +3352,7 @@ int bt_ctf_field_type_common_floating_point_compare( /* Mantissa length */ if (flt_ft_a->mant_dig != flt_ft_b->mant_dig) { - BT_LOGV("Floating point number field types differ: different mantissa sizes: " + BT_LOGT("Floating point number field types differ: different mantissa sizes: " "ft-a-mant-size=%u, ft-b-mant-size=%u", flt_ft_a->mant_dig, flt_ft_b->mant_dig); goto end; @@ -3373,7 +3373,7 @@ int compare_enumeration_mappings(struct bt_ctf_enumeration_mapping *mapping_a, /* Label */ if (mapping_a->string != mapping_b->string) { - BT_LOGV("Enumeration field type mappings differ: different names: " + BT_LOGT("Enumeration field type mappings differ: different names: " "mapping-a-name=\"%s\", mapping-b-name=\"%s\"", g_quark_to_string(mapping_a->string), g_quark_to_string(mapping_b->string)); @@ -3383,7 +3383,7 @@ int compare_enumeration_mappings(struct bt_ctf_enumeration_mapping *mapping_a, /* Range start */ if (mapping_a->range_start._unsigned != mapping_b->range_start._unsigned) { - BT_LOGV("Enumeration field type mappings differ: different starts of range: " + BT_LOGT("Enumeration field type mappings differ: different starts of range: " "mapping-a-range-start-unsigned=%" PRIu64 ", " "mapping-b-range-start-unsigned=%" PRIu64, mapping_a->range_start._unsigned, @@ -3394,7 +3394,7 @@ int compare_enumeration_mappings(struct bt_ctf_enumeration_mapping *mapping_a, /* Range end */ if (mapping_a->range_end._unsigned != mapping_b->range_end._unsigned) { - BT_LOGV("Enumeration field type mappings differ: different ends of range: " + BT_LOGT("Enumeration field type mappings differ: different ends of range: " "mapping-a-range-end-unsigned=%" PRIu64 ", " "mapping-b-range-end-unsigned=%" PRIu64, mapping_a->range_end._unsigned, @@ -3426,7 +3426,7 @@ int bt_ctf_field_type_common_enumeration_compare_recursive( BT_CTF_TO_COMMON(enum_ft_a->container_ft), BT_CTF_TO_COMMON(enum_ft_b->container_ft)); if (ret) { - BT_LOGV("Enumeration field types differ: different container field types: " + BT_LOGT("Enumeration field types differ: different container field types: " "ft-a-container-ft-addr=%p, ft-b-container-ft-addr=%p", enum_ft_a->container_ft, enum_ft_b->container_ft); goto end; @@ -3446,7 +3446,7 @@ int bt_ctf_field_type_common_enumeration_compare_recursive( g_ptr_array_index(enum_ft_b->entries, i); if (compare_enumeration_mappings(mapping_a, mapping_b)) { - BT_LOGV("Enumeration field types differ: different mappings: " + BT_LOGT("Enumeration field types differ: different mappings: " "ft-a-mapping-addr=%p, ft-b-mapping-addr=%p, " "ft-a-mapping-name=\"%s\", ft-b-mapping-name=\"%s\"", mapping_a, mapping_b, @@ -3473,7 +3473,7 @@ int bt_ctf_field_type_common_string_compare(struct bt_ctf_field_type_common *ft_ /* Encoding */ if (string_ft_a->encoding != string_ft_b->encoding) { - BT_LOGV("String field types differ: different encodings: " + BT_LOGT("String field types differ: different encodings: " "ft-a-encoding=%s, ft-b-encoding=%s", bt_ctf_string_encoding_string(string_ft_a->encoding), bt_ctf_string_encoding_string(string_ft_b->encoding)); @@ -3497,7 +3497,7 @@ int compare_structure_variant_members( /* Label */ if (member_a_name != member_b_name) { - BT_LOGV("Structure/variant field type fields differ: different names: " + BT_LOGT("Structure/variant field type fields differ: different names: " "field-a-name=%s, field-b-name=%s", g_quark_to_string(member_a_name), g_quark_to_string(member_b_name)); @@ -3507,7 +3507,7 @@ int compare_structure_variant_members( /* Type */ ret = bt_ctf_field_type_common_compare(member_a_ft, member_b_ft); if (ret == 1) { - BT_LOGV("Structure/variant field type fields differ: different field types: " + BT_LOGT("Structure/variant field type fields differ: different field types: " "field-name=\"%s\", field-a-ft-addr=%p, field-b-ft-addr=%p", g_quark_to_string(member_a_name), member_a_ft, member_b_ft); @@ -3532,7 +3532,7 @@ int bt_ctf_field_type_common_structure_compare_recursive( /* Alignment */ if (bt_ctf_field_type_common_get_alignment(ft_a) != bt_ctf_field_type_common_get_alignment(ft_b)) { - BT_LOGV("Structure field types differ: different alignments: " + BT_LOGT("Structure field types differ: different alignments: " "ft-a-align=%u, ft-b-align=%u", bt_ctf_field_type_common_get_alignment(ft_a), bt_ctf_field_type_common_get_alignment(ft_b)); @@ -3541,7 +3541,7 @@ int bt_ctf_field_type_common_structure_compare_recursive( /* Fields */ if (struct_ft_a->fields->len != struct_ft_b->fields->len) { - BT_LOGV("Structure field types differ: different field counts: " + BT_LOGT("Structure field types differ: different field counts: " "ft-a-field-count=%u, ft-b-field-count=%u", struct_ft_a->fields->len, struct_ft_b->fields->len); goto end; @@ -3559,7 +3559,7 @@ int bt_ctf_field_type_common_structure_compare_recursive( field_b->type, field_a->name, field_b->name); if (ret) { /* compare_structure_variant_members() logs what differs */ - BT_LOGV_STR("Structure field types differ: different fields."); + BT_LOGT_STR("Structure field types differ: different fields."); goto end; } } @@ -3583,7 +3583,7 @@ int bt_ctf_field_type_common_variant_compare_recursive( /* Tag name */ if (strcmp(var_ft_a->tag_name->str, var_ft_b->tag_name->str)) { - BT_LOGV("Variant field types differ: different tag field names: " + BT_LOGT("Variant field types differ: different tag field names: " "ft-a-tag-field-name=\"%s\", ft-b-tag-field-name=\"%s\"", var_ft_a->tag_name->str, var_ft_b->tag_name->str); goto end; @@ -3593,7 +3593,7 @@ int bt_ctf_field_type_common_variant_compare_recursive( ret = bt_ctf_field_type_common_compare(BT_CTF_TO_COMMON(var_ft_a->tag_ft), BT_CTF_TO_COMMON(var_ft_b->tag_ft)); if (ret) { - BT_LOGV("Variant field types differ: different tag field types: " + BT_LOGT("Variant field types differ: different tag field types: " "ft-a-tag-ft-addr=%p, ft-b-tag-ft-addr=%p", var_ft_a->tag_ft, var_ft_b->tag_ft); goto end; @@ -3603,7 +3603,7 @@ int bt_ctf_field_type_common_variant_compare_recursive( /* Fields */ if (var_ft_a->choices->len != var_ft_b->choices->len) { - BT_LOGV("Variant field types differ: different field counts: " + BT_LOGT("Variant field types differ: different field counts: " "ft-a-field-count=%u, ft-b-field-count=%u", var_ft_a->choices->len, var_ft_b->choices->len); goto end; @@ -3621,7 +3621,7 @@ int bt_ctf_field_type_common_variant_compare_recursive( choice_b->type, choice_a->name, choice_b->name); if (ret) { /* compare_structure_variant_members() logs what differs */ - BT_LOGV_STR("Variant field types differ: different fields."); + BT_LOGT_STR("Variant field types differ: different fields."); goto end; } } @@ -3644,7 +3644,7 @@ int bt_ctf_field_type_common_array_compare_recursive( /* Length */ if (array_ft_a->length != array_ft_b->length) { - BT_LOGV("Structure field types differ: different lengths: " + BT_LOGT("Structure field types differ: different lengths: " "ft-a-length=%u, ft-b-length=%u", array_ft_a->length, array_ft_b->length); goto end; @@ -3654,7 +3654,7 @@ int bt_ctf_field_type_common_array_compare_recursive( ret = bt_ctf_field_type_common_compare(array_ft_a->element_ft, array_ft_b->element_ft); if (ret == 1) { - BT_LOGV("Array field types differ: different element field types: " + BT_LOGT("Array field types differ: different element field types: " "ft-a-element-ft-addr=%p, ft-b-element-ft-addr=%p", array_ft_a->element_ft, array_ft_b->element_ft); } @@ -3675,7 +3675,7 @@ int bt_ctf_field_type_common_sequence_compare_recursive( /* Length name */ if (strcmp(seq_ft_a->length_field_name->str, seq_ft_b->length_field_name->str)) { - BT_LOGV("Sequence field types differ: different length field names: " + BT_LOGT("Sequence field types differ: different length field names: " "ft-a-length-field-name=\"%s\", " "ft-b-length-field-name=\"%s\"", seq_ft_a->length_field_name->str, @@ -3687,7 +3687,7 @@ int bt_ctf_field_type_common_sequence_compare_recursive( ret = bt_ctf_field_type_common_compare(seq_ft_a->element_ft, seq_ft_b->element_ft); if (ret == 1) { - BT_LOGV("Sequence field types differ: different element field types: " + BT_LOGT("Sequence field types differ: different element field types: " "ft-a-element-ft-addr=%p, ft-b-element-ft-addr=%p", seq_ft_a->element_ft, seq_ft_b->element_ft); } @@ -3725,7 +3725,7 @@ int bt_ctf_field_type_common_compare(struct bt_ctf_field_type_common *ft_a, if (ft_a->id != ft_b->id) { /* Different type IDs */ - BT_LOGV("Field types differ: different IDs: " + BT_LOGT("Field types differ: different IDs: " "ft-a-addr=%p, ft-b-addr=%p, " "ft-a-id=%s, ft-b-id=%s", ft_a, ft_b, @@ -3743,7 +3743,7 @@ int bt_ctf_field_type_common_compare(struct bt_ctf_field_type_common *ft_a, BT_ASSERT(ft_a->methods->compare); ret = ft_a->methods->compare(ft_a, ft_b); if (ret == 1) { - BT_LOGV("Field types differ: ft-a-addr=%p, ft-b-addr=%p", + BT_LOGT("Field types differ: ft-a-addr=%p, ft-b-addr=%p", ft_a, ft_b); } @@ -3896,7 +3896,7 @@ int bt_ctf_field_type_common_validate_single_clock_class( /* Move reference to output parameter */ *expected_clock_class = bt_ctf_object_get_ref(mapped_clock_class); mapped_clock_class = NULL; - BT_LOGV("Setting expected clock class: " + BT_LOGT("Setting expected clock class: " "expected-clock-class-addr=%p", *expected_clock_class); } else { diff --git a/src/ctf-writer/fields.c b/src/ctf-writer/fields.c index b37b0429..48c48a9b 100644 --- a/src/ctf-writer/fields.c +++ b/src/ctf-writer/fields.c @@ -886,7 +886,7 @@ int bt_ctf_field_integer_serialize(struct bt_ctf_field_common *field, enum bt_ctf_byte_order byte_order; BT_CTF_ASSERT_PRE_CTF_FIELD_COMMON_IS_SET(field, "Integer field"); - BT_LOGV("Serializing CTF writer integer field: addr=%p, native-bo=%s", + BT_LOGT("Serializing CTF writer integer field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); byte_order = int_type->user_byte_order; @@ -924,9 +924,9 @@ int bt_ctf_field_enumeration_serialize_recursive( { struct bt_ctf_field_enumeration *enumeration = (void *) field; - BT_LOGV("Serializing enumeration field: addr=%p, native-bo=%s", + BT_LOGT("Serializing enumeration field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); - BT_LOGV_STR("Serializing enumeration field's payload field."); + BT_LOGT_STR("Serializing enumeration field's payload field."); return bt_ctf_field_serialize_recursive( (void *) enumeration->container, ctfser, native_byte_order); } @@ -943,7 +943,7 @@ int bt_ctf_field_floating_point_serialize(struct bt_ctf_field_common *field, enum bt_ctf_byte_order byte_order; BT_CTF_ASSERT_PRE_CTF_FIELD_COMMON_IS_SET(field, "Floating point number field"); - BT_LOGV("Serializing floating point number field: " + BT_LOGT("Serializing floating point number field: " "addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); @@ -985,7 +985,7 @@ int bt_ctf_field_structure_serialize_recursive(struct bt_ctf_field_common *field int ret; struct bt_ctf_field_common_structure *structure = BT_CTF_FROM_COMMON(field); - BT_LOGV("Serializing structure field: addr=%p, native-bo=%s", + BT_LOGT("Serializing structure field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); ret = bt_ctfser_align_offset_in_current_packet(ctfser, field->type->alignment); @@ -1000,7 +1000,7 @@ int bt_ctf_field_structure_serialize_recursive(struct bt_ctf_field_common *field structure->fields, i); const char *field_name = NULL; - BT_LOGV("Serializing structure field's field: ser-offset=%" PRIu64 ", " + BT_LOGT("Serializing structure field's field: ser-offset=%" PRIu64 ", " "field-addr=%p, index=%" PRIu64, bt_ctfser_get_offset_in_current_packet_bits(ctfser), member, i); @@ -1042,9 +1042,9 @@ int bt_ctf_field_variant_serialize_recursive(struct bt_ctf_field_common *field, { struct bt_ctf_field_common_variant *variant = BT_CTF_FROM_COMMON(field); - BT_LOGV("Serializing variant field: addr=%p, native-bo=%s", + BT_LOGT("Serializing variant field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); - BT_LOGV_STR("Serializing variant field's payload field."); + BT_LOGT_STR("Serializing variant field's payload field."); return bt_ctf_field_serialize_recursive( (void *) variant->current_field, ctfser, native_byte_order); } @@ -1058,14 +1058,14 @@ int bt_ctf_field_array_serialize_recursive(struct bt_ctf_field_common *field, int ret = 0; struct bt_ctf_field_common_array *array = BT_CTF_FROM_COMMON(field); - BT_LOGV("Serializing array field: addr=%p, native-bo=%s", + BT_LOGT("Serializing array field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); for (i = 0; i < array->elements->len; i++) { struct bt_ctf_field_common *elem_field = g_ptr_array_index(array->elements, i); - BT_LOGV("Serializing array field's element field: " + BT_LOGT("Serializing array field's element field: " "ser-offset=%" PRIu64 ", field-addr=%p, index=%" PRId64, bt_ctfser_get_offset_in_current_packet_bits(ctfser), elem_field, i); @@ -1092,14 +1092,14 @@ int bt_ctf_field_sequence_serialize_recursive(struct bt_ctf_field_common *field, int ret = 0; struct bt_ctf_field_common_sequence *sequence = BT_CTF_FROM_COMMON(field); - BT_LOGV("Serializing sequence field: addr=%p, native-bo=%s", + BT_LOGT("Serializing sequence field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string(native_byte_order)); for (i = 0; i < sequence->elements->len; i++) { struct bt_ctf_field_common *elem_field = g_ptr_array_index(sequence->elements, i); - BT_LOGV("Serializing sequence field's element field: " + BT_LOGT("Serializing sequence field's element field: " "ser-offset=%" PRIu64 ", field-addr=%p, index=%" PRId64, bt_ctfser_get_offset_in_current_packet_bits(ctfser), elem_field, i); @@ -1126,7 +1126,7 @@ int bt_ctf_field_string_serialize(struct bt_ctf_field_common *field, struct bt_ctf_field_common_string *string = BT_CTF_FROM_COMMON(field); BT_CTF_ASSERT_PRE_CTF_FIELD_COMMON_IS_SET(field, "String field"); - BT_LOGV("Serializing string field: addr=%p, native-bo=%s", + BT_LOGT("Serializing string field: addr=%p, native-bo=%s", field, bt_ctf_byte_order_string((int) native_byte_order)); ret = bt_ctfser_write_string(ctfser, (const char *) string->buf->data); if (G_UNLIKELY(ret)) { @@ -1847,7 +1847,7 @@ int bt_ctf_field_structure_set_field_by_name(struct bt_ctf_field *field, if (!g_hash_table_lookup_extended(field_name_to_index, GUINT_TO_POINTER(field_quark), NULL, (gpointer *) &index)) { - BT_LOGV("Invalid parameter: no such field in structure field's type: " + BT_LOGT("Invalid parameter: no such field in structure field's type: " "struct-field-addr=%p, struct-ft-addr=%p, " "field-ft-addr=%p, name=\"%s\"", field, common_field->type, common_value->type, name); diff --git a/src/ctf-writer/fields.h b/src/ctf-writer/fields.h index 9cba266d..3c3cff66 100644 --- a/src/ctf-writer/fields.h +++ b/src/ctf-writer/fields.h @@ -443,7 +443,7 @@ struct bt_ctf_field_common *bt_ctf_field_common_structure_borrow_field_by_name( if (!g_hash_table_lookup_extended(field_name_to_index, GUINT_TO_POINTER(field_quark), NULL, (gpointer *) &index)) { - BT_LOGV("Invalid parameter: no such field in structure field's type: " + BT_LOGT("Invalid parameter: no such field in structure field's type: " "struct-field-addr=%p, struct-ft-addr=%p, name=\"%s\"", field, field->type, name); goto error; diff --git a/src/ctf-writer/object-pool.h b/src/ctf-writer/object-pool.h index c0d8610f..0d1ef70e 100644 --- a/src/ctf-writer/object-pool.h +++ b/src/ctf-writer/object-pool.h @@ -110,8 +110,8 @@ void *bt_ctf_object_pool_create_object(struct bt_ctf_object_pool *pool) BT_ASSERT(pool); -#ifdef BT_LOGV - BT_LOGV("Creating object from pool: pool-addr=%p, pool-size=%zu, pool-cap=%u", +#ifdef BT_LOGT + BT_LOGT("Creating object from pool: pool-addr=%p, pool-size=%zu, pool-cap=%u", pool, pool->size, pool->objects->len); #endif @@ -124,16 +124,16 @@ void *bt_ctf_object_pool_create_object(struct bt_ctf_object_pool *pool) } /* Pool is empty: create a brand new object */ -#ifdef BT_LOGV - BT_LOGV("Pool is empty: allocating new object: pool-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Pool is empty: allocating new object: pool-addr=%p", pool); #endif obj = pool->funcs.new_object(pool->data); end: -#ifdef BT_LOGV - BT_LOGV("Created one object from pool: pool-addr=%p, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Created one object from pool: pool-addr=%p, obj-addr=%p", pool, obj); #endif @@ -153,15 +153,15 @@ void bt_ctf_object_pool_recycle_object(struct bt_ctf_object_pool *pool, void *ob BT_ASSERT(pool); BT_ASSERT(obj); -#ifdef BT_LOGV - BT_LOGV("Recycling object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Recycling object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", pool, pool->size, pool->objects->len, obj); #endif if (pool->size == pool->objects->len) { /* Backing array is full: make place for recycled object */ -#ifdef BT_LOGV - BT_LOGV("Object pool is full: increasing object pool capacity: " +#ifdef BT_LOGT + BT_LOGT("Object pool is full: increasing object pool capacity: " "pool-addr=%p, old-pool-cap=%u, new-pool-cap=%u", pool, pool->objects->len, pool->objects->len + 1); #endif @@ -175,8 +175,8 @@ void bt_ctf_object_pool_recycle_object(struct bt_ctf_object_pool *pool, void *ob pool->objects->pdata[pool->size] = obj; pool->size++; -#ifdef BT_LOGV - BT_LOGV("Recycled object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Recycled object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", pool, pool->size, pool->objects->len, obj); #endif } diff --git a/src/ctf-writer/object.h b/src/ctf-writer/object.h index 00356547..1e1b7869 100644 --- a/src/ctf-writer/object.h +++ b/src/ctf-writer/object.h @@ -122,8 +122,8 @@ void bt_ctf_object_set_parent(struct bt_ctf_object *child, struct bt_ctf_object BT_ASSERT(child); BT_ASSERT(child->is_shared); -#ifdef BT_LOGV - BT_LOGV("Setting object's parent: addr=%p, parent-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Setting object's parent: addr=%p, parent-addr=%p", child, parent); #endif @@ -169,8 +169,8 @@ void bt_ctf_object_with_parent_release_func(struct bt_ctf_object *obj) */ struct bt_ctf_object *parent = obj->parent; -#ifdef BT_LOGV - BT_LOGV("Releasing parented object: addr=%p, ref-count=%llu, " +#ifdef BT_LOGT + BT_LOGT("Releasing parented object: addr=%p, ref-count=%llu, " "parent-addr=%p, parent-ref-count=%llu", obj, obj->ref_count, parent, parent->ref_count); @@ -255,8 +255,8 @@ void *bt_ctf_object_get_no_null_check_no_parent_check(struct bt_ctf_object *obj) BT_ASSERT(obj); BT_ASSERT(obj->is_shared); -#ifdef BT_LOGV - BT_LOGV("Incrementing object's reference count: %llu -> %llu: " +#ifdef BT_LOGT + BT_LOGT("Incrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count + 1, obj, obj->ref_count, obj->ref_count + 1); @@ -273,16 +273,16 @@ void *bt_ctf_object_get_no_null_check(struct bt_ctf_object *obj) BT_ASSERT(obj->is_shared); if (G_UNLIKELY(obj->parent && bt_ctf_object_get_ref_count(obj) == 0)) { -#ifdef BT_LOGV - BT_LOGV("Incrementing object's parent's reference count: " +#ifdef BT_LOGT + BT_LOGT("Incrementing object's parent's reference count: " "addr=%p, parent-addr=%p", obj, obj->parent); #endif bt_ctf_object_get_no_null_check(obj->parent); } -#ifdef BT_LOGV - BT_LOGV("Incrementing object's reference count: %llu -> %llu: " +#ifdef BT_LOGT + BT_LOGT("Incrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count + 1, obj, obj->ref_count, obj->ref_count + 1); @@ -299,8 +299,8 @@ void bt_ctf_object_put_no_null_check(struct bt_ctf_object *obj) BT_ASSERT(obj->is_shared); BT_ASSERT(obj->ref_count > 0); -#ifdef BT_LOGV - BT_LOGV("Decrementing object's reference count: %llu -> %llu: " +#ifdef BT_LOGT + BT_LOGT("Decrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count - 1, obj, obj->ref_count, obj->ref_count - 1); diff --git a/src/ctf-writer/resolve.c b/src/ctf-writer/resolve.c index 18481435..0d5e1c5f 100644 --- a/src/ctf-writer/resolve.c +++ b/src/ctf-writer/resolve.c @@ -166,7 +166,7 @@ int type_stack_push(type_stack *stack, struct bt_ctf_field_type_common *type) goto end; } - BT_LOGV("Pushing field type on context's stack: " + BT_LOGT("Pushing field type on context's stack: " "ft-addr=%p, stack-size-before=%u", type, stack->len); frame->type = bt_ctf_object_get_ref(type); g_ptr_array_add(stack, frame); @@ -244,7 +244,7 @@ void type_stack_pop(type_stack *stack) * This will call the frame's destructor and free it, as * well as put its contained field type. */ - BT_LOGV("Popping context's stack: stack-size-before=%u", + BT_LOGT("Popping context's stack: stack-size-before=%u", stack->len); g_ptr_array_set_size(stack, stack->len - 1); } @@ -288,7 +288,7 @@ enum bt_ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr) if (strncmp(pathstr, absolute_path_prefixes[scope], strlen(absolute_path_prefixes[scope]))) { /* Prefix does not match: try the next one */ - BT_LOGV("Prefix does not match: trying the next one: " + BT_LOGT("Prefix does not match: trying the next one: " "path=\"%s\", path-prefix=\"%s\", scope=%s", pathstr, absolute_path_prefixes[scope], bt_ctf_scope_string(scope)); @@ -297,7 +297,7 @@ enum bt_ctf_scope get_root_scope_from_absolute_pathstr(const char *pathstr) /* Found it! */ ret = scope; - BT_LOGV("Found root scope from absolute path: " + BT_LOGT("Found root scope from absolute path: " "path=\"%s\", scope=%s", pathstr, bt_ctf_scope_string(scope)); goto end; @@ -415,7 +415,7 @@ int ptokens_to_field_path(GList *ptokens, struct bt_ctf_field_path *field_path, enum bt_ctf_field_type_id type_id = bt_ctf_field_type_common_get_type_id(type); - BT_LOGV("Current path token: token=\"%s\"", field_name); + BT_LOGT("Current path token: token=\"%s\"", field_name); /* Find to which index corresponds the current path token */ if (type_id == BT_CTF_FIELD_TYPE_ID_ARRAY || @@ -541,7 +541,7 @@ int relative_ptokens_to_field_path(GList *ptokens, int cur_index = type_stack_at(ctx->type_stack, parent_pos_in_stack)->index; - BT_LOGV("Locating target field type from current parent field type: " + BT_LOGT("Locating target field type from current parent field type: " "parent-pos=%d, parent-ft-addr=%p, cur-index=%d", parent_pos_in_stack, parent_type, cur_index); @@ -550,7 +550,7 @@ int relative_ptokens_to_field_path(GList *ptokens, parent_type, cur_index); if (ret) { /* Not found... yet */ - BT_LOGV_STR("Not found at this point."); + BT_LOGT_STR("Not found at this point."); bt_ctf_field_path_clear(tail_field_path); } else { /* Found: stitch tail field path to head field path */ @@ -595,7 +595,7 @@ int relative_ptokens_to_field_path(GList *ptokens, struct bt_ctf_field_type_common *root_type; bt_ctf_field_path_clear(field_path); - BT_LOGV("Looking into potential root scope: scope=%s", + BT_LOGT("Looking into potential root scope: scope=%s", bt_ctf_scope_string(field_path->root)); root_type = get_type_from_ctx(ctx, field_path->root); if (!root_type) { @@ -608,13 +608,13 @@ int relative_ptokens_to_field_path(GList *ptokens, root_type, INT_MAX); if (ret) { /* Not found yet */ - BT_LOGV_STR("Not found in this scope."); + BT_LOGT_STR("Not found in this scope."); field_path->root--; continue; } /* Found */ - BT_LOGV_STR("Found in this scope."); + BT_LOGT_STR("Found in this scope."); break; } } @@ -662,7 +662,7 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr, if (root_scope == BT_CTF_SCOPE_UNKNOWN) { /* Relative path: start with current root scope */ field_path->root = ctx->root_scope; - BT_LOGV("Detected relative path: starting with current root scope: " + BT_LOGT("Detected relative path: starting with current root scope: " "scope=%s", bt_ctf_scope_string(field_path->root)); ret = relative_ptokens_to_field_path(ptokens, field_path, ctx); if (ret) { @@ -680,7 +680,7 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr, } else { /* Absolute path: use found root scope */ field_path->root = root_scope; - BT_LOGV("Detected absolute path: using root scope: " + BT_LOGT("Detected absolute path: using root scope: " "scope=%s", bt_ctf_scope_string(field_path->root)); ret = absolute_ptokens_to_field_path(ptokens, field_path, ctx); if (ret) { @@ -697,7 +697,7 @@ struct bt_ctf_field_path *pathstr_to_field_path(const char *pathstr, const char *field_path_pretty_str = field_path_pretty ? field_path_pretty->str : NULL; - BT_LOGV("Found field path: path=\"%s\", field-path=\"%s\"", + BT_LOGT("Found field path: path=\"%s\", field-path=\"%s\"", pathstr, field_path_pretty_str); if (field_path_pretty) { @@ -812,7 +812,7 @@ int get_field_paths_lca_index(struct bt_ctf_field_path *field_path1, int lca_index = 0; int field_path1_len, field_path2_len; - if (BT_LOG_ON_VERBOSE) { + if (BT_LOG_ON_TRACE) { GString *field_path1_pretty = bt_ctf_field_path_string(field_path1); GString *field_path2_pretty = @@ -822,7 +822,7 @@ int get_field_paths_lca_index(struct bt_ctf_field_path *field_path1, const char *field_path2_pretty_str = field_path2_pretty ? field_path2_pretty->str : NULL; - BT_LOGV("Finding lowest common ancestor (LCA) between two field paths: " + BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: " "field-path-1=\"%s\", field-path-2=\"%s\"", field_path1_pretty_str, field_path2_pretty_str); @@ -873,7 +873,7 @@ int get_field_paths_lca_index(struct bt_ctf_field_path *field_path1, lca_index++; } - BT_LOGV("Found LCA: lca-index=%d", lca_index); + BT_LOGT("Found LCA: lca-index=%d", lca_index); return lca_index; } @@ -1193,7 +1193,7 @@ int resolve_type(struct bt_ctf_field_type_common *type, struct resolve_context * f_index; } - BT_LOGV("Resolving field type's child field type: " + BT_LOGT("Resolving field type's child field type: " "parent-ft-addr=%p, child-ft-addr=%p, " "index=%" PRId64 ", count=%" PRId64, type, child_type, f_index, field_count); @@ -1255,7 +1255,7 @@ int bt_ctf_resolve_types( .root_scope = BT_CTF_SCOPE_UNKNOWN, }; - BT_LOGV("Resolving field types: " + BT_LOGT("Resolving field types: " "packet-header-ft-addr=%p, " "packet-context-ft-addr=%p, " "event-header-ft-addr=%p, " @@ -1333,7 +1333,7 @@ int bt_ctf_resolve_types( } } - BT_LOGV_STR("Resolved field types."); + BT_LOGT_STR("Resolved field types."); end: type_stack_destroy(ctx.type_stack); diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c index 0fc5c46b..5346c530 100644 --- a/src/ctf-writer/stream-class.c +++ b/src/ctf-writer/stream-class.c @@ -323,7 +323,7 @@ int bt_ctf_stream_class_common_add_event_class( /* Only set an event ID if none was explicitly set before */ *event_id = bt_ctf_event_class_common_get_id(event_class); if (*event_id < 0) { - BT_LOGV("Event class has no ID: automatically setting it: " + BT_LOGT("Event class has no ID: automatically setting it: " "id=%" PRId64, stream_class->next_event_id); if (bt_ctf_event_class_common_set_id(event_class, @@ -439,7 +439,7 @@ int bt_ctf_stream_class_common_visit(struct bt_ctf_stream_class_common *stream_c ret = bt_ctf_visitor_helper(&obj, get_event_class_count, get_event_class, visit_event_class, visitor, data); - BT_LOGV("bt_ctf_visitor_helper() returned: ret=%d", ret); + BT_LOGT("bt_ctf_visitor_helper() returned: ret=%d", ret); end: return ret; @@ -785,7 +785,7 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class, ret = bt_ctf_field_type_common_structure_replace_field( (void *) parent_ft, field_name, (void *) ft_copy); bt_ctf_object_put_ref(ft_copy); - BT_LOGV("Automatically mapped field type to stream class's clock class: " + BT_LOGT("Automatically mapped field type to stream class's clock class: " "stream-class-addr=%p, stream-class-name=\"%s\", " "stream-class-id=%" PRId64 ", ft-addr=%p, " "ft-copy-addr=%p", @@ -855,7 +855,7 @@ struct bt_ctf_clock *bt_ctf_stream_class_get_clock( } if (!stream_class->clock) { - BT_LOGV("Stream class has no clock: " + BT_LOGT("Stream class has no clock: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_get_name(stream_class), @@ -896,7 +896,7 @@ int bt_ctf_stream_class_set_clock( /* Replace the current clock of this stream class. */ bt_ctf_object_put_ref(stream_class->clock); stream_class->clock = bt_ctf_object_get_ref(clock); - BT_LOGV("Set stream class's clock: " + BT_LOGT("Set stream class's clock: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "clock-addr=%p, clock-name=\"%s\"", stream_class, diff --git a/src/ctf-writer/stream-class.h b/src/ctf-writer/stream-class.h index f7fc4dbb..f39f405e 100644 --- a/src/ctf-writer/stream-class.h +++ b/src/ctf-writer/stream-class.h @@ -115,7 +115,7 @@ int64_t bt_ctf_stream_class_common_get_id( BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); if (!stream_class->id_set) { - BT_LOGV("Stream class's ID is not set: addr=%p, name=\"%s\"", + BT_LOGT("Stream class's ID is not set: addr=%p, name=\"%s\"", stream_class, bt_ctf_stream_class_common_get_name(stream_class)); ret = (int64_t) -1; @@ -193,7 +193,7 @@ int bt_ctf_stream_class_common_set_name(struct bt_ctf_stream_class_common *strea g_string_assign(stream_class->name, name); } - BT_LOGV("Set stream class's name: " + BT_LOGT("Set stream class's name: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), bt_ctf_stream_class_common_get_id(stream_class)); @@ -208,7 +208,7 @@ void _bt_ctf_stream_class_common_set_id( BT_ASSERT(stream_class); stream_class->id = id; stream_class->id_set = 1; - BT_LOGV("Set stream class's ID (internal): " + BT_LOGT("Set stream class's ID (internal): " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), bt_ctf_stream_class_common_get_id(stream_class)); @@ -259,7 +259,7 @@ int bt_ctf_stream_class_common_set_id(struct bt_ctf_stream_class_common *stream_ ret = bt_ctf_stream_class_common_set_id_no_check(stream_class, id); if (ret == 0) { - BT_LOGV("Set stream class's ID: " + BT_LOGT("Set stream class's ID: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -361,7 +361,7 @@ int bt_ctf_stream_class_common_set_packet_context_field_type( bt_ctf_object_put_ref(stream_class->packet_context_field_type); stream_class->packet_context_field_type = packet_context_type; bt_ctf_object_get_ref(stream_class->packet_context_field_type); - BT_LOGV("Set stream class's packet context field type: " + BT_LOGT("Set stream class's packet context field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "packet-context-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -382,7 +382,7 @@ bt_ctf_stream_class_common_borrow_event_header_field_type( BT_CTF_ASSERT_PRE_NON_NULL(stream_class, "Stream class"); if (!stream_class->event_header_field_type) { - BT_LOGV("Stream class has no event header field type: " + BT_LOGT("Stream class has no event header field type: " "addr=%p, name=\"%s\", id=%" PRId64, stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -438,7 +438,7 @@ int bt_ctf_stream_class_common_set_event_header_field_type( bt_ctf_object_put_ref(stream_class->event_header_field_type); stream_class->event_header_field_type = event_header_type; bt_ctf_object_get_ref(stream_class->event_header_field_type); - BT_LOGV("Set stream class's event header field type: " + BT_LOGT("Set stream class's event header field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "event-header-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), @@ -508,7 +508,7 @@ int bt_ctf_stream_class_common_set_event_context_field_type( bt_ctf_object_put_ref(stream_class->event_context_field_type); stream_class->event_context_field_type = event_context_type; bt_ctf_object_get_ref(stream_class->event_context_field_type); - BT_LOGV("Set stream class's event context field type: " + BT_LOGT("Set stream class's event context field type: " "addr=%p, name=\"%s\", id=%" PRId64 ", " "event-context-ft-addr=%p", stream_class, bt_ctf_stream_class_common_get_name(stream_class), diff --git a/src/ctf-writer/stream.c b/src/ctf-writer/stream.c index c7540264..da1228d6 100644 --- a/src/ctf-writer/stream.c +++ b/src/ctf-writer/stream.c @@ -211,7 +211,7 @@ int set_packet_header_magic(struct bt_ctf_stream *stream) if (!magic_field) { /* No magic field found. Not an error, skip. */ - BT_LOGV("No field named `magic` in packet header: skipping: " + BT_LOGT("No field named `magic` in packet header: skipping: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); goto end; @@ -226,7 +226,7 @@ int set_packet_header_magic(struct bt_ctf_stream *stream) stream, bt_ctf_stream_get_name(stream), magic_field, (uint64_t) magic_value); } else { - BT_LOGV("Set packet header field's `magic` field's value: " + BT_LOGT("Set packet header field's `magic` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64, stream, bt_ctf_stream_get_name(stream), magic_field, (uint64_t) magic_value); @@ -249,7 +249,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream) if (!uuid_field) { /* No uuid field found. Not an error, skip. */ - BT_LOGV("No field named `uuid` in packet header: skipping: " + BT_LOGT("No field named `uuid` in packet header: skipping: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); goto end; @@ -275,7 +275,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream) } } - BT_LOGV("Set packet header field's `uuid` field's value: " + BT_LOGT("Set packet header field's `uuid` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p", stream, bt_ctf_stream_get_name(stream), uuid_field); @@ -295,7 +295,7 @@ int set_packet_header_stream_id(struct bt_ctf_stream *stream) if (!stream_id_field) { /* No stream_id field found. Not an error, skip. */ - BT_LOGV("No field named `stream_id` in packet header: skipping: " + BT_LOGT("No field named `stream_id` in packet header: skipping: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); goto end; @@ -310,7 +310,7 @@ int set_packet_header_stream_id(struct bt_ctf_stream *stream) stream, bt_ctf_stream_get_name(stream), stream_id_field, (uint64_t) stream_id); } else { - BT_LOGV("Set packet header field's `stream_id` field's value: " + BT_LOGT("Set packet header field's `stream_id` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64, stream, bt_ctf_stream_get_name(stream), stream_id_field, (uint64_t) stream_id); @@ -354,7 +354,7 @@ int auto_populate_packet_header(struct bt_ctf_stream *stream) goto end; } - BT_LOGV("Automatically populated stream's packet header's known fields: " + BT_LOGT("Automatically populated stream's packet header's known fields: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); @@ -377,7 +377,7 @@ int set_packet_context_packet_size(struct bt_ctf_stream *stream, stream, bt_ctf_stream_get_name(stream), field, packet_size_bits); } else { - BT_LOGV("Set packet context field's `packet_size` field's value: " + BT_LOGT("Set packet context field's `packet_size` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64, stream, bt_ctf_stream_get_name(stream), field, packet_size_bits); @@ -399,7 +399,7 @@ int set_packet_context_content_size(struct bt_ctf_stream *stream, if (!field) { /* No content size field found. Not an error, skip. */ - BT_LOGV("No field named `content_size` in packet context: skipping: " + BT_LOGT("No field named `content_size` in packet context: skipping: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); goto end; @@ -412,7 +412,7 @@ int set_packet_context_content_size(struct bt_ctf_stream *stream, stream, bt_ctf_stream_get_name(stream), field, content_size_bits); } else { - BT_LOGV("Set packet context field's `content_size` field's value: " + BT_LOGT("Set packet context field's `content_size` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64, stream, bt_ctf_stream_get_name(stream), field, content_size_bits); @@ -434,7 +434,7 @@ int set_packet_context_events_discarded(struct bt_ctf_stream *stream) if (!field) { /* No discarded events count field found. Not an error, skip. */ - BT_LOGV("No field named `events_discarded` in packet context: skipping: " + BT_LOGT("No field named `events_discarded` in packet context: skipping: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); goto end; @@ -479,7 +479,7 @@ int set_packet_context_events_discarded(struct bt_ctf_stream *stream) stream, bt_ctf_stream_get_name(stream), field, stream->discarded_events); } else { - BT_LOGV("Set packet context field's `events_discarded` field's value: " + BT_LOGT("Set packet context field's `events_discarded` field's value: " "stream-addr=%p, stream-name=\"%s\", field-addr=%p, value=%" PRIu64, stream, bt_ctf_stream_get_name(stream), field, stream->discarded_events); @@ -499,7 +499,7 @@ void update_clock_value(uint64_t *val, uint64_t new_val, const uint64_t mask = pow2 - 1; uint64_t val_masked; -#ifdef BT_LOG_ENABLED_VERBOSE +#ifdef BT_LOG_ENABLED_TRACE uint64_t old_val = *val; #endif @@ -519,7 +519,7 @@ void update_clock_value(uint64_t *val, uint64_t new_val, *val |= new_val; end: - BT_LOGV("Updated clock value: old-val=%" PRIu64 ", new-val=%" PRIu64, + BT_LOGT("Updated clock value: old-val=%" PRIu64 ", new-val=%" PRIu64, old_val, *val); return; } @@ -936,7 +936,7 @@ int auto_populate_packet_context(struct bt_ctf_stream *stream, bool set_ts, goto end; } - BT_LOGV("Automatically populated stream's packet context's known fields: " + BT_LOGT("Automatically populated stream's packet context's known fields: " "stream-addr=%p, stream-name=\"%s\"", stream, bt_ctf_stream_get_name(stream)); @@ -1249,7 +1249,7 @@ void bt_ctf_stream_append_discarded_events(struct bt_ctf_stream *stream, goto end; } - BT_LOGV("Appending discarded events to stream: " + BT_LOGT("Appending discarded events to stream: " "stream-addr=%p, stream-name=\"%s\", append-count=%" PRIu64, stream, bt_ctf_stream_get_name(stream), event_count); @@ -1280,7 +1280,7 @@ void bt_ctf_stream_append_discarded_events(struct bt_ctf_stream *stream, } stream->discarded_events = new_count; - BT_LOGV("Appended discarded events to stream: " + BT_LOGT("Appended discarded events to stream: " "stream-addr=%p, stream-name=\"%s\", append-count=%" PRIu64, stream, bt_ctf_stream_get_name(stream), event_count); @@ -1311,7 +1311,7 @@ static int auto_populate_event_header(struct bt_ctf_stream *stream, goto end; } - BT_LOGV("Automatically populating event's header field: " + BT_LOGT("Automatically populating event's header field: " "stream-addr=%p, stream-name=\"%s\", event-addr=%p", stream, bt_ctf_stream_get_name(stream), event); @@ -1367,7 +1367,7 @@ static int auto_populate_event_header(struct bt_ctf_stream *stream, } } - BT_LOGV("Automatically populated event's header field: " + BT_LOGT("Automatically populated event's header field: " "stream-addr=%p, stream-name=\"%s\", event-addr=%p", stream, bt_ctf_stream_get_name(stream), event); @@ -1395,7 +1395,7 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream, goto end; } - BT_LOGV("Appending event to stream: " + BT_LOGT("Appending event to stream: " "stream-addr=%p, stream-name=\"%s\", event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, stream, bt_ctf_stream_get_name(stream), event, @@ -1418,7 +1418,7 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream, } bt_ctf_object_set_parent(&event->common.base, &stream->common.base); - BT_LOGV_STR("Automatically populating the header of the event to append."); + BT_LOGT_STR("Automatically populating the header of the event to append."); ret = auto_populate_event_header(stream, event); if (ret) { /* auto_populate_event_header() reports errors */ @@ -1426,12 +1426,12 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream, } /* Make sure the various scopes of the event are set */ - BT_LOGV_STR("Validating event to append."); + BT_LOGT_STR("Validating event to append."); BT_CTF_ASSERT_PRE(bt_ctf_event_common_validate(BT_CTF_TO_COMMON(event)) == 0, "Invalid event: event-addr=%p", event); /* Save the new event and freeze it */ - BT_LOGV_STR("Freezing the event to append."); + BT_LOGT_STR("Freezing the event to append."); bt_ctf_event_common_set_is_frozen(BT_CTF_TO_COMMON(event), true); g_ptr_array_add(stream->events, event); @@ -1441,9 +1441,9 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream, * class share the same lifetime guarantees and the reference is no * longer needed. */ - BT_LOGV_STR("Putting the event's class."); + BT_LOGT_STR("Putting the event's class."); bt_ctf_object_put_ref(event->common.class); - BT_LOGV("Appended event to stream: " + BT_LOGT("Appended event to stream: " "stream-addr=%p, stream-name=\"%s\", event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64, stream, bt_ctf_stream_get_name(stream), event, @@ -1509,7 +1509,7 @@ int bt_ctf_stream_set_packet_context(struct bt_ctf_stream *stream, bt_ctf_object_put_ref(field_type); bt_ctf_object_put_ref(stream->packet_context); stream->packet_context = bt_ctf_object_get_ref(field); - BT_LOGV("Set stream's packet context field: " + BT_LOGT("Set stream's packet context field: " "stream-addr=%p, stream-name=\"%s\", " "packet-context-field-addr=%p", stream, bt_ctf_stream_get_name(stream), field); @@ -1583,7 +1583,7 @@ int bt_ctf_stream_set_packet_header(struct bt_ctf_stream *stream, skip_validation: bt_ctf_object_put_ref(stream->packet_header); stream->packet_header = bt_ctf_object_get_ref(field); - BT_LOGV("Set stream's packet header field: " + BT_LOGT("Set stream's packet header field: " "stream-addr=%p, stream-name=\"%s\", " "packet-header-field-addr=%p", stream, bt_ctf_stream_get_name(stream), field); @@ -1645,7 +1645,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) } } - BT_LOGV("Flushing stream's current packet: stream-addr=%p, " + BT_LOGT("Flushing stream's current packet: stream-addr=%p, " "stream-name=\"%s\", packet-index=%u", stream, bt_ctf_stream_get_name(stream), stream->flushed_packet_count); trace = BT_CTF_FROM_COMMON(bt_ctf_stream_class_common_borrow_trace( @@ -1676,7 +1676,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) } if (stream->packet_header) { - BT_LOGV_STR("Serializing packet header field (initial)."); + BT_LOGT_STR("Serializing packet header field (initial)."); ret = bt_ctf_field_serialize_recursive(stream->packet_header, &stream->ctfser, native_byte_order); if (ret) { @@ -1693,7 +1693,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) &stream->ctfser); /* Write packet context */ - BT_LOGV_STR("Serializing packet context field (initial)."); + BT_LOGT_STR("Serializing packet context field (initial)."); ret = bt_ctf_field_serialize_recursive(stream->packet_context, &stream->ctfser, native_byte_order); if (ret) { @@ -1703,7 +1703,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) } } - BT_LOGV("Serializing events: count=%u", stream->events->len); + BT_LOGT("Serializing events: count=%u", stream->events->len); for (i = 0; i < stream->events->len; i++) { struct bt_ctf_event *event = g_ptr_array_index( @@ -1712,7 +1712,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) BT_CTF_FROM_COMMON(bt_ctf_event_common_borrow_class( BT_CTF_TO_COMMON(event))); - BT_LOGV("Serializing event: index=%zu, event-addr=%p, " + BT_LOGT("Serializing event: index=%zu, event-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "ser-offset=%" PRIu64, i, event, bt_ctf_event_class_get_name(event_class), @@ -1722,7 +1722,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) /* Write event header */ if (event->common.header_field) { - BT_LOGV_STR("Serializing event's header field."); + BT_LOGT_STR("Serializing event's header field."); ret = bt_ctf_field_serialize_recursive( (void *) event->common.header_field->field, &stream->ctfser, native_byte_order); @@ -1736,7 +1736,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) /* Write stream event context */ if (event->common.stream_event_context_field) { - BT_LOGV_STR("Serializing event's stream event context field."); + BT_LOGT_STR("Serializing event's stream event context field."); ret = bt_ctf_field_serialize_recursive( (void *) event->common.stream_event_context_field, &stream->ctfser, native_byte_order); @@ -1813,7 +1813,7 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream) goto end; } - BT_LOGV("Rewriting (serializing) packet context field."); + BT_LOGT("Rewriting (serializing) packet context field."); ret = bt_ctf_field_serialize_recursive(stream->packet_context, &stream->ctfser, native_byte_order); if (ret) { @@ -1838,7 +1838,7 @@ end: } if (ret == 0) { - BT_LOGV("Flushed stream's current packet: " + BT_LOGT("Flushed stream's current packet: " "content-size=%" PRIu64 ", packet-size=%" PRIu64, content_size_bits, packet_size_bits); } @@ -1884,7 +1884,7 @@ int _set_structure_field_integer(struct bt_ctf_field *structure, char *name, integer = bt_ctf_field_structure_get_field_by_name(structure, name); if (!integer) { /* Field not found, not an error. */ - BT_LOGV("Field not found: struct-field-addr=%p, " + BT_LOGT("Field not found: struct-field-addr=%p, " "name=\"%s\", force=%d", structure, name, force); goto end; } @@ -1892,7 +1892,7 @@ int _set_structure_field_integer(struct bt_ctf_field *structure, char *name, /* Make sure the payload has not already been set. */ if (!force && bt_ctf_field_is_set_recursive(integer)) { /* Payload already set, not an error */ - BT_LOGV("Field's payload is already set: struct-field-addr=%p, " + BT_LOGT("Field's payload is already set: struct-field-addr=%p, " "name=\"%s\", force=%d", structure, name, force); goto end; } diff --git a/src/ctf-writer/stream.h b/src/ctf-writer/stream.h index 253fb606..ff6f8a82 100644 --- a/src/ctf-writer/stream.h +++ b/src/ctf-writer/stream.h @@ -80,7 +80,7 @@ int64_t bt_ctf_stream_common_get_id(struct bt_ctf_stream_common *stream) BT_CTF_ASSERT_PRE_NON_NULL(stream, "Stream"); ret = stream->id; if (ret < 0) { - BT_LOGV("Stream's ID is not set: addr=%p, name=\"%s\"", + BT_LOGT("Stream's ID is not set: addr=%p, name=\"%s\"", stream, bt_ctf_stream_common_get_name(stream)); } diff --git a/src/ctf-writer/trace.c b/src/ctf-writer/trace.c index 66397985..82eb35b3 100644 --- a/src/ctf-writer/trace.c +++ b/src/ctf-writer/trace.c @@ -172,7 +172,7 @@ int bt_ctf_trace_common_set_name(struct bt_ctf_trace_common *trace, const char * goto end; } - BT_LOGV("Set trace's name: addr=%p, name=\"%s\"", trace, name); + BT_LOGT("Set trace's name: addr=%p, name=\"%s\"", trace, name); end: return ret; @@ -206,7 +206,7 @@ int bt_ctf_trace_common_set_uuid(struct bt_ctf_trace_common *trace, memcpy(trace->uuid, uuid, BABELTRACE_UUID_LEN); trace->uuid_set = BT_TRUE; - BT_LOGV("Set trace's UUID: addr=%p, name=\"%s\", " + BT_LOGT("Set trace's UUID: addr=%p, name=\"%s\", " "uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"", trace, bt_ctf_trace_common_get_name(trace), (unsigned int) uuid[0], @@ -307,7 +307,7 @@ int bt_ctf_trace_common_set_environment_field(struct bt_ctf_trace_common *trace, "env-name=\"%s\"", trace, bt_ctf_trace_common_get_name(trace), name); } else { - BT_LOGV("Set environment field's value: " + BT_LOGT("Set environment field's value: " "trace-addr=%p, trace-name=\"%s\", " "env-name=\"%s\", value-addr=%p", trace, bt_ctf_trace_common_get_name(trace), name, value); @@ -406,11 +406,11 @@ int bt_ctf_trace_common_add_clock_class(struct bt_ctf_trace_common *trace, g_ptr_array_add(trace->clock_classes, clock_class); if (trace->frozen) { - BT_LOGV_STR("Freezing added clock class because trace is frozen."); + BT_LOGT_STR("Freezing added clock class because trace is frozen."); bt_ctf_clock_class_freeze(clock_class); } - BT_LOGV("Added clock class to trace: " + BT_LOGT("Added clock class to trace: " "trace-addr=%p, trace-name=\"%s\", " "clock-class-addr=%p, clock-class-name=\"%s\"", trace, bt_ctf_trace_common_get_name(trace), @@ -1323,7 +1323,7 @@ int bt_ctf_trace_common_set_native_byte_order(struct bt_ctf_trace_common *trace, } trace->native_byte_order = byte_order; - BT_LOGV("Set trace's native byte order: " + BT_LOGT("Set trace's native byte order: " "addr=%p, name=\"%s\", bo=%s", trace, bt_ctf_trace_common_get_name(trace), bt_ctf_byte_order_string(byte_order)); @@ -1366,7 +1366,7 @@ int bt_ctf_trace_common_set_packet_header_field_type(struct bt_ctf_trace_common bt_ctf_object_put_ref(trace->packet_header_field_type); trace->packet_header_field_type = bt_ctf_object_get_ref(packet_header_type); - BT_LOGV("Set trace's packet header field type: " + BT_LOGT("Set trace's packet header field type: " "addr=%p, name=\"%s\", packet-context-ft-addr=%p", trace, bt_ctf_trace_common_get_name(trace), packet_header_type); end: @@ -1414,7 +1414,7 @@ int bt_ctf_trace_visit(struct bt_ctf_trace *trace, goto end; } - BT_LOGV("Visiting trace: addr=%p, name=\"%s\"", + BT_LOGT("Visiting trace: addr=%p, name=\"%s\"", trace, bt_ctf_trace_get_name(trace)); ret = bt_ctf_visitor_helper(&obj, get_stream_class_count, get_stream_class, visit_stream_class, visitor, data); diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c index f221a3ca..5ac82475 100644 --- a/src/ctf-writer/utils.c +++ b/src/ctf-writer/utils.c @@ -89,7 +89,7 @@ bt_bool bt_ctf_identifier_is_valid(const char *identifier) char *save_ptr, *token; if (!identifier) { - BT_LOGV_STR("Invalid parameter: input string is NULL."); + BT_LOGT_STR("Invalid parameter: input string is NULL."); is_valid = BT_FALSE; goto end; } diff --git a/src/ctf-writer/validation.c b/src/ctf-writer/validation.c index 8efd5463..f6d031d7 100644 --- a/src/ctf-writer/validation.c +++ b/src/ctf-writer/validation.c @@ -60,7 +60,7 @@ int validate_event_class_types(struct bt_ctf_private_value *environment, { int ret = 0; - BT_LOGV("Validating event class field types: " + BT_LOGT("Validating event class field types: " "packet-header-ft-addr=%p, " "packet-context-ft-addr=%p, " "event-header-ft-addr=%p, " @@ -122,7 +122,7 @@ int validate_stream_class_types(struct bt_ctf_private_value *environment, { int ret = 0; - BT_LOGV("Validating stream class field types: " + BT_LOGT("Validating stream class field types: " "packet-header-ft-addr=%p, " "packet-context-ft-addr=%p, " "event-header-ft-addr=%p, " @@ -187,7 +187,7 @@ int validate_trace_types(struct bt_ctf_private_value *environment, { int ret = 0; - BT_LOGV("Validating event class field types: " + BT_LOGT("Validating event class field types: " "packet-header-ft-addr=%p", packet_header_type); /* Resolve sequence type lengths and variant type tags first */ @@ -280,7 +280,7 @@ int bt_ctf_validate_class_types(struct bt_ctf_private_value *environment, int contains_seq_var; int valid_ret; - BT_LOGV("Validating field types: " + BT_LOGT("Validating field types: " "packet-header-ft-addr=%p, " "packet-context-ft-addr=%p, " "event-header-ft-addr=%p, " @@ -337,7 +337,7 @@ int bt_ctf_validate_class_types(struct bt_ctf_private_value *environment, goto skip_packet_header_type_copy; } - BT_LOGV_STR("Copying packet header field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying packet header field type because it contains at least one sequence or variant field type."); packet_header_type_copy = copy_field_type_func(packet_header_type); if (!packet_header_type_copy) { @@ -388,7 +388,7 @@ skip_packet_header_type_copy: goto skip_packet_context_type_copy; } - BT_LOGV_STR("Copying packet context field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying packet context field type because it contains at least one sequence or variant field type."); packet_context_type_copy = copy_field_type_func(packet_context_type); if (!packet_context_type_copy) { @@ -419,7 +419,7 @@ skip_packet_context_type_copy: goto skip_event_header_type_copy; } - BT_LOGV_STR("Copying event header field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying event header field type because it contains at least one sequence or variant field type."); event_header_type_copy = copy_field_type_func(event_header_type); if (!event_header_type_copy) { @@ -451,7 +451,7 @@ skip_event_header_type_copy: goto skip_stream_event_ctx_type_copy; } - BT_LOGV_STR("Copying stream event context field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying stream event context field type because it contains at least one sequence or variant field type."); stream_event_ctx_type_copy = copy_field_type_func(stream_event_ctx_type); if (!stream_event_ctx_type_copy) { @@ -513,7 +513,7 @@ sc_validation_done: goto skip_event_context_type_copy; } - BT_LOGV_STR("Copying event context field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying event context field type because it contains at least one sequence or variant field type."); event_context_type_copy = copy_field_type_func(event_context_type); if (!event_context_type_copy) { @@ -544,7 +544,7 @@ skip_event_context_type_copy: goto skip_event_payload_type_copy; } - BT_LOGV_STR("Copying event payload field type because it contains at least one sequence or variant field type."); + BT_LOGT_STR("Copying event payload field type because it contains at least one sequence or variant field type."); event_payload_type_copy = copy_field_type_func(event_payload_type); if (!event_payload_type_copy) { diff --git a/src/ctf-writer/values.c b/src/ctf-writer/values.c index 1e887d5e..643ba0bb 100644 --- a/src/ctf-writer/values.c +++ b/src/ctf-writer/values.c @@ -333,7 +333,7 @@ bt_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a, { if (BT_CTF_VALUE_TO_BOOL(object_a)->value != BT_CTF_VALUE_TO_BOOL(object_b)->value) { - BT_LOGV("Boolean value objects are different: " + BT_LOGT("Boolean value objects are different: " "bool-a-val=%d, bool-b-val=%d", BT_CTF_VALUE_TO_BOOL(object_a)->value, BT_CTF_VALUE_TO_BOOL(object_b)->value); @@ -349,7 +349,7 @@ bt_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a, { if (BT_CTF_VALUE_TO_INTEGER(object_a)->value != BT_CTF_VALUE_TO_INTEGER(object_b)->value) { - BT_LOGV("Integer value objects are different: " + BT_LOGT("Integer value objects are different: " "int-a-val=%" PRId64 ", int-b-val=%" PRId64, BT_CTF_VALUE_TO_INTEGER(object_a)->value, BT_CTF_VALUE_TO_INTEGER(object_b)->value); @@ -365,7 +365,7 @@ bt_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a, { if (BT_CTF_VALUE_TO_REAL(object_a)->value != BT_CTF_VALUE_TO_REAL(object_b)->value) { - BT_LOGV("Real number value objects are different: " + BT_LOGT("Real number value objects are different: " "real-a-val=%f, real-b-val=%f", BT_CTF_VALUE_TO_REAL(object_a)->value, BT_CTF_VALUE_TO_REAL(object_b)->value); @@ -381,7 +381,7 @@ bt_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a, { if (strcmp(BT_CTF_VALUE_TO_STRING(object_a)->gstr->str, BT_CTF_VALUE_TO_STRING(object_b)->gstr->str) != 0) { - BT_LOGV("String value objects are different: " + BT_LOGT("String value objects are different: " "string-a-val=\"%s\", string-b-val=\"%s\"", BT_CTF_VALUE_TO_STRING(object_a)->gstr->str, BT_CTF_VALUE_TO_STRING(object_b)->gstr->str); @@ -402,7 +402,7 @@ bt_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a, if (bt_ctf_value_array_get_size(object_a) != bt_ctf_value_array_get_size(object_b)) { - BT_LOGV("Array values are different: size mismatch " + BT_LOGT("Array values are different: size mismatch " "value-a-addr=%p, value-b-addr=%p, " "value-a-size=%" PRId64 ", value-b-size=%" PRId64, object_a, object_b, @@ -422,7 +422,7 @@ bt_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a, object_b, i); if (!bt_ctf_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Array values's elements are different: " + BT_LOGT("Array values's elements are different: " "value-a-addr=%p, value-b-addr=%p, index=%d", element_obj_a, element_obj_b, i); ret = BT_FALSE; @@ -445,7 +445,7 @@ bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, if (bt_ctf_value_map_get_size(object_a) != bt_ctf_value_map_get_size(object_b)) { - BT_LOGV("Map values are different: size mismatch " + BT_LOGT("Map values are different: size mismatch " "value-a-addr=%p, value-b-addr=%p, " "value-a-size=%" PRId64 ", value-b-size=%" PRId64, object_a, object_b, @@ -465,7 +465,7 @@ bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, key_str); if (!bt_ctf_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Map values's elements are different: " + BT_LOGT("Map values's elements are different: " "value-a-addr=%p, value-b-addr=%p, key=\"%s\"", element_obj_a, element_obj_b, key_str); ret = BT_FALSE; @@ -789,7 +789,7 @@ void bt_ctf_private_value_bool_set(struct bt_ctf_private_value *bool_obj, bt_boo BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_CTF_VALUE_TYPE_BOOL); BT_CTF_ASSERT_PRE_VALUE_HOT(bool_obj, "Value object"); BT_CTF_VALUE_TO_BOOL(bool_obj)->value = val; - BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d", + BT_LOGT("Set boolean value's raw value: value-addr=%p, value=%d", bool_obj, val); } @@ -809,7 +809,7 @@ void bt_ctf_private_value_integer_set(struct bt_ctf_private_value *integer_obj, BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(integer_obj, BT_CTF_VALUE_TYPE_INTEGER); BT_CTF_ASSERT_PRE_VALUE_HOT(integer_obj, "Value object"); BT_CTF_VALUE_TO_INTEGER(integer_obj)->value = val; - BT_LOGV("Set integer value's raw value: value-addr=%p, value=%" PRId64, + BT_LOGT("Set integer value's raw value: value-addr=%p, value=%" PRId64, integer_obj, val); } @@ -828,7 +828,7 @@ void bt_ctf_private_value_real_set(struct bt_ctf_private_value *real_obj, double BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_CTF_VALUE_TYPE_REAL); BT_CTF_ASSERT_PRE_VALUE_HOT(real_obj, "Value object"); BT_CTF_VALUE_TO_REAL(real_obj)->value = val; - BT_LOGV("Set real number value's raw value: value-addr=%p, value=%f", + BT_LOGT("Set real number value's raw value: value-addr=%p, value=%f", real_obj, val); } @@ -848,7 +848,7 @@ enum bt_ctf_value_status bt_ctf_private_value_string_set( BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_CTF_VALUE_TYPE_STRING); BT_CTF_ASSERT_PRE_VALUE_HOT(string_obj, "Value object"); g_string_assign(BT_CTF_VALUE_TO_STRING(string_obj)->gstr, val); - BT_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p", + BT_LOGT("Set string value's raw value: value-addr=%p, raw-value-addr=%p", string_obj, val); return BT_CTF_VALUE_STATUS_OK; } @@ -899,7 +899,7 @@ enum bt_ctf_value_status bt_ctf_private_value_array_append_element( BT_CTF_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object"); g_ptr_array_add(typed_array_obj->garray, element_obj); bt_ctf_object_get_ref(element_obj); - BT_LOGV("Appended element to array value: array-value-addr=%p, " + BT_LOGT("Appended element to array value: array-value-addr=%p, " "element-value-addr=%p, new-size=%u", array_obj, element_obj, typed_array_obj->garray->len); return BT_CTF_VALUE_STATUS_OK; @@ -1006,7 +1006,7 @@ enum bt_ctf_value_status bt_ctf_private_value_array_set_element_by_index( bt_ctf_object_put_ref(g_ptr_array_index(typed_array_obj->garray, index)); g_ptr_array_index(typed_array_obj->garray, index) = element_obj; bt_ctf_object_get_ref(element_obj); - BT_LOGV("Set array value's element: array-value-addr=%p, " + BT_LOGT("Set array value's element: array-value-addr=%p, " "index=%" PRIu64 ", element-value-addr=%p", array_obj, index, element_obj); return BT_CTF_VALUE_STATUS_OK; @@ -1061,7 +1061,7 @@ enum bt_ctf_value_status bt_ctf_private_value_map_insert_entry( g_hash_table_insert(BT_CTF_VALUE_TO_MAP(map_obj)->ght, GUINT_TO_POINTER(g_quark_from_string(key)), element_obj); bt_ctf_object_get_ref(element_obj); - BT_LOGV("Inserted value into map value: map-value-addr=%p, " + BT_LOGT("Inserted value into map value: map-value-addr=%p, " "key=\"%s\", element-value-addr=%p", map_obj, key, element_obj); return BT_CTF_VALUE_STATUS_OK; @@ -1170,7 +1170,7 @@ enum bt_ctf_value_status bt_ctf_value_map_foreach_entry(const struct bt_ctf_valu const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); if (!cb(key_str, element_obj, data)) { - BT_LOGV("User canceled the loop: key=\"%s\", " + BT_LOGT("User canceled the loop: key=\"%s\", " "value-addr=%p, data=%p", key_str, element_obj, data); ret = BT_CTF_VALUE_STATUS_CANCELED; @@ -1331,7 +1331,7 @@ bt_bool bt_ctf_value_compare(const struct bt_ctf_value *object_a, BT_CTF_ASSERT_PRE_NON_NULL(object_b, "Value object B"); if (object_a->type != object_b->type) { - BT_LOGV("Values are different: type mismatch: " + BT_LOGT("Values are different: type mismatch: " "value-a-addr=%p, value-b-addr=%p, " "value-a-type=%d, value-b-type=%d", object_a, object_b, object_a->type, object_b->type); diff --git a/src/lib/logging.h b/src/lib/logging.h index 498be21e..560b422a 100644 --- a/src/lib/logging.h +++ b/src/lib/logging.h @@ -52,7 +52,7 @@ int bt_lib_log_level; #define BT_LIB_LOGW(_fmt, ...) BT_LIB_LOG(BT_LOG_WARN, _fmt, ##__VA_ARGS__) #define BT_LIB_LOGI(_fmt, ...) BT_LIB_LOG(BT_LOG_INFO, _fmt, ##__VA_ARGS__) #define BT_LIB_LOGD(_fmt, ...) BT_LIB_LOG(BT_LOG_DEBUG, _fmt, ##__VA_ARGS__) -#define BT_LIB_LOGV(_fmt, ...) BT_LIB_LOG(BT_LOG_VERBOSE, _fmt, ##__VA_ARGS__) +#define BT_LIB_LOGT(_fmt, ...) BT_LIB_LOG(BT_LOG_TRACE, _fmt, ##__VA_ARGS__) /* * Log statement, specialized for the Babeltrace library. diff --git a/src/lib/object-pool.h b/src/lib/object-pool.h index edfcf82c..24d1e540 100644 --- a/src/lib/object-pool.h +++ b/src/lib/object-pool.h @@ -108,8 +108,8 @@ void *bt_object_pool_create_object(struct bt_object_pool *pool) BT_ASSERT(pool); -#ifdef BT_LOGV - BT_LOGV("Creating object from pool: pool-addr=%p, pool-size=%zu, pool-cap=%u", +#ifdef BT_LOGT + BT_LOGT("Creating object from pool: pool-addr=%p, pool-size=%zu, pool-cap=%u", pool, pool->size, pool->objects->len); #endif @@ -130,8 +130,8 @@ void *bt_object_pool_create_object(struct bt_object_pool *pool) obj = pool->funcs.new_object(pool->data); end: -#ifdef BT_LOGV - BT_LOGV("Created one object from pool: pool-addr=%p, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Created one object from pool: pool-addr=%p, obj-addr=%p", pool, obj); #endif @@ -151,8 +151,8 @@ void bt_object_pool_recycle_object(struct bt_object_pool *pool, void *obj) BT_ASSERT(pool); BT_ASSERT(obj); -#ifdef BT_LOGV - BT_LOGV("Recycling object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Recycling object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", pool, pool->size, pool->objects->len, obj); #endif @@ -173,8 +173,8 @@ void bt_object_pool_recycle_object(struct bt_object_pool *pool, void *obj) pool->objects->pdata[pool->size] = obj; pool->size++; -#ifdef BT_LOGV - BT_LOGV("Recycled object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", +#ifdef BT_LOGT + BT_LOGT("Recycled object: pool-addr=%p, pool-size=%zu, pool-cap=%u, obj-addr=%p", pool, pool->size, pool->objects->len, obj); #endif } diff --git a/src/lib/object.h b/src/lib/object.h index b8cb33bf..2d9fc602 100644 --- a/src/lib/object.h +++ b/src/lib/object.h @@ -33,10 +33,10 @@ * for internal reference counting. Until we make this header generic * for the whole project, make it possible to disable logging in this * file by defining `BT_OBJECT_DONT_LOG` because it's possible that the - * BT_LOGV() statements here won't find the log level + * BT_LOGT() statements here won't find the log level * (`BT_LOG_OUTPUT_LEVEL`). */ -#if defined(BT_LOGV) && !defined(BT_OBJECT_DONT_LOG) +#if defined(BT_LOGT) && !defined(BT_OBJECT_DONT_LOG) # define _BT_OBJECT_LOGGING_ENABLED #endif @@ -139,7 +139,7 @@ void bt_object_set_parent(struct bt_object *child, struct bt_object *parent) BT_ASSERT(child->is_shared); #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Setting object's parent: addr=%p, parent-addr=%p", + BT_LOGT("Setting object's parent: addr=%p, parent-addr=%p", child, parent); #endif @@ -186,7 +186,7 @@ void bt_object_with_parent_release_func(struct bt_object *obj) struct bt_object *parent = obj->parent; #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Releasing parented object: addr=%p, ref-count=%llu, " + BT_LOGT("Releasing parented object: addr=%p, ref-count=%llu, " "parent-addr=%p, parent-ref-count=%llu", obj, obj->ref_count, parent, parent->ref_count); @@ -276,7 +276,7 @@ void bt_object_get_no_null_check_no_parent_check(const struct bt_object *c_obj) BT_ASSERT(obj->is_shared); #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Incrementing object's reference count: %llu -> %llu: " + BT_LOGT("Incrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count + 1, obj, obj->ref_count, obj->ref_count + 1); @@ -295,7 +295,7 @@ void bt_object_get_no_null_check(const void *c_obj) if (G_UNLIKELY(obj->parent && bt_object_get_ref_count(obj) == 0)) { #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Incrementing object's parent's reference count: " + BT_LOGT("Incrementing object's parent's reference count: " "addr=%p, parent-addr=%p", obj, obj->parent); #endif @@ -303,7 +303,7 @@ void bt_object_get_no_null_check(const void *c_obj) } #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Incrementing object's reference count: %llu -> %llu: " + BT_LOGT("Incrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count + 1, obj, obj->ref_count, obj->ref_count + 1); @@ -322,7 +322,7 @@ void bt_object_put_no_null_check(const void *c_obj) BT_ASSERT(obj->ref_count > 0); #ifdef _BT_OBJECT_LOGGING_ENABLED - BT_LOGV("Decrementing object's reference count: %llu -> %llu: " + BT_LOGT("Decrementing object's reference count: %llu -> %llu: " "addr=%p, cur-count=%llu, new-count=%llu", obj->ref_count, obj->ref_count - 1, obj, obj->ref_count, obj->ref_count - 1); diff --git a/src/lib/value.c b/src/lib/value.c index a288dc54..ab265e01 100644 --- a/src/lib/value.c +++ b/src/lib/value.c @@ -300,7 +300,7 @@ bt_bool bt_value_bool_compare(const struct bt_value *object_a, { if (BT_VALUE_TO_BOOL(object_a)->value != BT_VALUE_TO_BOOL(object_b)->value) { - BT_LOGV("Boolean value objects are different: " + BT_LOGT("Boolean value objects are different: " "bool-a-val=%d, bool-b-val=%d", BT_VALUE_TO_BOOL(object_a)->value, BT_VALUE_TO_BOOL(object_b)->value); @@ -317,12 +317,12 @@ bt_bool bt_value_integer_compare(const struct bt_value *object_a, if (BT_VALUE_TO_INTEGER(object_a)->value.u != BT_VALUE_TO_INTEGER(object_b)->value.u) { if (object_a->type == BT_VALUE_TYPE_UNSIGNED_INTEGER) { - BT_LOGV("Unsigned integer value objects are different: " + BT_LOGT("Unsigned integer value objects are different: " "int-a-val=%" PRIu64 ", int-b-val=%" PRIu64, BT_VALUE_TO_INTEGER(object_a)->value.u, BT_VALUE_TO_INTEGER(object_b)->value.u); } else { - BT_LOGV("Signed integer value objects are different: " + BT_LOGT("Signed integer value objects are different: " "int-a-val=%" PRId64 ", int-b-val=%" PRId64, BT_VALUE_TO_INTEGER(object_a)->value.i, BT_VALUE_TO_INTEGER(object_b)->value.i); @@ -340,7 +340,7 @@ bt_bool bt_value_real_compare(const struct bt_value *object_a, { if (BT_VALUE_TO_REAL(object_a)->value != BT_VALUE_TO_REAL(object_b)->value) { - BT_LOGV("Real number value objects are different: " + BT_LOGT("Real number value objects are different: " "real-a-val=%f, real-b-val=%f", BT_VALUE_TO_REAL(object_a)->value, BT_VALUE_TO_REAL(object_b)->value); @@ -356,7 +356,7 @@ bt_bool bt_value_string_compare(const struct bt_value *object_a, { if (strcmp(BT_VALUE_TO_STRING(object_a)->gstr->str, BT_VALUE_TO_STRING(object_b)->gstr->str) != 0) { - BT_LOGV("String value objects are different: " + BT_LOGT("String value objects are different: " "string-a-val=\"%s\", string-b-val=\"%s\"", BT_VALUE_TO_STRING(object_a)->gstr->str, BT_VALUE_TO_STRING(object_b)->gstr->str); @@ -377,7 +377,7 @@ bt_bool bt_value_array_compare(const struct bt_value *object_a, if (bt_value_array_get_size(object_a) != bt_value_array_get_size(object_b)) { - BT_LOGV("Array values are different: size mismatch " + BT_LOGT("Array values are different: size mismatch " "value-a-addr=%p, value-b-addr=%p, " "value-a-size=%" PRId64 ", value-b-size=%" PRId64, object_a, object_b, @@ -397,7 +397,7 @@ bt_bool bt_value_array_compare(const struct bt_value *object_a, object_b, i); if (!bt_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Array values's elements are different: " + BT_LOGT("Array values's elements are different: " "value-a-addr=%p, value-b-addr=%p, index=%d", element_obj_a, element_obj_b, i); ret = BT_FALSE; @@ -420,7 +420,7 @@ bt_bool bt_value_map_compare(const struct bt_value *object_a, if (bt_value_map_get_size(object_a) != bt_value_map_get_size(object_b)) { - BT_LOGV("Map values are different: size mismatch " + BT_LOGT("Map values are different: size mismatch " "value-a-addr=%p, value-b-addr=%p, " "value-a-size=%" PRId64 ", value-b-size=%" PRId64, object_a, object_b, @@ -440,7 +440,7 @@ bt_bool bt_value_map_compare(const struct bt_value *object_a, key_str); if (!bt_value_compare(element_obj_a, element_obj_b)) { - BT_LOGV("Map values's elements are different: " + BT_LOGT("Map values's elements are different: " "value-a-addr=%p, value-b-addr=%p, key=\"%s\"", element_obj_a, element_obj_b, key_str); ret = BT_FALSE; @@ -784,7 +784,7 @@ void bt_value_bool_set(struct bt_value *bool_obj, bt_bool val) BT_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_VALUE_TYPE_BOOL); BT_ASSERT_PRE_VALUE_HOT(bool_obj, "Value object"); BT_VALUE_TO_BOOL(bool_obj)->value = val; - BT_LOGV("Set boolean value's raw value: value-addr=%p, value=%d", + BT_LOGT("Set boolean value's raw value: value-addr=%p, value=%d", bool_obj, val); } @@ -818,7 +818,7 @@ void bt_value_unsigned_integer_set(struct bt_value *integer_obj, uint64_t val) { bt_value_integer_set(integer_obj, BT_VALUE_TYPE_UNSIGNED_INTEGER, val); - BT_LOGV("Set unsigned integer value's raw value: " + BT_LOGT("Set unsigned integer value's raw value: " "value-addr=%p, value=%" PRIu64, integer_obj, val); } @@ -827,7 +827,7 @@ void bt_value_signed_integer_set(struct bt_value *integer_obj, { bt_value_integer_set(integer_obj, BT_VALUE_TYPE_SIGNED_INTEGER, (uint64_t) val); - BT_LOGV("Set signed integer value's raw value: " + BT_LOGT("Set signed integer value's raw value: " "value-addr=%p, value=%" PRId64, integer_obj, val); } @@ -844,7 +844,7 @@ void bt_value_real_set(struct bt_value *real_obj, double val) BT_ASSERT_PRE_VALUE_IS_TYPE(real_obj, BT_VALUE_TYPE_REAL); BT_ASSERT_PRE_VALUE_HOT(real_obj, "Value object"); BT_VALUE_TO_REAL(real_obj)->value = val; - BT_LOGV("Set real number value's raw value: value-addr=%p, value=%f", + BT_LOGT("Set real number value's raw value: value-addr=%p, value=%f", real_obj, val); } @@ -862,7 +862,7 @@ enum bt_value_status bt_value_string_set( BT_ASSERT_PRE_VALUE_IS_TYPE(string_obj, BT_VALUE_TYPE_STRING); BT_ASSERT_PRE_VALUE_HOT(string_obj, "Value object"); g_string_assign(BT_VALUE_TO_STRING(string_obj)->gstr, val); - BT_LOGV("Set string value's raw value: value-addr=%p, raw-value-addr=%p", + BT_LOGT("Set string value's raw value: value-addr=%p, raw-value-addr=%p", string_obj, val); return BT_VALUE_STATUS_OK; } @@ -908,7 +908,7 @@ enum bt_value_status bt_value_array_append_element( BT_ASSERT_PRE_VALUE_HOT(array_obj, "Array value object"); g_ptr_array_add(typed_array_obj->garray, element_obj); bt_object_get_ref(element_obj); - BT_LOGV("Appended element to array value: array-value-addr=%p, " + BT_LOGT("Appended element to array value: array-value-addr=%p, " "element-value-addr=%p, new-size=%u", array_obj, element_obj, typed_array_obj->garray->len); return BT_VALUE_STATUS_OK; @@ -1021,7 +1021,7 @@ enum bt_value_status bt_value_array_set_element_by_index( bt_object_put_ref(g_ptr_array_index(typed_array_obj->garray, index)); g_ptr_array_index(typed_array_obj->garray, index) = element_obj; bt_object_get_ref(element_obj); - BT_LOGV("Set array value's element: array-value-addr=%p, " + BT_LOGT("Set array value's element: array-value-addr=%p, " "index=%" PRIu64 ", element-value-addr=%p", array_obj, index, element_obj); return BT_VALUE_STATUS_OK; @@ -1071,7 +1071,7 @@ enum bt_value_status bt_value_map_insert_entry( g_hash_table_insert(BT_VALUE_TO_MAP(map_obj)->ght, GUINT_TO_POINTER(g_quark_from_string(key)), element_obj); bt_object_get_ref(element_obj); - BT_LOGV("Inserted value into map value: map-value-addr=%p, " + BT_LOGT("Inserted value into map value: map-value-addr=%p, " "key=\"%s\", element-value-addr=%p", map_obj, key, element_obj); return BT_VALUE_STATUS_OK; @@ -1186,7 +1186,7 @@ enum bt_value_status bt_value_map_foreach_entry(struct bt_value *map_obj, const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); if (!func(key_str, element_obj, data)) { - BT_LOGV("User canceled the loop: key=\"%s\", " + BT_LOGT("User canceled the loop: key=\"%s\", " "value-addr=%p, data=%p", key_str, element_obj, data); ret = BT_VALUE_STATUS_CANCELED; @@ -1343,7 +1343,7 @@ bt_bool bt_value_compare(const struct bt_value *object_a, BT_ASSERT_PRE_NON_NULL(object_b, "Value object B"); if (object_a->type != object_b->type) { - BT_LOGV("Values are different: type mismatch: " + BT_LOGT("Values are different: type mismatch: " "value-a-addr=%p, value-b-addr=%p, " "value-a-type=%s, value-b-type=%s", object_a, object_b, diff --git a/src/logging/log.c b/src/logging/log.c index f1e0b715..7f0569ef 100644 --- a/src/logging/log.c +++ b/src/logging/log.c @@ -553,7 +553,7 @@ static INSTRUMENTED_CONST buffer_cb g_buffer_cb = buffer_callback; { switch (lvl) { - case BT_LOG_VERBOSE: + case BT_LOG_TRACE: return ANDROID_LOG_VERBOSE; case BT_LOG_DEBUG: return ANDROID_LOG_DEBUG; @@ -596,7 +596,7 @@ static INSTRUMENTED_CONST buffer_cb g_buffer_cb = buffer_callback; { switch (lvl) { - case BT_LOG_VERBOSE: + case BT_LOG_TRACE: return 7; /* ASL_LEVEL_DEBUG / kCFLogLevelDebug */; case BT_LOG_DEBUG: return 7; /* ASL_LEVEL_DEBUG / kCFLogLevelDebug */; @@ -702,8 +702,8 @@ static char lvl_char(const int lvl) { switch (lvl) { - case BT_LOG_VERBOSE: - return 'V'; + case BT_LOG_TRACE: + return 'T'; case BT_LOG_DEBUG: return 'D'; case BT_LOG_INFO: diff --git a/src/logging/log.h b/src/logging/log.h index cafde891..1643daf3 100644 --- a/src/logging/log.h +++ b/src/logging/log.h @@ -48,13 +48,13 @@ * Example: app started, user logged in. * - BT_LOG_DEBUG - minimal set of events that could help to reconstruct the * execution path. Usually disabled in release builds. - * - BT_LOG_VERBOSE - all other events. Usually disabled in release builds. + * - BT_LOG_TRACE - all other events. Usually disabled in release builds. * * *Ideally*, log file of debugged, well tested, production ready application * should be empty or very small. Choosing a right log level is as important as * providing short and self descriptive log message. */ -#define BT_LOG_VERBOSE BT_LOGGING_LEVEL_VERBOSE +#define BT_LOG_TRACE BT_LOGGING_LEVEL_TRACE #define BT_LOG_DEBUG BT_LOGGING_LEVEL_DEBUG #define BT_LOG_INFO BT_LOGGING_LEVEL_INFO #define BT_LOG_WARN BT_LOGGING_LEVEL_WARN @@ -79,7 +79,7 @@ * And when necessary to override it with BT_LOG_LEVEL in .c/.cpp/.m files * before including bt_log.h: * - * #define BT_LOG_LEVEL BT_LOG_VERBOSE + * #define BT_LOG_LEVEL BT_LOG_TRACE * #include "logging.h" * * If both BT_LOG_DEF_LEVEL and BT_LOG_LEVEL are undefined, then @@ -640,7 +640,7 @@ bt_log_spec; * See BT_LOG_LEVEL for details. */ #define BT_LOG_ENABLED(lvl) ((lvl) >= _BT_LOG_LEVEL) -#define BT_LOG_ENABLED_VERBOSE BT_LOG_ENABLED(BT_LOG_VERBOSE) +#define BT_LOG_ENABLED_TRACE BT_LOG_ENABLED(BT_LOG_TRACE) #define BT_LOG_ENABLED_DEBUG BT_LOG_ENABLED(BT_LOG_DEBUG) #define BT_LOG_ENABLED_INFO BT_LOG_ENABLED(BT_LOG_INFO) #define BT_LOG_ENABLED_WARN BT_LOG_ENABLED(BT_LOG_WARN) @@ -664,7 +664,7 @@ bt_log_spec; (BT_LOG_ENABLED((lvl)) && (lvl) >= (cur_lvl)) #define BT_LOG_ON(lvl) \ (BT_LOG_ENABLED((lvl)) && (lvl) >= _BT_LOG_OUTPUT_LEVEL) -#define BT_LOG_ON_VERBOSE BT_LOG_ON(BT_LOG_VERBOSE) +#define BT_LOG_ON_TRACE BT_LOG_ON(BT_LOG_TRACE) #define BT_LOG_ON_DEBUG BT_LOG_ON(BT_LOG_DEBUG) #define BT_LOG_ON_INFO BT_LOG_ON(BT_LOG_INFO) #define BT_LOG_ON_WARN BT_LOG_ON(BT_LOG_WARN) @@ -734,7 +734,7 @@ void _bt_log_write_mem_aux( #endif /* Message logging macros: - * - BT_LOGV("format string", args, ...) + * - BT_LOGT("format string", args, ...) * - BT_LOGD("format string", args, ...) * - BT_LOGI("format string", args, ...) * - BT_LOGW("format string", args, ...) @@ -742,7 +742,7 @@ void _bt_log_write_mem_aux( * - BT_LOGF("format string", args, ...) * * Message and error string (errno) logging macros: - * - BT_LOGV_ERRNO("initial message", "format string", args, ...) + * - BT_LOGT_ERRNO("initial message", "format string", args, ...) * - BT_LOGD_ERRNO("initial message", "format string", args, ...) * - BT_LOGI_ERRNO("initial message", "format string", args, ...) * - BT_LOGW_ERRNO("initial message", "format string", args, ...) @@ -750,7 +750,7 @@ void _bt_log_write_mem_aux( * - BT_LOGF_ERRNO("initial message", "format string", args, ...) * * Memory logging macros: - * - BT_LOGV_MEM(data_ptr, data_sz, "format string", args, ...) + * - BT_LOGT_MEM(data_ptr, data_sz, "format string", args, ...) * - BT_LOGD_MEM(data_ptr, data_sz, "format string", args, ...) * - BT_LOGI_MEM(data_ptr, data_sz, "format string", args, ...) * - BT_LOGW_MEM(data_ptr, data_sz, "format string", args, ...) @@ -758,7 +758,7 @@ void _bt_log_write_mem_aux( * - BT_LOGF_MEM(data_ptr, data_sz, "format string", args, ...) * * Auxiliary logging macros: - * - BT_LOGV_AUX(&log_instance, "format string", args, ...) + * - BT_LOGT_AUX(&log_instance, "format string", args, ...) * - BT_LOGD_AUX(&log_instance, "format string", args, ...) * - BT_LOGI_AUX(&log_instance, "format string", args, ...) * - BT_LOGW_AUX(&log_instance, "format string", args, ...) @@ -766,7 +766,7 @@ void _bt_log_write_mem_aux( * - BT_LOGF_AUX(&log_instance, "format string", args, ...) * * Auxiliary memory logging macros: - * - BT_LOGV_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) + * - BT_LOGT_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) * - BT_LOGD_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) * - BT_LOGI_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) * - BT_LOGW_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) @@ -774,7 +774,7 @@ void _bt_log_write_mem_aux( * - BT_LOGF_MEM_AUX(&log_instance, data_ptr, data_sz, "format string", args, ...) * * Preformatted string logging macros: - * - BT_LOGV_STR("preformatted string"); + * - BT_LOGT_STR("preformatted string"); * - BT_LOGD_STR("preformatted string"); * - BT_LOGI_STR("preformatted string"); * - BT_LOGW_STR("preformatted string"); @@ -874,22 +874,22 @@ static _BT_LOG_INLINE void _bt_log_unused(const int dummy, ...) {(void)dummy;} #define _BT_LOG_UNUSED(...) \ do { _BT_LOG_NEVER _bt_log_unused(0, __VA_ARGS__); } _BT_LOG_ONCE -#if BT_LOG_ENABLED_VERBOSE - #define BT_LOGV(...) \ - BT_LOG_WRITE(BT_LOG_VERBOSE, _BT_LOG_TAG, __VA_ARGS__) - #define BT_LOGV_ERRNO(...) \ - BT_LOG_WRITE_ERRNO(BT_LOG_VERBOSE, _BT_LOG_TAG, __VA_ARGS__) - #define BT_LOGV_AUX(log, ...) \ - BT_LOG_WRITE_AUX(log, BT_LOG_VERBOSE, _BT_LOG_TAG, __VA_ARGS__) - #define BT_LOGV_MEM(d, d_sz, ...) \ - BT_LOG_WRITE_MEM(BT_LOG_VERBOSE, _BT_LOG_TAG, d, d_sz, __VA_ARGS__) - #define BT_LOGV_MEM_AUX(log, d, d_sz, ...) \ - BT_LOG_WRITE_MEM(log, BT_LOG_VERBOSE, _BT_LOG_TAG, d, d_sz, __VA_ARGS__) +#if BT_LOG_ENABLED_TRACE + #define BT_LOGT(...) \ + BT_LOG_WRITE(BT_LOG_TRACE, _BT_LOG_TAG, __VA_ARGS__) + #define BT_LOGT_ERRNO(...) \ + BT_LOG_WRITE_ERRNO(BT_LOG_TRACE, _BT_LOG_TAG, __VA_ARGS__) + #define BT_LOGT_AUX(log, ...) \ + BT_LOG_WRITE_AUX(log, BT_LOG_TRACE, _BT_LOG_TAG, __VA_ARGS__) + #define BT_LOGT_MEM(d, d_sz, ...) \ + BT_LOG_WRITE_MEM(BT_LOG_TRACE, _BT_LOG_TAG, d, d_sz, __VA_ARGS__) + #define BT_LOGT_MEM_AUX(log, d, d_sz, ...) \ + BT_LOG_WRITE_MEM(log, BT_LOG_TRACE, _BT_LOG_TAG, d, d_sz, __VA_ARGS__) #else - #define BT_LOGV(...) _BT_LOG_UNUSED(__VA_ARGS__) - #define BT_LOGV_AUX(...) _BT_LOG_UNUSED(__VA_ARGS__) - #define BT_LOGV_MEM(...) _BT_LOG_UNUSED(__VA_ARGS__) - #define BT_LOGV_MEM_AUX(...) _BT_LOG_UNUSED(__VA_ARGS__) + #define BT_LOGT(...) _BT_LOG_UNUSED(__VA_ARGS__) + #define BT_LOGT_AUX(...) _BT_LOG_UNUSED(__VA_ARGS__) + #define BT_LOGT_MEM(...) _BT_LOG_UNUSED(__VA_ARGS__) + #define BT_LOGT_MEM_AUX(...) _BT_LOG_UNUSED(__VA_ARGS__) #endif #if BT_LOG_ENABLED_DEBUG @@ -982,7 +982,7 @@ static _BT_LOG_INLINE void _bt_log_unused(const int dummy, ...) {(void)dummy;} #define BT_LOGF_MEM_AUX(...) _BT_LOG_UNUSED(__VA_ARGS__) #endif -#define BT_LOGV_STR(s) BT_LOGV("%s", (s)) +#define BT_LOGT_STR(s) BT_LOGT("%s", (s)) #define BT_LOGD_STR(s) BT_LOGD("%s", (s)) #define BT_LOGI_STR(s) BT_LOGI("%s", (s)) #define BT_LOGW_STR(s) BT_LOGW("%s", (s)) @@ -1032,8 +1032,8 @@ char bt_log_get_letter_from_level(int level) char letter; switch (level) { - case BT_LOG_VERBOSE: - letter = 'V'; + case BT_LOG_TRACE: + letter = 'T'; break; case BT_LOG_DEBUG: letter = 'D'; @@ -1071,9 +1071,9 @@ int bt_log_get_level_from_string(const char *str) BT_ASSERT(str); - if (strcmp(str, "VERBOSE") == 0 || - strcmp(str, "V") == 0) { - level = BT_LOG_VERBOSE; + if (strcmp(str, "TRACE") == 0 || + strcmp(str, "T") == 0) { + level = BT_LOG_TRACE; } else if (strcmp(str, "DEBUG") == 0 || strcmp(str, "D") == 0) { level = BT_LOG_DEBUG; diff --git a/src/plugins/comp-logging.h b/src/plugins/comp-logging.h index 612f5863..61a2d271 100644 --- a/src/plugins/comp-logging.h +++ b/src/plugins/comp-logging.h @@ -100,8 +100,8 @@ BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__) #define BT_COMP_LOGD(_fmt, ...) \ BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__) -#define BT_COMP_LOGV(_fmt, ...) \ - BT_COMP_LOG(BT_LOG_VERBOSE, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__) +#define BT_COMP_LOGT(_fmt, ...) \ + BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__) #define BT_COMP_LOGF_STR(_str) \ BT_COMP_LOG(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), "%s", (_str)) #define BT_COMP_LOGE_STR(_str) \ @@ -112,8 +112,8 @@ BT_COMP_LOG(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), "%s", (_str)) #define BT_COMP_LOGD_STR(_str) \ BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), "%s", (_str)) -#define BT_COMP_LOGV_STR(_str) \ - BT_COMP_LOG(BT_LOG_VERBOSE, (BT_COMP_LOG_SELF_COMP), "%s", (_str)) +#define BT_COMP_LOGT_STR(_str) \ + BT_COMP_LOG(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), "%s", (_str)) #define BT_COMP_LOGF_ERRNO(_msg, _fmt, ...) \ BT_COMP_LOG_ERRNO(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__) #define BT_COMP_LOGE_ERRNO(_msg, _fmt, ...) \ @@ -124,8 +124,8 @@ BT_COMP_LOG_ERRNO(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__) #define BT_COMP_LOGD_ERRNO(_msg, _fmt, ...) \ BT_COMP_LOG_ERRNO(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__) -#define BT_COMP_LOGV_ERRNO(_msg, _fmt, ...) \ - BT_COMP_LOG_ERRNO(BT_LOG_VERBOSE, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__) +#define BT_COMP_LOGT_ERRNO(_msg, _fmt, ...) \ + BT_COMP_LOG_ERRNO(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), _msg, _fmt, ##__VA_ARGS__) #define BT_COMP_LOGF_MEM(_data_ptr, _data_sz, _fmt, ...) \ BT_COMP_LOG_MEM(BT_LOG_FATAL, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__) #define BT_COMP_LOGE_MEM(_data_ptr, _data_sz, _fmt, ...) \ @@ -136,8 +136,8 @@ BT_COMP_LOG_MEM(BT_LOG_INFO, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__) #define BT_COMP_LOGD_MEM(_data_ptr, _data_sz, _fmt, ...) \ BT_COMP_LOG_MEM(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__) -#define BT_COMP_LOGV_MEM(_data_ptr, _data_sz, _fmt, ...) \ - BT_COMP_LOG_MEM(BT_LOG_VERBOSE, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__) +#define BT_COMP_LOGT_MEM(_data_ptr, _data_sz, _fmt, ...) \ + BT_COMP_LOG_MEM(BT_LOG_TRACE, (BT_COMP_LOG_SELF_COMP), (_data_ptr), (_data_sz), _fmt, ##__VA_ARGS__) #define BT_COMP_LOG_SUPPORTED diff --git a/src/plugins/ctf/common/bfcr/bfcr.c b/src/plugins/ctf/common/bfcr/bfcr.c index 0ea283c5..100794e8 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.c +++ b/src/plugins/ctf/common/bfcr/bfcr.c @@ -243,7 +243,7 @@ int stack_push(struct stack *stack, struct ctf_field_class *base_class, BT_ASSERT(stack); BT_ASSERT(base_class); bfcr = stack->bfcr; - BT_COMP_LOGV("Pushing field class on stack: stack-addr=%p, " + BT_COMP_LOGT("Pushing field class on stack: stack-addr=%p, " "fc-addr=%p, fc-type=%d, base-length=%zu, " "stack-size-before=%zu, stack-size-after=%zu", stack, base_class, base_class->type, @@ -334,7 +334,7 @@ void stack_pop(struct stack *stack) BT_ASSERT(stack); BT_ASSERT(stack_size(stack)); bfcr = stack->bfcr; - BT_COMP_LOGV("Popping from stack: " + BT_COMP_LOGT("Popping from stack: " "stack-addr=%p, stack-size-before=%u, stack-size-after=%u", stack, stack->entries->len, stack->entries->len - 1); stack->size--; @@ -371,7 +371,7 @@ size_t available_bits(struct bt_bfcr *bfcr) static inline void consume_bits(struct bt_bfcr *bfcr, size_t incr) { - BT_COMP_LOGV("Advancing cursor: bfcr-addr=%p, cur-before=%zu, cur-after=%zu", + BT_COMP_LOGT("Advancing cursor: bfcr-addr=%p, cur-before=%zu, cur-after=%zu", bfcr, bfcr->buf.at, bfcr->buf.at + incr); bfcr->buf.at += incr; } @@ -479,7 +479,7 @@ void read_unsigned_bitfield(struct bt_bfcr *bfcr, const uint8_t *buf, size_t at, abort(); } - BT_COMP_LOGV("Read unsigned bit array: cur=%zu, size=%u, " + BT_COMP_LOGT("Read unsigned bit array: cur=%zu, size=%u, " "bo=%d, val=%" PRIu64, at, field_size, bo, *v); } @@ -498,7 +498,7 @@ void read_signed_bitfield(struct bt_bfcr *bfcr, const uint8_t *buf, size_t at, abort(); } - BT_COMP_LOGV("Read signed bit array: cur=%zu, size=%u, " + BT_COMP_LOGT("Read signed bit array: cur=%zu, size=%u, " "bo=%d, val=%" PRId64, at, field_size, bo, *v); } @@ -597,14 +597,14 @@ enum bt_bfcr_status read_basic_float_and_call_cb(struct bt_bfcr *bfcr, abort(); } - BT_COMP_LOGV("Read floating point number value: bfcr=%p, cur=%zu, val=%f", + BT_COMP_LOGT("Read floating point number value: bfcr=%p, cur=%zu, val=%f", bfcr, at, dblval); if (bfcr->user.cbs.classes.floating_point) { - BT_COMP_LOGV("Calling user function (floating point number)."); + BT_COMP_LOGT("Calling user function (floating point number)."); status = bfcr->user.cbs.classes.floating_point(dblval, bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: bfcr-addr=%p, status=%s", @@ -640,10 +640,10 @@ enum bt_bfcr_status read_basic_int_and_call_cb(struct bt_bfcr *bfcr, read_signed_bitfield(bfcr, buf, at, field_size, bo, &v); if (bfcr->user.cbs.classes.signed_int) { - BT_COMP_LOGV("Calling user function (signed integer)."); + BT_COMP_LOGT("Calling user function (signed integer)."); status = bfcr->user.cbs.classes.signed_int(v, bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: " @@ -657,10 +657,10 @@ enum bt_bfcr_status read_basic_int_and_call_cb(struct bt_bfcr *bfcr, read_unsigned_bitfield(bfcr, buf, at, field_size, bo, &v); if (bfcr->user.cbs.classes.unsigned_int) { - BT_COMP_LOGV("Calling user function (unsigned integer)."); + BT_COMP_LOGT("Calling user function (unsigned integer)."); status = bfcr->user.cbs.classes.unsigned_int(v, bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: " @@ -684,14 +684,14 @@ enum bt_bfcr_status read_bit_array_class_and_call_continue(struct bt_bfcr *bfcr, (void *) bfcr->cur_basic_field_class; if (!at_least_one_bit_left(bfcr)) { - BT_COMP_LOGV("Reached end of data: bfcr-addr=%p", bfcr); + BT_COMP_LOGT("Reached end of data: bfcr-addr=%p", bfcr); status = BT_BFCR_STATUS_EOF; goto end; } available = available_bits(bfcr); needed_bits = fc->size - bfcr->stitch.at; - BT_COMP_LOGV("Continuing basic field decoding: " + BT_COMP_LOGT("Continuing basic field decoding: " "bfcr-addr=%p, field-size=%u, needed-size=%zu, " "available-size=%zu", bfcr, fc->size, needed_bits, available); @@ -721,7 +721,7 @@ enum bt_bfcr_status read_bit_array_class_and_call_continue(struct bt_bfcr *bfcr, } /* We are here; it means we don't have enough data to decode this */ - BT_COMP_LOGV_STR("Not enough data to read the next basic field: appending to stitch buffer."); + BT_COMP_LOGT_STR("Not enough data to read the next basic field: appending to stitch buffer."); stitch_append_from_remaining_buf(bfcr); status = BT_BFCR_STATUS_EOF; @@ -739,7 +739,7 @@ enum bt_bfcr_status read_bit_array_class_and_call_begin(struct bt_bfcr *bfcr, (void *) bfcr->cur_basic_field_class; if (!at_least_one_bit_left(bfcr)) { - BT_COMP_LOGV("Reached end of data: bfcr-addr=%p", bfcr); + BT_COMP_LOGT("Reached end of data: bfcr-addr=%p", bfcr); status = BT_BFCR_STATUS_EOF; goto end; } @@ -781,7 +781,7 @@ enum bt_bfcr_status read_bit_array_class_and_call_begin(struct bt_bfcr *bfcr, } /* We are here; it means we don't have enough data to decode this */ - BT_COMP_LOGV_STR("Not enough data to read the next basic field: setting stitch buffer."); + BT_COMP_LOGT_STR("Not enough data to read the next basic field: setting stitch buffer."); stitch_set_from_remaining_buf(bfcr); bfcr->state = BFCR_STATE_READ_BASIC_CONTINUE; status = BT_BFCR_STATUS_EOF; @@ -832,7 +832,7 @@ enum bt_bfcr_status read_basic_string_class_and_call( enum bt_bfcr_status status = BT_BFCR_STATUS_OK; if (!at_least_one_bit_left(bfcr)) { - BT_COMP_LOGV("Reached end of data: bfcr-addr=%p", bfcr); + BT_COMP_LOGT("Reached end of data: bfcr-addr=%p", bfcr); status = BT_BFCR_STATUS_EOF; goto end; } @@ -845,10 +845,10 @@ enum bt_bfcr_status read_basic_string_class_and_call( result = memchr(first_chr, '\0', available_bytes); if (begin && bfcr->user.cbs.classes.string_begin) { - BT_COMP_LOGV("Calling user function (string, beginning)."); + BT_COMP_LOGT("Calling user function (string, beginning)."); status = bfcr->user.cbs.classes.string_begin( bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: bfcr-addr=%p, status=%s", @@ -860,12 +860,12 @@ enum bt_bfcr_status read_basic_string_class_and_call( if (!result) { /* No null character yet */ if (bfcr->user.cbs.classes.string) { - BT_COMP_LOGV("Calling user function (substring)."); + BT_COMP_LOGT("Calling user function (substring)."); status = bfcr->user.cbs.classes.string( (const char *) first_chr, available_bytes, bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: " @@ -883,12 +883,12 @@ enum bt_bfcr_status read_basic_string_class_and_call( size_t result_len = (size_t) (result - first_chr); if (bfcr->user.cbs.classes.string && result_len) { - BT_COMP_LOGV("Calling user function (substring)."); + BT_COMP_LOGT("Calling user function (substring)."); status = bfcr->user.cbs.classes.string( (const char *) first_chr, result_len, bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: " @@ -899,10 +899,10 @@ enum bt_bfcr_status read_basic_string_class_and_call( } if (bfcr->user.cbs.classes.string_end) { - BT_COMP_LOGV("Calling user function (string, end)."); + BT_COMP_LOGT("Calling user function (string, end)."); status = bfcr->user.cbs.classes.string_end( bfcr->cur_basic_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: " @@ -1031,7 +1031,7 @@ enum bt_bfcr_status align_class_state(struct bt_bfcr *bfcr, goto end; } else { /* No: need more data */ - BT_COMP_LOGV("Reached end of data when aligning: bfcr-addr=%p", bfcr); + BT_COMP_LOGT("Reached end of data when aligning: bfcr-addr=%p", bfcr); status = BT_BFCR_STATUS_EOF; } @@ -1056,10 +1056,10 @@ enum bt_bfcr_status next_field_state(struct bt_bfcr *bfcr) /* Are we done with this base class? */ while (top->index == top->base_len) { if (bfcr->user.cbs.classes.compound_end) { - BT_COMP_LOGV("Calling user function (compound, end)."); + BT_COMP_LOGT("Calling user function (compound, end)."); status = bfcr->user.cbs.classes.compound_end( top->base_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: bfcr-addr=%p, status=%s", @@ -1117,10 +1117,10 @@ enum bt_bfcr_status next_field_state(struct bt_bfcr *bfcr) if (next_field_class->is_compound) { if (bfcr->user.cbs.classes.compound_begin) { - BT_COMP_LOGV("Calling user function (compound, begin)."); + BT_COMP_LOGT("Calling user function (compound, begin)."); status = bfcr->user.cbs.classes.compound_begin( next_field_class, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(status)); if (status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: bfcr-addr=%p, status=%s", @@ -1140,7 +1140,7 @@ enum bt_bfcr_status next_field_state(struct bt_bfcr *bfcr) bfcr->state = BFCR_STATE_ALIGN_COMPOUND; } else { /* Replace current basic field class */ - BT_COMP_LOGV("Replacing current basic field class: " + BT_COMP_LOGT("Replacing current basic field class: " "bfcr-addr=%p, cur-basic-fc-addr=%p, " "next-basic-fc-addr=%p", bfcr, bfcr->cur_basic_field_class, next_field_class); @@ -1159,7 +1159,7 @@ enum bt_bfcr_status handle_state(struct bt_bfcr *bfcr) { enum bt_bfcr_status status = BT_BFCR_STATUS_OK; - BT_COMP_LOGV("Handling state: bfcr-addr=%p, state=%s", + BT_COMP_LOGT("Handling state: bfcr-addr=%p, state=%s", bfcr, bfcr_state_string(bfcr->state)); switch (bfcr->state) { @@ -1184,7 +1184,7 @@ enum bt_bfcr_status handle_state(struct bt_bfcr *bfcr) break; } - BT_COMP_LOGV("Handled state: bfcr-addr=%p, status=%s", + BT_COMP_LOGT("Handled state: bfcr-addr=%p, status=%s", bfcr, bt_bfcr_status_string(status)); return status; } @@ -1247,7 +1247,7 @@ void reset(struct bt_bfcr *bfcr) static void update_packet_offset(struct bt_bfcr *bfcr) { - BT_COMP_LOGV("Updating packet offset for next call: " + BT_COMP_LOGT("Updating packet offset for next call: " "bfcr-addr=%p, cur-packet-offset=%zu, next-packet-offset=%zu", bfcr, bfcr->buf.packet_offset, bfcr->buf.packet_offset + bfcr->buf.at); @@ -1271,7 +1271,7 @@ size_t bt_bfcr_start(struct bt_bfcr *bfcr, bfcr->buf.sz = BYTES_TO_BITS(sz) - offset; *status = BT_BFCR_STATUS_OK; - BT_COMP_LOGV("Starting decoding: bfcr-addr=%p, fc-addr=%p, " + BT_COMP_LOGT("Starting decoding: bfcr-addr=%p, fc-addr=%p, " "buf-addr=%p, buf-size=%zu, offset=%zu, " "packet-offset=%zu", bfcr, cls, buf, sz, offset, packet_offset); @@ -1282,10 +1282,10 @@ size_t bt_bfcr_start(struct bt_bfcr *bfcr, int stack_ret; if (bfcr->user.cbs.classes.compound_begin) { - BT_COMP_LOGV("Calling user function (compound, begin)."); + BT_COMP_LOGT("Calling user function (compound, begin)."); *status = bfcr->user.cbs.classes.compound_begin( cls, bfcr->user.data); - BT_COMP_LOGV("User function returned: status=%s", + BT_COMP_LOGT("User function returned: status=%s", bt_bfcr_status_string(*status)); if (*status != BT_BFCR_STATUS_OK) { BT_COMP_LOGW("User function failed: bfcr-addr=%p, status=%s", @@ -1309,7 +1309,7 @@ size_t bt_bfcr_start(struct bt_bfcr *bfcr, } /* Run the machine! */ - BT_COMP_LOGV_STR("Running the state machine."); + BT_COMP_LOGT_STR("Running the state machine."); while (true) { *status = handle_state(bfcr); @@ -1340,11 +1340,11 @@ size_t bt_bfcr_continue(struct bt_bfcr *bfcr, const uint8_t *buf, size_t sz, bfcr->buf.sz = BYTES_TO_BITS(sz); *status = BT_BFCR_STATUS_OK; - BT_COMP_LOGV("Continuing decoding: bfcr-addr=%p, buf-addr=%p, buf-size=%zu", + BT_COMP_LOGT("Continuing decoding: bfcr-addr=%p, buf-addr=%p, buf-size=%zu", bfcr, buf, sz); /* Continue running the machine */ - BT_COMP_LOGV_STR("Running the state machine."); + BT_COMP_LOGT_STR("Running the state machine."); while (true) { *status = handle_state(bfcr); diff --git a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c index 184805d9..05b67e93 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-resolve.c +++ b/src/plugins/ctf/common/metadata/ctf-meta-resolve.c @@ -688,7 +688,7 @@ int pathstr_to_field_path(const char *pathstr, } } - if (BT_LOG_ON_VERBOSE && ret == 0) { + if (BT_LOG_ON_TRACE && ret == 0) { GString *field_path_pretty = ctf_field_path_string(field_path); const char *field_path_pretty_str = field_path_pretty ? field_path_pretty->str : NULL; @@ -777,7 +777,7 @@ int64_t get_field_paths_lca_index(struct ctf_field_path *field_path1, int64_t lca_index = 0; uint64_t field_path1_len, field_path2_len; - if (BT_LOG_ON_VERBOSE) { + if (BT_LOG_ON_TRACE) { GString *field_path1_pretty = ctf_field_path_string(field_path1); GString *field_path2_pretty = diff --git a/src/plugins/ctf/common/metadata/decoder.c b/src/plugins/ctf/common/metadata/decoder.c index 188faebe..fdaf54bf 100644 --- a/src/plugins/ctf/common/metadata/decoder.c +++ b/src/plugins/ctf/common/metadata/decoder.c @@ -492,7 +492,7 @@ enum ctf_metadata_decoder_status ctf_metadata_decoder_decode( } } - if (BT_LOG_ON_VERBOSE) { + if (BT_LOG_ON_TRACE) { yydebug = 1; } diff --git a/src/plugins/ctf/common/metadata/lexer.l b/src/plugins/ctf/common/metadata/lexer.l index 09475a4a..b88dec87 100644 --- a/src/plugins/ctf/common/metadata/lexer.l +++ b/src/plugins/ctf/common/metadata/lexer.l @@ -143,7 +143,7 @@ _Imaginary setstring(yyextra, yylval, yytext); return CTF_IMAGINARY; 0{OCTALDIGIT}*{INTEGER_SUFFIX}? PARSE_INTEGER_LITERAL(8); return CTF_INTEGER_LITERAL; 0[xX]{HEXDIGIT}+{INTEGER_SUFFIX}? PARSE_INTEGER_LITERAL(16); return CTF_INTEGER_LITERAL; -{IDENTIFIER} BT_LOGV("Got identifier: id=\"%s\"", yytext); setstring(yyextra, yylval, yytext); if (is_type(yyextra, yytext)) return ID_TYPE; else return IDENTIFIER; +{IDENTIFIER} BT_LOGT("Got identifier: id=\"%s\"", yytext); setstring(yyextra, yylval, yytext); if (is_type(yyextra, yytext)) return ID_TYPE; else return IDENTIFIER; [ \t\r\n] ; /* ignore */ . _BT_LOGE_LINENO(yylineno, "Invalid character: char=\"%c\", val=0x%02x", isprint(yytext[0]) ? yytext[0] : '\0', yytext[0]); return CTF_ERROR; %% diff --git a/src/plugins/ctf/common/metadata/logging.h b/src/plugins/ctf/common/metadata/logging.h index 0d60cd36..313eb712 100644 --- a/src/plugins/ctf/common/metadata/logging.h +++ b/src/plugins/ctf/common/metadata/logging.h @@ -43,8 +43,8 @@ struct meta_log_config { bt_self_component *self_comp; }; -#define _BT_LOGV_LINENO(_lineno, _msg, args...) \ - BT_LOGV("At line %u in metadata stream: " _msg, _lineno, ## args) +#define _BT_LOGT_LINENO(_lineno, _msg, args...) \ + BT_LOGT("At line %u in metadata stream: " _msg, _lineno, ## args) #define _BT_LOGW_LINENO(_lineno, _msg, args...) \ BT_LOGW("At line %u in metadata stream: " _msg, _lineno, ## args) @@ -52,8 +52,8 @@ struct meta_log_config { #define _BT_LOGE_LINENO(_lineno, _msg, args...) \ BT_LOGE("At line %u in metadata stream: " _msg, _lineno, ## args) -#define _BT_COMP_LOGV_LINENO(_lineno, _msg, args...) \ - BT_COMP_LOGV("At line %u in metadata stream: " _msg, _lineno, ## args) +#define _BT_COMP_LOGT_LINENO(_lineno, _msg, args...) \ + BT_COMP_LOGT("At line %u in metadata stream: " _msg, _lineno, ## args) #define _BT_COMP_LOGW_LINENO(_lineno, _msg, args...) \ BT_COMP_LOGW("At line %u in metadata stream: " _msg, _lineno, ## args) diff --git a/src/plugins/ctf/common/metadata/parser.y b/src/plugins/ctf/common/metadata/parser.y index e014db1f..b6f5b7a3 100644 --- a/src/plugins/ctf/common/metadata/parser.y +++ b/src/plugins/ctf/common/metadata/parser.y @@ -45,9 +45,9 @@ #include "ast.h" #include "objstack.h" -#if BT_LOG_ENABLED_VERBOSE +#if BT_LOG_ENABLED_TRACE # define YYDEBUG 1 -# define YYFPRINTF(_stream, _fmt, args...) BT_LOGV(_fmt, ## args) +# define YYFPRINTF(_stream, _fmt, args...) BT_LOGT(_fmt, ## args) #else # define YYDEBUG 0 #endif @@ -318,7 +318,7 @@ static void push_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *ns; - BT_LOGV("Pushing scope: scanner-addr=%p", scanner); + BT_LOGT("Pushing scope: scanner-addr=%p", scanner); ns = malloc(sizeof(struct ctf_scanner_scope)); init_scope(ns, scanner->cs); scanner->cs = ns; @@ -328,7 +328,7 @@ static void pop_scope(struct ctf_scanner *scanner) { struct ctf_scanner_scope *os; - BT_LOGV("Popping scope: scanner-addr=%p", scanner); + BT_LOGT("Popping scope: scanner-addr=%p", scanner); os = scanner->cs; scanner->cs = os->parent; finalize_scope(os); @@ -340,7 +340,7 @@ static int lookup_type(struct ctf_scanner_scope *s, const char *id) int ret; ret = GPOINTER_TO_INT(g_hash_table_lookup(s->classes, id)); - BT_LOGV("Looked up type: scanner-addr=%p, id=\"%s\", ret=%d", + BT_LOGT("Looked up type: scanner-addr=%p, id=\"%s\", ret=%d", s, id, ret); return ret; } @@ -357,14 +357,14 @@ int is_type(struct ctf_scanner *scanner, const char *id) break; } } - BT_LOGV("Found if ID is type: scanner-addr=%p, id=\"%s\", ret=%d", + BT_LOGT("Found if ID is type: scanner-addr=%p, id=\"%s\", ret=%d", scanner, id, ret); return ret; } static void add_type(struct ctf_scanner *scanner, char *id) { - BT_LOGV("Adding type: scanner-addr=%p, id=\"%s\"", + BT_LOGT("Adding type: scanner-addr=%p, id=\"%s\"", scanner, id); if (lookup_type(scanner->cs, id)) return; diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.c b/src/plugins/ctf/common/metadata/visitor-generate-ir.c index 6fc4649a..d52104f8 100644 --- a/src/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -172,8 +172,8 @@ enum loglevel { #define _BT_COMP_LOGW_NODE(_node, _msg, args...) \ _BT_COMP_LOGW_LINENO((_node)->lineno, _msg, ## args) -#define _BT_COMP_LOGV_NODE(_node, _msg, args...) \ - _BT_COMP_LOGV_LINENO((_node)->lineno, _msg, ## args) +#define _BT_COMP_LOGT_NODE(_node, _msg, args...) \ + _BT_COMP_LOGT_LINENO((_node)->lineno, _msg, ## args) /* * Declaration scope of a visitor context. This represents a TSDL diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.c b/src/plugins/ctf/common/msg-iter/msg-iter.c index 9bf8225d..938eae17 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.c +++ b/src/plugins/ctf/common/msg-iter/msg-iter.c @@ -380,7 +380,7 @@ void stack_push(struct stack *stack, bt_field *base) BT_ASSERT(stack); notit = stack->notit; BT_ASSERT(base); - BT_COMP_LOGV("Pushing base field on stack: stack-addr=%p, " + BT_COMP_LOGT("Pushing base field on stack: stack-addr=%p, " "stack-size-before=%zu, stack-size-after=%zu", stack, stack->size, stack->size + 1); @@ -409,7 +409,7 @@ void stack_pop(struct stack *stack) BT_ASSERT(stack); BT_ASSERT(stack_size(stack)); notit = stack->notit; - BT_COMP_LOGV("Popping from stack: " + BT_COMP_LOGT("Popping from stack: " "stack-addr=%p, stack-size-before=%zu, stack-size-after=%zu", stack, stack->size, stack->size - 1); stack->size--; @@ -466,7 +466,7 @@ size_t packet_at(struct bt_msg_iter *notit) static inline void buf_consume_bits(struct bt_msg_iter *notit, size_t incr) { - BT_COMP_LOGV("Advancing cursor: notit-addr=%p, cur-before=%zu, cur-after=%zu", + BT_COMP_LOGT("Advancing cursor: notit-addr=%p, cur-before=%zu, cur-after=%zu", notit, notit->buf.at, notit->buf.at + incr); notit->buf.at += incr; } @@ -579,21 +579,21 @@ enum bt_msg_iter_status read_dscope_begin_state( size_t consumed_bits; notit->cur_dscope_field = dscope_field; - BT_COMP_LOGV("Starting BFCR: notit-addr=%p, bfcr-addr=%p, fc-addr=%p", + BT_COMP_LOGT("Starting BFCR: notit-addr=%p, bfcr-addr=%p, fc-addr=%p", notit, notit->bfcr, dscope_fc); consumed_bits = bt_bfcr_start(notit->bfcr, dscope_fc, notit->buf.addr, notit->buf.at, packet_at(notit), notit->buf.sz, &bfcr_status); - BT_COMP_LOGV("BFCR consumed bits: size=%zu", consumed_bits); + BT_COMP_LOGT("BFCR consumed bits: size=%zu", consumed_bits); switch (bfcr_status) { case BT_BFCR_STATUS_OK: /* Field class was read completely */ - BT_COMP_LOGV_STR("Field was completely decoded."); + BT_COMP_LOGT_STR("Field was completely decoded."); notit->state = done_state; break; case BT_BFCR_STATUS_EOF: - BT_COMP_LOGV_STR("BFCR needs more data to decode field completely."); + BT_COMP_LOGT_STR("BFCR needs more data to decode field completely."); notit->state = continue_state; break; default: @@ -619,7 +619,7 @@ enum bt_msg_iter_status read_dscope_continue_state( enum bt_bfcr_status bfcr_status; size_t consumed_bits; - BT_COMP_LOGV("Continuing BFCR: notit-addr=%p, bfcr-addr=%p", + BT_COMP_LOGT("Continuing BFCR: notit-addr=%p, bfcr-addr=%p", notit, notit->bfcr); status = buf_ensure_available_bits(notit); @@ -629,7 +629,7 @@ enum bt_msg_iter_status read_dscope_continue_state( "msg-addr=%p, status=%s", notit, bt_msg_iter_status_string(status)); } else { - BT_COMP_LOGV("Cannot ensure that buffer has at least one byte: " + BT_COMP_LOGT("Cannot ensure that buffer has at least one byte: " "msg-addr=%p, status=%s", notit, bt_msg_iter_status_string(status)); } @@ -639,17 +639,17 @@ enum bt_msg_iter_status read_dscope_continue_state( consumed_bits = bt_bfcr_continue(notit->bfcr, notit->buf.addr, notit->buf.sz, &bfcr_status); - BT_COMP_LOGV("BFCR consumed bits: size=%zu", consumed_bits); + BT_COMP_LOGT("BFCR consumed bits: size=%zu", consumed_bits); switch (bfcr_status) { case BT_BFCR_STATUS_OK: /* Type was read completely. */ - BT_COMP_LOGV_STR("Field was completely decoded."); + BT_COMP_LOGT_STR("Field was completely decoded."); notit->state = done_state; break; case BT_BFCR_STATUS_EOF: /* Stay in this continue state. */ - BT_COMP_LOGV_STR("BFCR needs more data to decode field completely."); + BT_COMP_LOGT_STR("BFCR needs more data to decode field completely."); break; default: BT_COMP_LOGW("BFCR failed to continue: notit-addr=%p, bfcr-addr=%p, " @@ -1281,7 +1281,7 @@ enum bt_msg_iter_status read_event_common_context_begin_state( BT_ASSERT(notit->dscopes.event_common_context); } - BT_COMP_LOGV("Decoding event common context field: " + BT_COMP_LOGT("Decoding event common context field: " "notit-addr=%p, stream-class-addr=%p, " "stream-class-id=%" PRId64 ", " "fc-addr=%p", @@ -1334,7 +1334,7 @@ enum bt_msg_iter_status read_event_spec_context_begin_state( BT_ASSERT(notit->dscopes.event_spec_context); } - BT_COMP_LOGV("Decoding event specific context field: " + BT_COMP_LOGT("Decoding event specific context field: " "notit-addr=%p, event-class-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "fc-addr=%p", @@ -1390,7 +1390,7 @@ enum bt_msg_iter_status read_event_payload_begin_state( BT_ASSERT(notit->dscopes.event_payload); } - BT_COMP_LOGV("Decoding event payload field: " + BT_COMP_LOGT("Decoding event payload field: " "notit-addr=%p, event-class-addr=%p, " "event-class-name=\"%s\", event-class-id=%" PRId64 ", " "fc-addr=%p", @@ -1588,7 +1588,7 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit) enum bt_msg_iter_status status = BT_MSG_ITER_STATUS_OK; const enum state state = notit->state; - BT_COMP_LOGV("Handling state: notit-addr=%p, state=%s", + BT_COMP_LOGT("Handling state: notit-addr=%p, state=%s", notit, state_string(state)); // TODO: optimalize! @@ -1694,7 +1694,7 @@ enum bt_msg_iter_status handle_state(struct bt_msg_iter *notit) abort(); } - BT_COMP_LOGV("Handled state: notit-addr=%p, status=%s, " + BT_COMP_LOGT("Handled state: notit-addr=%p, status=%s, " "prev-state=%s, cur-state=%s", notit, bt_msg_iter_status_string(status), state_string(state), state_string(notit->state)); @@ -1901,7 +1901,7 @@ void update_default_clock(struct bt_msg_iter *notit, uint64_t new_val, notit->default_clock_snapshot |= new_val; end: - BT_COMP_LOGV("Updated default clock's value from integer field's value: " + BT_COMP_LOGT("Updated default clock's value from integer field's value: " "value=%" PRIu64, notit->default_clock_snapshot); } @@ -1914,7 +1914,7 @@ enum bt_bfcr_status bfcr_unsigned_int_cb(uint64_t value, bt_field *field = NULL; struct ctf_field_class_int *int_fc = (void *) fc; - BT_COMP_LOGV("Unsigned integer function called from BFCR: " + BT_COMP_LOGT("Unsigned integer function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%" PRIu64, notit, notit->bfcr, fc, fc->type, fc->in_ir, value); @@ -2003,7 +2003,7 @@ enum bt_bfcr_status bfcr_unsigned_int_char_cb(uint64_t value, struct ctf_field_class_int *int_fc = (void *) fc; char str[2] = {'\0', '\0'}; - BT_COMP_LOGV("Unsigned integer character function called from BFCR: " + BT_COMP_LOGT("Unsigned integer character function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%" PRIu64, notit, notit->bfcr, fc, fc->type, fc->in_ir, value); @@ -2052,7 +2052,7 @@ enum bt_bfcr_status bfcr_signed_int_cb(int64_t value, struct bt_msg_iter *notit = data; struct ctf_field_class_int *int_fc = (void *) fc; - BT_COMP_LOGV("Signed integer function called from BFCR: " + BT_COMP_LOGT("Signed integer function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%" PRId64, notit, notit->bfcr, fc, fc->type, fc->in_ir, value); @@ -2089,7 +2089,7 @@ enum bt_bfcr_status bfcr_floating_point_cb(double value, bt_field *field = NULL; struct bt_msg_iter *notit = data; - BT_COMP_LOGV("Floating point number function called from BFCR: " + BT_COMP_LOGT("Floating point number function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, value=%f", notit, notit->bfcr, fc, fc->type, fc->in_ir, value); @@ -2118,7 +2118,7 @@ enum bt_bfcr_status bfcr_string_begin_cb( struct bt_msg_iter *notit = data; int ret; - BT_COMP_LOGV("String (beginning) function called from BFCR: " + BT_COMP_LOGT("String (beginning) function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); @@ -2155,7 +2155,7 @@ enum bt_bfcr_status bfcr_string_cb(const char *value, struct bt_msg_iter *notit = data; int ret; - BT_COMP_LOGV("String (substring) function called from BFCR: " + BT_COMP_LOGT("String (substring) function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d, string-length=%zu", notit, notit->bfcr, fc, fc->type, fc->in_ir, @@ -2188,7 +2188,7 @@ enum bt_bfcr_status bfcr_string_end_cb( { struct bt_msg_iter *notit = data; - BT_COMP_LOGV("String (end) function called from BFCR: " + BT_COMP_LOGT("String (end) function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); @@ -2213,7 +2213,7 @@ enum bt_bfcr_status bfcr_compound_begin_cb( struct bt_msg_iter *notit = data; bt_field *field; - BT_COMP_LOGV("Compound (beginning) function called from BFCR: " + BT_COMP_LOGT("Compound (beginning) function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); @@ -2266,7 +2266,7 @@ enum bt_bfcr_status bfcr_compound_end_cb( { struct bt_msg_iter *notit = data; - BT_COMP_LOGV("Compound (end) function called from BFCR: " + BT_COMP_LOGT("Compound (end) function called from BFCR: " "notit-addr=%p, bfcr-addr=%p, fc-addr=%p, " "fc-type=%d, fc-in-ir=%d", notit, notit->bfcr, fc, fc->type, fc->in_ir); 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 6def0b72..8516a989 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 @@ -165,7 +165,7 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, out_fc_type = bt_field_get_class_type(out_field); BT_ASSERT(in_fc_type == out_fc_type); - BT_COMP_LOGV("Copying content of field: in-f-addr=%p, out-f-addr=%p", + BT_COMP_LOGT("Copying content of field: in-f-addr=%p, out-f-addr=%p", in_field, out_field); switch (in_fc_type) { case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER: @@ -292,6 +292,6 @@ void copy_field_content(const bt_field *in_field, bt_field *out_field, default: abort(); } - BT_COMP_LOGV("Copied content of field: in-f-addr=%p, out-f-addr=%p", + BT_COMP_LOGT("Copied content of field: in-f-addr=%p, out-f-addr=%p", in_field, out_field); } diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c index 3687016e..0d641235 100644 --- a/src/plugins/utils/muxer/muxer.c +++ b/src/plugins/utils/muxer/muxer.c @@ -920,7 +920,7 @@ muxer_msg_iter_youngest_upstream_msg_iter( if (!cur_muxer_upstream_msg_iter->msg_iter) { /* This upstream message iterator is ended */ - BT_COMP_LOGV("Skipping ended upstream message iterator: " + BT_COMP_LOGT("Skipping ended upstream message iterator: " "muxer-upstream-msg-iter-wrap-addr=%p", cur_muxer_upstream_msg_iter); continue; @@ -1404,7 +1404,7 @@ bt_self_message_iterator_status muxer_msg_iter_next( BT_ASSERT(self_comp); muxer_comp = bt_self_component_get_data(self_comp); BT_ASSERT(muxer_comp); - BT_COMP_LOGV("Muxer component's message iterator's \"next\" method called: " + BT_COMP_LOGT("Muxer component's message iterator's \"next\" method called: " "comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, " "msg-iter-addr=%p", self_comp, muxer_comp, muxer_msg_iter, self_msg_iter); @@ -1418,7 +1418,7 @@ bt_self_message_iterator_status muxer_msg_iter_next( self_comp, muxer_comp, muxer_msg_iter, self_msg_iter, bt_common_self_message_iterator_status_string(status)); } else { - BT_COMP_LOGV("Returning from muxer component's message iterator's \"next\" method: " + BT_COMP_LOGT("Returning from muxer component's message iterator's \"next\" method: " "status=%s", bt_common_self_message_iterator_status_string(status)); } -- 2.34.1