kernel: atomics: update print specifiers for atomic_t
The print specifier for `atomic_t` should be updated to `%ld`, `%lu`, or `%lx` to account for the type change of `atomic_t` to `long`. Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
This commit is contained in:
parent
80f73a053f
commit
3e86c627f7
12 changed files with 29 additions and 32 deletions
|
@ -706,7 +706,7 @@ static int kw41z_tx(const struct device *dev, enum ieee802154_tx_mode mode,
|
|||
handle_ack(kw41z, frag->data[2]);
|
||||
}
|
||||
|
||||
LOG_DBG("seq_retval: %d", kw41z->seq_retval);
|
||||
LOG_DBG("seq_retval: %ld", kw41z->seq_retval);
|
||||
return kw41z->seq_retval;
|
||||
}
|
||||
|
||||
|
|
|
@ -436,7 +436,7 @@ static inline bool att_chan_is_connected(struct bt_att_chan *chan)
|
|||
static int bt_att_chan_send(struct bt_att_chan *chan, struct net_buf *buf,
|
||||
bt_att_chan_sent_t cb)
|
||||
{
|
||||
BT_DBG("chan %p flags %u code 0x%02x", chan, atomic_get(chan->flags),
|
||||
BT_DBG("chan %p flags %lu code 0x%02x", chan, atomic_get(chan->flags),
|
||||
((struct bt_att_hdr *)buf->data)->code);
|
||||
|
||||
return chan_send(chan, buf, cb);
|
||||
|
@ -2610,7 +2610,7 @@ static struct bt_att_chan *att_get_fixed_chan(struct bt_conn *conn)
|
|||
|
||||
static void att_chan_attach(struct bt_att *att, struct bt_att_chan *chan)
|
||||
{
|
||||
BT_DBG("att %p chan %p flags %u", att, chan, atomic_get(chan->flags));
|
||||
BT_DBG("att %p chan %p flags %lu", att, chan, atomic_get(chan->flags));
|
||||
|
||||
if (sys_slist_is_empty(&att->chans)) {
|
||||
/* Init general queues when attaching the first channel */
|
||||
|
|
|
@ -1078,7 +1078,7 @@ struct bt_conn *bt_conn_ref(struct bt_conn *conn)
|
|||
}
|
||||
} while (!atomic_cas(&conn->ref, old, old + 1));
|
||||
|
||||
BT_DBG("handle %u ref %d -> %d", conn->handle, old, old + 1);
|
||||
BT_DBG("handle %u ref %ld -> %ld", conn->handle, old, old + 1);
|
||||
|
||||
return conn;
|
||||
}
|
||||
|
@ -1089,7 +1089,7 @@ void bt_conn_unref(struct bt_conn *conn)
|
|||
|
||||
old = atomic_dec(&conn->ref);
|
||||
|
||||
BT_DBG("handle %u ref %d -> %d", conn->handle, old,
|
||||
BT_DBG("handle %u ref %ld -> %ld", conn->handle, old,
|
||||
atomic_get(&conn->ref));
|
||||
|
||||
__ASSERT(old > 0, "Conn reference counter is 0");
|
||||
|
|
|
@ -1855,7 +1855,7 @@ static int l2cap_chan_le_send(struct bt_l2cap_le_chan *ch,
|
|||
return -EAGAIN;
|
||||
}
|
||||
|
||||
BT_DBG("ch %p cid 0x%04x len %u credits %u", ch, ch->tx.cid,
|
||||
BT_DBG("ch %p cid 0x%04x len %u credits %lu", ch, ch->tx.cid,
|
||||
seg->len, atomic_get(&ch->tx.credits));
|
||||
|
||||
len = seg->len - sdu_hdr_len;
|
||||
|
@ -1998,7 +1998,7 @@ static void le_credits(struct bt_l2cap *l2cap, uint8_t ident,
|
|||
|
||||
l2cap_chan_tx_give_credits(ch, credits);
|
||||
|
||||
BT_DBG("chan %p total credits %u", ch, atomic_get(&ch->tx.credits));
|
||||
BT_DBG("chan %p total credits %lu", ch, atomic_get(&ch->tx.credits));
|
||||
|
||||
l2cap_chan_tx_resume(ch);
|
||||
}
|
||||
|
@ -2172,7 +2172,7 @@ static void l2cap_chan_send_credits(struct bt_l2cap_le_chan *chan,
|
|||
|
||||
l2cap_send(chan->chan.conn, BT_L2CAP_CID_LE_SIG, buf);
|
||||
|
||||
BT_DBG("chan %p credits %u", chan, atomic_get(&chan->rx.credits));
|
||||
BT_DBG("chan %p credits %lu", chan, atomic_get(&chan->rx.credits));
|
||||
}
|
||||
|
||||
static void l2cap_chan_update_credits(struct bt_l2cap_le_chan *chan,
|
||||
|
|
|
@ -122,7 +122,7 @@ static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
|
|||
|
||||
static void l2cap_status(struct bt_l2cap_chan *chan, atomic_t *status)
|
||||
{
|
||||
LOG_DBG("Channel %p status %u", chan, *status);
|
||||
LOG_DBG("Channel %p status %lu", chan, atomic_get(status));
|
||||
}
|
||||
|
||||
static void l2cap_connected(struct bt_l2cap_chan *chan)
|
||||
|
|
|
@ -538,7 +538,7 @@ void net_pkt_unref(struct net_pkt *pkt)
|
|||
|
||||
#if NET_LOG_LEVEL >= LOG_LEVEL_DBG
|
||||
#if CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
|
||||
NET_DBG("%s [%d] pkt %p ref %d frags %p (%s():%d)",
|
||||
NET_DBG("%s [%d] pkt %p ref %ld frags %p (%s():%d)",
|
||||
slab2str(pkt->slab), k_mem_slab_num_free_get(pkt->slab),
|
||||
pkt, ref - 1, pkt->frags, caller, line);
|
||||
#endif
|
||||
|
@ -619,7 +619,7 @@ struct net_pkt *net_pkt_ref(struct net_pkt *pkt)
|
|||
} while (!atomic_cas(&pkt->atomic_ref, ref, ref + 1));
|
||||
|
||||
#if CONFIG_NET_PKT_LOG_LEVEL >= LOG_LEVEL_DBG
|
||||
NET_DBG("%s [%d] pkt %p ref %d (%s():%d)",
|
||||
NET_DBG("%s [%d] pkt %p ref %ld (%s():%d)",
|
||||
slab2str(pkt->slab), k_mem_slab_num_free_get(pkt->slab),
|
||||
pkt, ref + 1, caller, line);
|
||||
#endif
|
||||
|
|
|
@ -248,14 +248,14 @@ static inline void net_pkt_print_buffer_info(struct net_pkt *pkt, const char *st
|
|||
printk("%s", str);
|
||||
}
|
||||
|
||||
printk("%p[%d]", pkt, atomic_get(&pkt->atomic_ref));
|
||||
printk("%p[%ld]", pkt, atomic_get(&pkt->atomic_ref));
|
||||
|
||||
if (buf) {
|
||||
printk("->");
|
||||
}
|
||||
|
||||
while (buf) {
|
||||
printk("%p[%d/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
|
||||
printk("%p[%ld/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
|
||||
buf->len, net_buf_max_len(buf), buf->size);
|
||||
|
||||
buf = buf->frags;
|
||||
|
|
|
@ -1496,7 +1496,7 @@ static void tcp_sent_list_cb(struct tcp *conn, void *user_data)
|
|||
details->printed_details = true;
|
||||
}
|
||||
|
||||
PR("%p %d %u\t %u\t %zd\t %d\t %d/%d/%d %s\n",
|
||||
PR("%p %ld %u\t %u\t %zd\t %d\t %d/%d/%d %s\n",
|
||||
conn, atomic_get(&conn->ref_count), conn->recv_win,
|
||||
conn->send_win, conn->send_data_total, conn->unacked_len,
|
||||
conn->in_retransmission, conn->in_connect, conn->in_close,
|
||||
|
@ -1524,12 +1524,12 @@ static void tcp_sent_list_cb(struct tcp *conn, void *user_data)
|
|||
struct net_buf *frag = pkt->frags;
|
||||
|
||||
if (!details->printed_send_queue_header) {
|
||||
PR("%p[%d/%zd]", pkt,
|
||||
PR("%p[%ld/%zd]", pkt,
|
||||
atomic_get(&pkt->atomic_ref),
|
||||
net_pkt_get_len(pkt));
|
||||
details->printed_send_queue_header = true;
|
||||
} else {
|
||||
PR(" %p[%d/%zd]",
|
||||
PR(" %p[%ld/%zd]",
|
||||
pkt, atomic_get(&pkt->atomic_ref),
|
||||
net_pkt_get_len(pkt));
|
||||
}
|
||||
|
@ -1630,7 +1630,7 @@ static void allocs_cb(struct net_pkt *pkt,
|
|||
|
||||
if (func_alloc) {
|
||||
if (in_use) {
|
||||
PR("%p/%d\t%5s\t%5s\t%s():%d\n",
|
||||
PR("%p/%ld\t%5s\t%5s\t%s():%d\n",
|
||||
pkt, atomic_get(&pkt->atomic_ref), str,
|
||||
net_pkt_slab2str(pkt->slab),
|
||||
func_alloc, line_alloc);
|
||||
|
@ -3632,8 +3632,7 @@ static void context_info(struct net_context *context, void *user_data)
|
|||
}
|
||||
|
||||
#if defined(CONFIG_NET_BUF_POOL_USAGE)
|
||||
PR("%p\t%d\t%d\tEDATA (%s)\n",
|
||||
pool, pool->buf_count,
|
||||
PR("%p\t%d\t%ld\tEDATA (%s)\n", pool, pool->buf_count,
|
||||
atomic_get(&pool->avail_count), pool->name);
|
||||
#else
|
||||
PR("%p\t%d\tEDATA\n", pool, pool->buf_count);
|
||||
|
@ -3671,13 +3670,11 @@ static int cmd_net_mem(const struct shell *shell, size_t argc, char *argv[])
|
|||
PR("%p\t%d\t%u\tTX\n",
|
||||
tx, tx->num_blocks, k_mem_slab_num_free_get(tx));
|
||||
|
||||
PR("%p\t%d\t%d\tRX DATA (%s)\n",
|
||||
rx_data, rx_data->buf_count,
|
||||
atomic_get(&rx_data->avail_count), rx_data->name);
|
||||
PR("%p\t%d\t%ld\tRX DATA (%s)\n ", rx_data, rx_data->buf_count,
|
||||
atomic_get(&rx_data->avail_count), rx_data->name);
|
||||
|
||||
PR("%p\t%d\t%d\tTX DATA (%s)\n",
|
||||
tx_data, tx_data->buf_count,
|
||||
atomic_get(&tx_data->avail_count), tx_data->name);
|
||||
PR("%p\t%d\t%ld\tTX DATA (%s)\n", tx_data, tx_data->buf_count,
|
||||
atomic_get(&tx_data->avail_count), tx_data->name);
|
||||
#else
|
||||
PR("Address\t\tTotal\tName\n");
|
||||
|
||||
|
@ -4241,14 +4238,14 @@ static void net_pkt_buffer_info(const struct shell *shell, struct net_pkt *pkt)
|
|||
struct net_buf *buf = pkt->buffer;
|
||||
|
||||
PR("net_pkt %p buffer chain:\n", pkt);
|
||||
PR("%p[%d]", pkt, atomic_get(&pkt->atomic_ref));
|
||||
PR("%p[%ld]", pkt, atomic_get(&pkt->atomic_ref));
|
||||
|
||||
if (buf) {
|
||||
PR("->");
|
||||
}
|
||||
|
||||
while (buf) {
|
||||
PR("%p[%d/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
|
||||
PR("%p[%ld/%u (%u/%u)]", buf, atomic_get(&pkt->atomic_ref),
|
||||
buf->len, net_buf_max_len(buf), buf->size);
|
||||
|
||||
buf = buf->frags;
|
||||
|
|
|
@ -37,7 +37,7 @@ static void arp_entry_cleanup(struct arp_entry *entry, bool pending)
|
|||
NET_DBG("%p", entry);
|
||||
|
||||
if (pending) {
|
||||
NET_DBG("Releasing pending pkt %p (ref %d)",
|
||||
NET_DBG("Releasing pending pkt %p (ref %ld)",
|
||||
entry->pending,
|
||||
atomic_get(&entry->pending->atomic_ref) - 1);
|
||||
net_pkt_unref(entry->pending);
|
||||
|
|
|
@ -310,7 +310,7 @@ static int cmd_shell_stats_show(const struct shell *shell, size_t argc,
|
|||
ARG_UNUSED(argc);
|
||||
ARG_UNUSED(argv);
|
||||
|
||||
shell_print(shell, "Lost logs: %u", shell->stats->log_lost_cnt);
|
||||
shell_print(shell, "Lost logs: %lu", shell->stats->log_lost_cnt);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -457,7 +457,7 @@ static void rndis_notify_rsp(void)
|
|||
};
|
||||
int ret;
|
||||
|
||||
LOG_DBG("count %u", atomic_get(&rndis.notify_count));
|
||||
LOG_DBG("count %lu", atomic_get(&rndis.notify_count));
|
||||
|
||||
if (atomic_get(&rndis.notify_count)) {
|
||||
LOG_WRN("Notification is already sent");
|
||||
|
|
|
@ -44,7 +44,7 @@ static void work_handler(struct k_work *work)
|
|||
|
||||
while (true) {
|
||||
if (ctx.write) {
|
||||
LOG_DBG("ctx.m: %u", ctx.m);
|
||||
LOG_DBG("ctx.m: %lu", atomic_get(&ctx.m));
|
||||
if (atomic_get(&ctx.m)
|
||||
< CONFIG_NET_SOCKETPAIR_BUFFER_SIZE) {
|
||||
continue;
|
||||
|
@ -106,7 +106,7 @@ void test_socketpair_write_block(void)
|
|||
res);
|
||||
|
||||
atomic_inc(&ctx.m);
|
||||
LOG_DBG("have written %u bytes", ctx.m);
|
||||
LOG_DBG("have written %lu bytes", atomic_get(&ctx.m));
|
||||
}
|
||||
|
||||
/* try to write one more byte */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue