[dpdk-dev] [PATCH v2 02/13] port: added port_ethdev_reader stats

2015-05-18 Thread Thomas Monjalon
2015-04-30 14:07, Michal Jastrzebski:
> From: Maciej Gajdzica 
> 
> Added statistics for ethdev reader port.
> 
> Signed-off-by: Maciej Gajdzica 
> ---
>  config/common_bsdapp  |1 +
>  config/common_linuxapp|1 +
[...]
>  # Compile librte_port
>  #
>  CONFIG_RTE_LIBRTE_PORT=y
> +CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n

No, consider adding something to these files is forbidden.
We must remove compile-time options, not adding new ones.

CONFIG_RTE_LIBRTE_IP_FRAG_TBL_STAT and CONFIG_RTE_SCHED_COLLECT_STATS should
be removed.


[dpdk-dev] [PATCH v2 02/13] port: added port_ethdev_reader stats

2015-04-30 Thread Michal Jastrzebski
From: Maciej Gajdzica 

Added statistics for ethdev reader port.

Signed-off-by: Maciej Gajdzica 
---
 config/common_bsdapp  |1 +
 config/common_linuxapp|1 +
 lib/librte_port/rte_port_ethdev.c |   37 -
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/config/common_bsdapp b/config/common_bsdapp
index c2374c0..db73c9c 100644
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -383,6 +383,7 @@ CONFIG_RTE_LIBRTE_REORDER=y
 # Compile librte_port
 #
 CONFIG_RTE_LIBRTE_PORT=y
+CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n

 #
 # Compile librte_table
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 0078dc9..a8719a6 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -390,6 +390,7 @@ CONFIG_RTE_LIBRTE_REORDER=y
 # Compile librte_port
 #
 CONFIG_RTE_LIBRTE_PORT=y
+CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n

 #
 # Compile librte_table
diff --git a/lib/librte_port/rte_port_ethdev.c 
b/lib/librte_port/rte_port_ethdev.c
index 1f77cb5..05bc077 100644
--- a/lib/librte_port/rte_port_ethdev.c
+++ b/lib/librte_port/rte_port_ethdev.c
@@ -42,7 +42,23 @@
 /*
  * Port ETHDEV Reader
  */
+#ifdef RTE_PORT_ETHDEV_READER_STATS_COLLECT
+
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(port, val) \
+   port->stats.n_pkts_in += val
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_DROP_ADD(port, val) \
+   port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_ethdev_reader {
+   struct rte_port_in_stats stats;
+
uint16_t queue_id;
uint8_t port_id;
 };
@@ -80,8 +96,11 @@ rte_port_ethdev_reader_rx(void *port, struct rte_mbuf 
**pkts, uint32_t n_pkts)
 {
struct rte_port_ethdev_reader *p =
(struct rte_port_ethdev_reader *) port;
+   uint16_t rx_pkt_cnt;

-   return rte_eth_rx_burst(p->port_id, p->queue_id, pkts, n_pkts);
+   rx_pkt_cnt = rte_eth_rx_burst(p->port_id, p->queue_id, pkts, n_pkts);
+   RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(p, rx_pkt_cnt);
+   return rx_pkt_cnt;
 }

 static int
@@ -97,6 +116,21 @@ rte_port_ethdev_reader_free(void *port)
return 0;
 }

+static int rte_port_ethdev_reader_stats_read(void *port,
+   struct rte_port_in_stats * stats, int clear)
+{
+   struct rte_port_ethdev_reader *p =
+   (struct rte_port_ethdev_reader *) port;
+
+   if (stats != NULL)
+   memcpy(stats, >stats, sizeof(p->stats));
+
+   if (clear)
+   memset(>stats, 0, sizeof(p->stats));
+
+   return 0;
+}
+
 /*
  * Port ETHDEV Writer
  */
@@ -516,6 +550,7 @@ struct rte_port_in_ops rte_port_ethdev_reader_ops = {
.f_create = rte_port_ethdev_reader_create,
.f_free = rte_port_ethdev_reader_free,
.f_rx = rte_port_ethdev_reader_rx,
+   .f_stats = rte_port_ethdev_reader_stats_read,
 };

 struct rte_port_out_ops rte_port_ethdev_writer_ops = {
-- 
1.7.9.5