From patchwork Mon Mar 30 11:20:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Gajdzica X-Patchwork-Id: 4185 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 16D025A8C; Mon, 30 Mar 2015 13:23:05 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 859AF5A73 for ; Mon, 30 Mar 2015 13:23:03 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 30 Mar 2015 04:23:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="672529477" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga001.jf.intel.com with SMTP; 30 Mar 2015 04:23:01 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:21:00 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:20:56 +0200 Message-Id: <1427714456-29098-1-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 10/13] port: added port_sched_reader stats X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_sched.c | 39 +++++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 4a06da6..4b1a877 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -390,6 +390,7 @@ CONFIG_RTE_PORT_RING_WRITER_RAS_STATS_COLLECT=n CONFIG_RTE_PORT_RING_READER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n +CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 26e2d22..055d06e 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -397,6 +397,7 @@ CONFIG_RTE_PORT_RING_WRITER_RAS_STATS_COLLECT=n CONFIG_RTE_PORT_RING_READER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n +CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n # # Compile librte_table diff --git a/lib/librte_port/rte_port_sched.c b/lib/librte_port/rte_port_sched.c index 2107f4c..f1cb435 100644 --- a/lib/librte_port/rte_port_sched.c +++ b/lib/librte_port/rte_port_sched.c @@ -40,7 +40,23 @@ /* * Reader */ +#ifdef RTE_PORT_SCHED_READER_STATS_COLLECT + +#define RTE_PORT_SCHED_READER_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_SCHED_READER_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_SCHED_READER_PKTS_IN_ADD(port, val) +#define RTE_PORT_SCHED_READER_PKTS_DROP_ADD(port, val) + +#endif + struct rte_port_sched_reader { + struct rte_port_in_stats stats; + struct rte_sched_port *sched; }; @@ -76,8 +92,12 @@ static int rte_port_sched_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts) { struct rte_port_sched_reader *p = (struct rte_port_sched_reader *) port; + uint32_t nb_rx; - return rte_sched_port_dequeue(p->sched, pkts, n_pkts); + nb_rx = rte_sched_port_dequeue(p->sched, pkts, n_pkts); + RTE_PORT_SCHED_READER_PKTS_IN_ADD(p, nb_rx); + + return nb_rx; } static int @@ -93,6 +113,22 @@ rte_port_sched_reader_free(void *port) return 0; } +static int +rte_port_sched_reader_stats_read(void *port, + struct rte_port_in_stats *stats, int clear) +{ + struct rte_port_sched_reader *p = + (struct rte_port_sched_reader *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Writer */ @@ -228,6 +264,7 @@ struct rte_port_in_ops rte_port_sched_reader_ops = { .f_create = rte_port_sched_reader_create, .f_free = rte_port_sched_reader_free, .f_rx = rte_port_sched_reader_rx, + .f_stats = rte_port_sched_reader_stats_read, }; struct rte_port_out_ops rte_port_sched_writer_ops = {