Skip to content

Commit 406ecf2

Browse files
committed
refactor: enhance memory pool logging for RX/TX queues in pktgen
Signed-off-by: Keith Wiles <keith.wiles@intel.com>
1 parent 6f798ac commit 406ecf2

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

app/l2p.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ l2p_pktmbuf_create(const char *type, l2p_port_t *port, uint16_t qid, int nb_mbuf
7979
"Cannot create mbuf pool (%s) port %d, queue %u, nb_mbufs %d, NUMA %d: %s\n", name,
8080
port->pid, qid, nb_mbufs, sid, rte_strerror(rte_errno));
8181

82-
pktgen_log_info(" Create: '%-*s' - Memory used (MBUFs %'6u x size %'6u) = %'8lu KB @ %p\n", 16,
82+
pktgen_log_info(" Create: '%-*s' - Memory used (MBUFs %'6u x size %'6u) = %'8lu KB @ %p\n", 24,
8383
name, nb_mbufs, bufSize, sz / 1024, mp);
8484

8585
return mp;

app/pktgen-cmds.c

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,16 +1221,28 @@ debug_mempool_dump(port_info_t *pinfo __rte_unused, char *name __rte_unused)
12211221
all = !strcmp(name, "all");
12221222

12231223
if (all || !strcmp(name, "rx")) {
1224-
for (uint16_t q = 0; q < l2p_get_rxcnt(pinfo->pid); q++)
1225-
rte_mempool_dump(stdout, l2p_get_rx_mp(pinfo->pid, q));
1224+
for (uint16_t q = 0; q < l2p_get_rxcnt(pinfo->pid); q++) {
1225+
struct rte_mempool *mp = l2p_get_rx_mp(pinfo->pid, q);
1226+
if (mp)
1227+
fprintf(stdout, "\nPort %u RX qid %u: %s @ %p\n", pinfo->pid, q, mp->name, mp);
1228+
__mempool_dump(stdout, mp);
1229+
}
12261230
}
12271231
if (all || !strcmp(name, "tx")) {
1228-
for (uint16_t q = 0; q < l2p_get_txcnt(pinfo->pid); q++)
1229-
__mempool_dump(stdout, l2p_get_tx_mp(pinfo->pid, q));
1232+
for (uint16_t q = 0; q < l2p_get_txcnt(pinfo->pid); q++) {
1233+
struct rte_mempool *mp = l2p_get_tx_mp(pinfo->pid, q);
1234+
if (mp)
1235+
fprintf(stdout, "\nPort %u TX qid %u: %s @ %p\n", pinfo->pid, q, mp->name, mp);
1236+
__mempool_dump(stdout, mp);
1237+
}
12301238
}
12311239
if (all || !strcmp(name, "arp")) {
1232-
for (uint16_t q = 0; q < l2p_get_txcnt(pinfo->pid); q++)
1233-
__mempool_dump(stdout, l2p_get_sp_mp(pinfo->pid, q));
1240+
for (uint16_t q = 0; q < l2p_get_txcnt(pinfo->pid); q++) {
1241+
struct rte_mempool *mp = l2p_get_sp_mp(pinfo->pid, q);
1242+
if (mp)
1243+
fprintf(stdout, "\nPort %u SP qid %u: %s @ %p\n", pinfo->pid, q, mp->name, mp);
1244+
__mempool_dump(stdout, mp);
1245+
}
12341246
}
12351247
}
12361248

app/pktgen.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,8 +1058,10 @@ pktgen_main_rxtx_loop(void)
10581058
rx_qid = l2p_get_rxqid(lid);
10591059
tx_qid = l2p_get_txqid(lid);
10601060

1061-
printf("RX/TX lid %3d, pid %2d, qids %2d/%2d Mempool %-16s @ %p\n", lid, pinfo->pid, rx_qid,
1062-
tx_qid, l2p_get_tx_mp(pinfo->pid, tx_qid)->name, l2p_get_tx_mp(pinfo->pid, tx_qid));
1061+
printf("RX/TX lid %3d, pid %2d, qids %2d/%2d RX-MP %-16s @ %p TX-MP %-16s @ %p\n", lid,
1062+
pinfo->pid, rx_qid, tx_qid, l2p_get_rx_mp(pinfo->pid, rx_qid)->name,
1063+
l2p_get_rx_mp(pinfo->pid, rx_qid), l2p_get_tx_mp(pinfo->pid, tx_qid)->name,
1064+
l2p_get_tx_mp(pinfo->pid, tx_qid));
10631065

10641066
while (pktgen.force_quit == 0) {
10651067
/* Process RX */
@@ -1115,7 +1117,7 @@ pktgen_main_tx_loop(void)
11151117

11161118
tx_qid = l2p_get_txqid(lid);
11171119

1118-
printf("TX lid %3d, pid %2d, qid %2d, Mempool %-16s @ %p\n", lid, pinfo->pid, tx_qid,
1120+
printf("TX lid %3d, pid %2d, qid %2d, TX-MP %-16s @ %p\n", lid, pinfo->pid, tx_qid,
11191121
l2p_get_tx_mp(pinfo->pid, tx_qid)->name, l2p_get_tx_mp(pinfo->pid, tx_qid));
11201122

11211123
while (unlikely(pktgen.force_quit == 0)) {
@@ -1166,7 +1168,7 @@ pktgen_main_rx_loop(void)
11661168
pinfo = l2p_get_pinfo_by_lcore(lid);
11671169
rx_qid = l2p_get_rxqid(lid);
11681170

1169-
printf("RX lid %3d, pid %2d, qid %2d, Mempool %-16s @ %p\n", lid, pinfo->pid, rx_qid,
1171+
printf("RX lid %3d, pid %2d, qid %2d, RX-MP %-16s @ %p\n", lid, pinfo->pid, rx_qid,
11701172
l2p_get_rx_mp(pinfo->pid, rx_qid)->name, l2p_get_rx_mp(pinfo->pid, rx_qid));
11711173

11721174
while (pktgen.force_quit == 0)

0 commit comments

Comments
 (0)