bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: ip: Split debug prints into smaller pieces

Browse Source 
Currently logging subsystem supports quite small number of function
parameters. So split some long functions into smaller pieces.
Hopefully this is just a temporary patch and we can support more
parameters to logging macros.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2018-09-03 17:33:33 +03:00
parent 2bc38a8f88
commit 15e7e3ea4b
6 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subsys/net/ip/dhcpv4.c
View File

@ -942,11 +942,13 @@ static enum net_verdict net_dhcpv4_input(struct net_conn *conn,
"secs=%u flags=0x%x chaddr=%s",
msg->op, msg->htype, msg->hlen, ntohl(msg->xid),
msg->secs, msg->flags, net_sprint_ll_addr(msg->chaddr, 6));
NET_DBG(" ciaddr=%d.%d.%d.%d yiaddr=%d.%d.%d.%d",
msg->ciaddr[0], msg->ciaddr[1], msg->ciaddr[2], msg->ciaddr[3],
NET_DBG(" ciaddr=%d.%d.%d.%d",
msg->ciaddr[0], msg->ciaddr[1], msg->ciaddr[2], msg->ciaddr[3]);
NET_DBG(" yiaddr=%d.%d.%d.%d",
msg->yiaddr[0], msg->yiaddr[1], msg->yiaddr[2], msg->yiaddr[3]);
NET_DBG(" siaddr=%d.%d.%d.%d giaddr=%d.%d.%d.%d]",
msg->siaddr[0], msg->siaddr[1], msg->siaddr[2], msg->siaddr[3],
NET_DBG(" siaddr=%d.%d.%d.%d",
msg->siaddr[0], msg->siaddr[1], msg->siaddr[2], msg->siaddr[3]);
NET_DBG(" giaddr=%d.%d.%d.%d]",
msg->giaddr[0], msg->giaddr[1], msg->giaddr[2], msg->giaddr[3]);
if (!(msg->op == DHCPV4_MSG_BOOT_REPLY &&

16
subsys/net/ip/net_pkt.c
View File

@ -389,9 +389,10 @@ struct net_buf *net_pkt_get_reserve_data(struct net_buf_pool *pool,
net_pkt_alloc_add(frag, false, caller, line);
NET_DBG("%s (%s) [%d] frag %p reserve %u ref %d (%s():%d)",
NET_DBG("%s (%s) [%d] frag %p reserve %u",
pool2str(pool), get_name(pool), get_frees(pool),
frag, reserve_head, frag->ref, caller, line);
frag, reserve_head);
NET_DBG(" ref %d (%s():%d)", frag->ref, caller, line);
#endif
return frag;
@ -781,10 +782,11 @@ void net_pkt_unref(struct net_pkt *pkt)
frag = pkt->frags;
while (frag) {
NET_DBG("%s (%s) [%d] frag %p ref %d frags %p (%s():%d)",
NET_DBG("%s (%s) [%d] frag %p",
pool2str(net_buf_pool_get(frag->pool_id)),
get_name(net_buf_pool_get(frag->pool_id)),
get_frees(net_buf_pool_get(frag->pool_id)), frag,
get_frees(net_buf_pool_get(frag->pool_id)), frag);
NET_DBG(" ref %d frags %p (%s():%d)",
frag->ref - 1, frag->frags, caller, line);
if (!frag->ref) {
@ -2197,14 +2199,14 @@ struct net_pkt *net_pkt_clone(struct net_pkt *pkt, s32_t timeout)
void net_pkt_init(void)
{
#if CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
NET_DBG("Allocating %u RX (%zu bytes), %u TX (%zu bytes), "
"%d RX data (%u bytes) and %d TX data (%u bytes) buffers",
NET_DBG("Allocating %u RX (%zu bytes), %u TX (%zu bytes), ",
k_mem_slab_num_free_get(&rx_pkts),
(size_t)(k_mem_slab_num_free_get(&rx_pkts) *
sizeof(struct net_pkt)),
k_mem_slab_num_free_get(&tx_pkts),
(size_t)(k_mem_slab_num_free_get(&tx_pkts) *
sizeof(struct net_pkt)),
sizeof(struct net_pkt)));
NET_DBG(" %d RX data (%u bytes) and %d TX data (%u bytes) buffers",
get_frees(&rx_bufs), get_size(&rx_bufs),
get_frees(&tx_bufs), get_size(&tx_bufs));
#endif

5
subsys/net/ip/rpl.c
View File

@ -691,12 +691,13 @@ static void new_dio_interval(struct net_rpl_instance *instance)
instance->dio_intervals++;
instance->dio_recv_pkt += instance->dio_counter;
NET_DBG("rank %u.%u (%u) stats %d/%d/%d/%d %s",
NET_DBG("rank %u.%u (%u)",
NET_RPL_DAG_RANK(instance->current_dag->rank, instance),
((10 * (instance->current_dag->rank %
instance->min_hop_rank_inc)) /
instance->min_hop_rank_inc),
instance->current_dag->version,
instance->current_dag->version);
NET_DBG(" stats %d/%d/%d/%d %s",
instance->dio_intervals,
instance->dio_send_pkt,
instance->dio_recv_pkt,

15
subsys/net/ip/tcp.c
View File

@ -133,23 +133,28 @@ static void net_tcp_trace(struct net_pkt *pkt, struct net_tcp *tcp)
rel_ack = ack ? ack - tcp->sent_ack : 0;
}
NET_DBG("[%p] pkt %p src %u dst %u seq 0x%04x (%u) ack 0x%04x (%u/%u) "
"flags %c%c%c%c%c%c win %u chk 0x%04x",
NET_DBG("[%p] pkt %p src %u dst %u",
tcp, pkt,
ntohs(tcp_hdr->src_port),
ntohs(tcp_hdr->dst_port),
ntohs(tcp_hdr->dst_port));
NET_DBG(" seq 0x%04x (%u) ack 0x%04x (%u/%u)",
sys_get_be32(tcp_hdr->seq),
sys_get_be32(tcp_hdr->seq),
ack,
ack,
/* This tells how many bytes we are acking now */
rel_ack,
rel_ack);
NET_DBG(" flags %c%c%c%c%c%c",
upper_if_set('u', flags & NET_TCP_URG),
upper_if_set('a', flags & NET_TCP_ACK),
upper_if_set('p', flags & NET_TCP_PSH),
upper_if_set('r', flags & NET_TCP_RST),
upper_if_set('s', flags & NET_TCP_SYN),
upper_if_set('f', flags & NET_TCP_FIN),
upper_if_set('f', flags & NET_TCP_FIN));
NET_DBG(" win %u chk 0x%04x",
sys_get_be16(tcp_hdr->wnd),
ntohs(tcp_hdr->chksum));
}

6
subsys/net/l2/ethernet/gptp/gptp_messages.c
View File

@ -37,8 +37,10 @@ static const struct net_eth_addr gptp_multicast_eth_addr = {
output, \
sizeof(output)); \
\
NET_DBG("Sending %s seq %d pkt %p GM %d/%d/0x%x/%d/%s",\
msg, ntohs(hdr->sequence_id), pkt, \
NET_DBG("Sending %s seq %d pkt %p",\
msg, ntohs(hdr->sequence_id), pkt); \
\
NET_DBG(" GM %d/%d/0x%x/%d/%s",\
ann->root_system_id.grand_master_prio1, \
ann->root_system_id.clk_quality.clock_class, \
ann->root_system_id.clk_quality.clock_accuracy,\

12
subsys/net/l2/ieee802154/ieee802154_frame.c
View File

@ -8,16 +8,14 @@
#define NET_LOG_LEVEL CONFIG_NET_L2_IEEE802154_LOG_LEVEL
#define dbg_print_fs(fs) \
NET_DBG("fs: %u/%u/%u/%u/%u/%u/%u/%u/%u/%u/%u - %u", \
NET_DBG("fs(1): %u/%u/%u/%u/%u/%u", \
fs->fc.frame_type, fs->fc.security_enabled, \
fs->fc.frame_pending, fs->fc.ar, fs->fc.pan_id_comp, \
fs->fc.reserved, fs->fc.seq_num_suppr, fs->fc.ie_list, \
fs->fc.reserved); \
NET_DBG("fs(2): %u/%u/%u/%u/%u - %u", \
fs->fc.seq_num_suppr, fs->fc.ie_list, \
fs->fc.dst_addr_mode, fs->fc.frame_version, \
fs->fc.src_addr_mode, \
fs->sequence)
#else
#define dbg_print_fs(...)
#endif /* CONFIG_NET_DEBUG_L2_IEEE802154 */
fs->fc.src_addr_mode, fs->sequence)
#include <net/net_core.h>
#include <net/net_if.h>