From d06d891127b13b26007ca32f68e7e69a5595de1b Mon Sep 17 00:00:00 2001
From: "Constantin P." <papizh.konstantin@demlabs.net>
Date: Thu, 29 Aug 2024 05:31:46 +0000
Subject: [PATCH] Hotfix 12686
---
modules/chain/dap_chain_ch.c | 3 ++-
modules/net/dap_chain_net.c | 12 ++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/modules/chain/dap_chain_ch.c b/modules/chain/dap_chain_ch.c
index 344e252e38..176e99bf6e 100644
--- a/modules/chain/dap_chain_ch.c
+++ b/modules/chain/dap_chain_ch.c
@@ -778,7 +778,8 @@ static bool s_stream_ch_packet_in(dap_stream_ch_t* a_ch, void* a_arg)
if (s_debug_more) {
char *l_atom_hash_str;
dap_get_data_hash_str_static(l_chain_pkt->data, l_chain_pkt_data_size, l_atom_hash_str);
- log_it(L_INFO, "In: CHAIN pkt: atom hash %s (size %zd)", l_atom_hash_str, l_chain_pkt_data_size);
+ log_it(L_INFO, "In: CHAIN pkt: atom hash %s, size %zd, net id %lu, chain id %lu",
+ l_atom_hash_str, l_chain_pkt_data_size, l_chain_pkt->hdr.net_id, l_chain_pkt->hdr.chain_id);
}
dap_proc_thread_callback_add(a_ch->stream_worker->worker->proc_queue_input, s_sync_in_chains_callback, l_args);
} break;
diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c
index 4b2f762542..8185ae3858 100644
--- a/modules/net/dap_chain_net.c
+++ b/modules/net/dap_chain_net.c
@@ -2586,7 +2586,11 @@ static void s_sync_timer_callback(void *a_arg)
l_net_pvt->sync_context.state = l_net_pvt->sync_context.last_state = SYNC_STATE_WAITING;
} else {
l_net_pvt->sync_context.cur_chain = l_net_pvt->sync_context.cur_chain->next;
- log_it(L_DEBUG, "[%s:%d] Go to next chain %p", __FUNCTION__, __LINE__, l_net_pvt->sync_context.cur_chain);
+ if (l_net_pvt->sync_context.cur_chain)
+ log_it(L_DEBUG, "[%s:%d] Go to next chain \"%s\" for net %s", __FUNCTION__, __LINE__,
+ l_net_pvt->sync_context.cur_chain->name, l_net_pvt->sync_context.cur_chain->net_name);
+ else
+ log_it(L_DEBUG, "[%s:%d] Go to next chain: <NULL>", __FUNCTION__, __LINE__);
if (!l_net_pvt->sync_context.cur_chain) {
dap_chain_net_state_t l_prev_state = l_net_pvt->state;
if (l_net_pvt->sync_context.last_state == SYNC_STATE_SYNCED) {
@@ -2605,7 +2609,11 @@ static void s_sync_timer_callback(void *a_arg)
if (l_net_pvt->sync_context.cur_chain->callback_load_from_gdb) {
// This type of chain is GDB based and not synced by chains protocol
l_net_pvt->sync_context.cur_chain = l_net_pvt->sync_context.cur_chain->next;
- log_it(L_DEBUG, "[%s:%d] Go to next chain %p", __FUNCTION__, __LINE__, l_net_pvt->sync_context.cur_chain);
+ if (l_net_pvt->sync_context.cur_chain)
+ log_it(L_DEBUG, "[%s:%d] Go to next chain \"%s\" for net %s", __FUNCTION__, __LINE__,
+ l_net_pvt->sync_context.cur_chain->name, l_net_pvt->sync_context.cur_chain->net_name);
+ else
+ log_it(L_DEBUG, "[%s:%d] Go to next chain: <NULL>", __FUNCTION__, __LINE__);
l_net_pvt->sync_context.last_state = SYNC_STATE_SYNCED;
return;
}
--
GitLab