ethdev: fetch extended statistics with integer ids

[dpdk.git] / lib / librte_ether / rte_ethdev.c

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index e148028..98e5efb 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1502,6 +1502,85 @@ rte_eth_stats_reset(uint8_t port_id)
        dev->data->rx_mbuf_alloc_failed = 0;
 }
 
+static int
+get_xstats_count(uint8_t port_id)
+{
+       struct rte_eth_dev *dev;
+       int count;
+
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+       dev = &rte_eth_devices[port_id];
+       if (dev->dev_ops->xstats_get_names != NULL) {
+               count = (*dev->dev_ops->xstats_get_names)(dev, NULL, 0);
+               if (count < 0)
+                       return count;
+       } else
+               count = 0;
+       count += RTE_NB_STATS;
+       count += dev->data->nb_rx_queues * RTE_NB_RXQ_STATS;
+       count += dev->data->nb_tx_queues * RTE_NB_TXQ_STATS;
+       return count;
+}
+
+int
+rte_eth_xstats_get_names(uint8_t port_id,
+       struct rte_eth_xstat_name *xstats_names,
+       unsigned size)
+{
+       struct rte_eth_dev *dev;
+       int cnt_used_entries;
+       int cnt_expected_entries;
+       uint32_t idx, id_queue;
+
+       cnt_expected_entries = get_xstats_count(port_id);
+       if (xstats_names == NULL || cnt_expected_entries < 0 ||
+                       (int)size < cnt_expected_entries)
+               return cnt_expected_entries;
+
+       /* port_id checked in get_xstats_count() */
+       dev = &rte_eth_devices[port_id];
+       if (dev->dev_ops->xstats_get_names != NULL) {
+               cnt_used_entries = (*dev->dev_ops->xstats_get_names)(
+                       dev, xstats_names, size);
+               if (cnt_used_entries < 0)
+                       return cnt_used_entries;
+       } else
+               /* Driver itself does not support extended stats, but
+                * still have basic stats.
+                */
+               cnt_used_entries = 0;
+
+       for (idx = 0; idx < RTE_NB_STATS; idx++) {
+               xstats_names[cnt_used_entries].id = cnt_used_entries;
+               snprintf(xstats_names[cnt_used_entries].name,
+                       sizeof(xstats_names[0].name),
+                       "%s", rte_stats_strings[idx].name);
+               cnt_used_entries++;
+       }
+       for (id_queue = 0; id_queue < dev->data->nb_rx_queues; id_queue++) {
+               for (idx = 0; idx < RTE_NB_RXQ_STATS; idx++) {
+                       xstats_names[cnt_used_entries].id = cnt_used_entries;
+                       snprintf(xstats_names[cnt_used_entries].name,
+                               sizeof(xstats_names[0].name),
+                               "rx_q%u%s",
+                               id_queue, rte_rxq_stats_strings[idx].name);
+                       cnt_used_entries++;
+               }
+
+       }
+       for (id_queue = 0; id_queue < dev->data->nb_tx_queues; id_queue++) {
+               for (idx = 0; idx < RTE_NB_TXQ_STATS; idx++) {
+                       xstats_names[cnt_used_entries].id = cnt_used_entries;
+                       snprintf(xstats_names[cnt_used_entries].name,
+                               sizeof(xstats_names[0].name),
+                               "tx_q%u%s",
+                               id_queue, rte_txq_stats_strings[idx].name);
+                       cnt_used_entries++;
+               }
+       }
+       return cnt_used_entries;
+}
+
 /* retrieve ethdev extended statistics */
 int
 rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
@@ -1546,8 +1625,8 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
                stats_ptr = RTE_PTR_ADD(&eth_stats,
                                        rte_stats_strings[i].offset);
                val = *stats_ptr;
-               snprintf(xstats[count].name, sizeof(xstats[count].name),
-                       "%s", rte_stats_strings[i].name);
+               xstats[count].name[0] = '\0';
+               xstats[count].id = count + xcount;
                xstats[count++].value = val;
        }
 
@@ -1558,9 +1637,8 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
                                        rte_rxq_stats_strings[i].offset +
                                        q * sizeof(uint64_t));
                        val = *stats_ptr;
-                       snprintf(xstats[count].name, sizeof(xstats[count].name),
-                               "rx_q%u_%s", q,
-                               rte_rxq_stats_strings[i].name);
+                       xstats[count].name[0] = '\0';
+                       xstats[count].id = count + xcount;
                        xstats[count++].value = val;
                }
        }
@@ -1572,9 +1650,8 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats,
                                        rte_txq_stats_strings[i].offset +
                                        q * sizeof(uint64_t));
                        val = *stats_ptr;
-                       snprintf(xstats[count].name, sizeof(xstats[count].name),
-                               "tx_q%u_%s", q,
-                               rte_txq_stats_strings[i].name);
+                       xstats[count].name[0] = '\0';
+                       xstats[count].id = count + xcount;
                        xstats[count++].value = val;
                }
        }