This is an automated email from Gerrit. "Evgeniy Naydanov <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9191
-- gerrit commit eaccbaf788e20172fef3db64f32dd9efe0cced0c Author: Evgeniy Naydanov <[email protected]> Date: Mon Oct 27 17:47:56 2025 +0300 openocd: rename `LOG_LEVEL_IS` to `LOG_IS_ENABLED_FOR` The macro `LOG_LEVEL_IS()` is a bit misleading, since it does not check for an equality of the log level to it's argument, but rather compares whether the level is more seviere then the set threashold. The new name `LOG_IS_ENABLED_FOR()` is inspired by Python's logging lybrary [1]. Link: https://docs.python.org/3/library/logging.html#logging.Logger.isEnabledFor [1] Change-Id: I3416c6c5f1f9e000e8bd441e9b626a66bda62811 Signed-off-by: Evgeniy Naydanov <[email protected]> diff --git a/src/flash/nor/ath79.c b/src/flash/nor/ath79.c index 7ce42b2da7..ddb77184bb 100644 --- a/src/flash/nor/ath79.c +++ b/src/flash/nor/ath79.c @@ -299,7 +299,7 @@ static int ath79_spi_bitbang_chunk(struct flash_bank *bank, */ target_buffer_set_u32_array(target, (uint8_t *)out, pracc_words, out); - if (LOG_LEVEL_IS(LOG_LVL_DEBUG)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) { for (int i = 0; i < to_xfer; i++) { LOG_DEBUG("bitbang %02x => %02x", data[i], ((uint8_t *)out)[i]); diff --git a/src/helper/log.h b/src/helper/log.h index ac24f8e833..9df4d145c0 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -97,7 +97,7 @@ extern int debug_level; /* Avoid fn call and building parameter list if we're not outputting the information. * Matters on feeble CPUs for DEBUG/INFO statements that are involved frequently */ -#define LOG_LEVEL_IS(FOO) ((debug_level) >= (FOO)) +#define LOG_IS_ENABLED_FOR(FOO) ((debug_level) >= (FOO)) #define LOG_DEBUG_IO(expr ...) \ do { \ diff --git a/src/jtag/commands.c b/src/jtag/commands.c index 1bca4e8df3..51402a3d0d 100644 --- a/src/jtag/commands.c +++ b/src/jtag/commands.c @@ -202,7 +202,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) for (unsigned int i = 0; i < cmd->num_fields; i++) { if (cmd->fields[i].out_value) { - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { char *char_buf = buf_to_hex_str(cmd->fields[i].out_value, (cmd->fields[i].num_bits > DEBUG_JTAG_IOZ) ? DEBUG_JTAG_IOZ @@ -244,7 +244,7 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits); - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { char *char_buf = buf_to_hex_str(captured, (num_bits > DEBUG_JTAG_IOZ) ? DEBUG_JTAG_IOZ diff --git a/src/jtag/drivers/ch347.c b/src/jtag/drivers/ch347.c index c031ceece2..f4157dfa78 100644 --- a/src/jtag/drivers/ch347.c +++ b/src/jtag/drivers/ch347.c @@ -393,7 +393,7 @@ static int ch347_write_data(uint8_t *data, int *length) write_len = *length - i; } - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { LOG_DEBUG_IO("size=%d, buf=", i); log_buf_dump(data, i, false); } @@ -430,7 +430,7 @@ static int ch347_read_data(uint8_t *data, int *length) read_len = *length - i; } - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { LOG_DEBUG_IO("size=%d, buf=", i); log_buf_dump(data, i, true); } @@ -615,7 +615,7 @@ static int ch347_scan_data_to_fields(uint8_t *decoded_buf, int decoded_buf_len) } uint8_t *captured = buf_set_buf(decoded_buf, bit_offset, capture_buf, 0, num_bits); - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { char *str = buf_to_hex_str(captured, num_bits); LOG_DEBUG_IO("size=%d, buf=[%s]", num_bits, str); free(str); @@ -624,7 +624,7 @@ static int ch347_scan_data_to_fields(uint8_t *decoded_buf, int decoded_buf_len) buf_cpy(captured, scan->fields[i].in_value, num_bits); free(capture_buf); } else { - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) LOG_DEBUG_IO("field skipped"); } bit_offset += num_bits; @@ -1236,7 +1236,7 @@ static int ch347_scratchpad_add_scan(struct scan_command *cmd) return retval; } - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { char *log_buf = buf_to_hex_str(buf, scan_bits); LOG_DEBUG_IO("scan=%s, type=%s, bits=%d, buf=[%s], end_state=%d", cmd->ir_scan ? "IRSCAN" : "DRSCAN", diff --git a/src/jtag/drivers/jtag_vpi.c b/src/jtag/drivers/jtag_vpi.c index fac27b3060..be8ecb4896 100644 --- a/src/jtag/drivers/jtag_vpi.c +++ b/src/jtag/drivers/jtag_vpi.c @@ -89,7 +89,7 @@ static int jtag_vpi_send_cmd(struct vpi_cmd *vpi) int retval; /* Optional low-level JTAG debug */ - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { if (vpi->nb_bits > 0) { /* command with a non-empty data payload */ char *char_buf = buf_to_hex_str(vpi->buffer_out, @@ -315,7 +315,7 @@ static int jtag_vpi_queue_tdi_xfer(uint8_t *bits, int nb_bits, int tap_shift) return retval; /* Optional low-level JTAG debug */ - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { char *char_buf = buf_to_hex_str(vpi.buffer_in, (nb_bits > DEBUG_JTAG_IOZ) ? DEBUG_JTAG_IOZ : nb_bits); LOG_DEBUG_IO("recvd JTAG VPI data: nb_bits=%d, buf_in=0x%s%s", diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c index 38393ad0ae..f4d13004c2 100644 --- a/src/jtag/drivers/mpsse.c +++ b/src/jtag/drivers/mpsse.c @@ -23,7 +23,7 @@ #define DEBUG_PRINT_BUF(buf, len) \ do { \ - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) { \ + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) { \ char buf_string[32 * 3 + 1]; \ int buf_string_pos = 0; \ for (int i = 0; i < len; i++) { \ diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c index 1f14b1a047..1b992c4ca0 100644 --- a/src/jtag/drivers/ulink.c +++ b/src/jtag/drivers/ulink.c @@ -689,7 +689,7 @@ static int ulink_execute_queued_commands(struct ulink *device, int timeout) int ret, i, index_out, index_in, count_out, count_in, transferred; uint8_t buffer[64]; - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) ulink_print_queue(device); index_out = 0; diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c index 145f0682ac..2f238433b1 100644 --- a/src/jtag/drivers/vsllink.c +++ b/src/jtag/drivers/vsllink.c @@ -144,7 +144,7 @@ static int vsllink_execute_queue(struct jtag_command *cmd_queue) scan_size, tap_state_name(cmd->cmd.scan->end_state)); - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) vsllink_debug_buffer(buffer, DIV_ROUND_UP(scan_size, 8)); type = jtag_scan_type(cmd->cmd.scan); @@ -638,7 +638,7 @@ static int vsllink_jtag_execute(void) LOG_DEBUG_IO( "JTAG scan read(%d bits, from src %d bits to dest %d bits):", length, src_first, dest_first); - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) vsllink_debug_buffer(buffer + dest_first / 8, DIV_ROUND_UP(length, 7)); if (last) { diff --git a/src/jtag/interface.h b/src/jtag/interface.h index 51cbf9ac0d..2f1be87ce4 100644 --- a/src/jtag/interface.h +++ b/src/jtag/interface.h @@ -162,7 +162,7 @@ enum tap_state jtag_debug_state_machine_(const void *tms_buf, const void *tdi_bu static inline enum tap_state jtag_debug_state_machine(const void *tms_buf, const void *tdi_buf, unsigned int tap_len, enum tap_state start_tap_state) { - if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG_IO)) return jtag_debug_state_machine_(tms_buf, tdi_buf, tap_len, start_tap_state); else return start_tap_state; diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 080e3360ae..39d85a553e 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -378,7 +378,7 @@ static int gdb_write(struct connection *connection, const void *data, int len) static void gdb_log_incoming_packet(struct connection *connection, const char *packet) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; struct target *target = get_target_from_connection(connection); @@ -412,7 +412,7 @@ static void gdb_log_incoming_packet(struct connection *connection, const char *p static void gdb_log_outgoing_packet(struct connection *connection, const char *packet_buf, unsigned int packet_len, unsigned char checksum) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; struct target *target = get_target_from_connection(connection); diff --git a/src/target/espressif/esp32_apptrace.c b/src/target/espressif/esp32_apptrace.c index 307096019a..a409acad70 100644 --- a/src/target/espressif/esp32_apptrace.c +++ b/src/target/espressif/esp32_apptrace.c @@ -383,7 +383,7 @@ static int esp32_apptrace_block_free(struct esp32_apptrace_cmd_ctx *ctx, struct static int esp32_apptrace_wait_tracing_finished(struct esp32_apptrace_cmd_ctx *ctx) { - int64_t timeout = timeval_ms() + (LOG_LEVEL_IS(LOG_LVL_DEBUG) ? 70000 : 5000); + int64_t timeout = timeval_ms() + (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG) ? 70000 : 5000); while (!list_empty(&ctx->ready_trace_blocks)) { alive_sleep(100); if (timeval_ms() >= timeout) { @@ -1422,7 +1422,7 @@ static int esp32_sysview_stop(struct esp32_apptrace_cmd_ctx *ctx) LOG_ERROR("Failed to start trace stop timeout measurement!"); return ERROR_FAIL; } - const float stop_tmo = LOG_LEVEL_IS(LOG_LVL_DEBUG) ? 30.0 : 0.5; + const float stop_tmo = LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG) ? 30.0 : 0.5; if (duration_elapsed(&wait_time) >= stop_tmo) { LOG_INFO("Stop waiting for the last data due to timeout."); break; diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c index 5acbddaf37..d2e2c91bb7 100644 --- a/src/target/riscv/batch.c +++ b/src/target/riscv/batch.c @@ -204,7 +204,7 @@ static void log_batch(const struct riscv_batch *batch, size_t start_idx, const struct riscv_scan_delays *delays, bool resets_delays, size_t reset_delays_after) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; const unsigned int abits = riscv_get_dmi_address_bits(batch->target); diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c index 801bcba7d5..f1def62e29 100644 --- a/src/target/riscv/riscv-011.c +++ b/src/target/riscv/riscv-011.c @@ -391,7 +391,7 @@ static void dump_field(const struct scan_field *field) static const char * const op_string[] = {"nop", "r", "w", "?"}; static const char * const status_string[] = {"+", "?", "F", "b"}; - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; uint64_t out = buf_get_u64(field->out_value, 0, field->num_bits); @@ -1934,7 +1934,7 @@ static int poll_target(struct target *target, bool announce) /* Inhibit debug logging during poll(), which isn't usually interesting and * just fills up the screen/logs with clutter. */ int old_debug_level = debug_level; - if (LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) debug_level = LOG_LVL_INFO; bits_t bits = { .haltnot = 0, diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index 9da9684e4e..18d279936c 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -368,7 +368,7 @@ static struct riscv_debug_reg_ctx get_riscv_debug_reg_ctx(const struct target *t static void log_debug_reg(struct target *target, enum riscv_debug_reg_ordinal reg, riscv_reg_t value, const char *file, unsigned int line, const char *func) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; const struct riscv_debug_reg_ctx context = get_riscv_debug_reg_ctx(target); char * const buf = malloc(riscv_debug_reg_to_s(NULL, reg, context, value, RISCV_DEBUG_REG_HIDE_UNNAMED_0) + 1); @@ -735,7 +735,7 @@ int riscv013_execute_abstract_command(struct target *target, uint32_t command, { assert(cmderr); *cmderr = CMDERR_NONE; - if (LOG_LEVEL_IS(LOG_LVL_DEBUG)) { + if (LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) { switch (get_field(command, DM_COMMAND_CMDTYPE)) { case 0: LOG_DEBUG_REG(target, AC_ACCESS_REGISTER, command); @@ -3094,7 +3094,7 @@ static int execute_autofence(struct target *target) static void log_memory_access128(target_addr_t address, uint64_t value_h, uint64_t value_l, bool is_read) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; char fmt[80]; @@ -3106,7 +3106,7 @@ static void log_memory_access128(target_addr_t address, uint64_t value_h, static void log_memory_access64(target_addr_t address, uint64_t value, unsigned int size_bytes, bool is_read) { - if (!LOG_LEVEL_IS(LOG_LVL_DEBUG)) + if (!LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG)) return; char fmt[80]; diff --git a/src/target/xtensa/xtensa.c b/src/target/xtensa/xtensa.c index f8c36b01d7..3fe4b21582 100644 --- a/src/target/xtensa/xtensa.c +++ b/src/target/xtensa/xtensa.c @@ -1218,7 +1218,7 @@ int xtensa_fetch_all_regs(struct target *target) uint32_t ms = 0; uint32_t woe; uint8_t a0_buf[4], a3_buf[4], ms_buf[4]; - bool debug_dsrs = !xtensa->regs_fetched || LOG_LEVEL_IS(LOG_LVL_DEBUG); + bool debug_dsrs = !xtensa->regs_fetched || LOG_IS_ENABLED_FOR(LOG_LVL_DEBUG); union xtensa_reg_val_u *regvals = calloc(reg_list_size, sizeof(*regvals)); if (!regvals) { --
