From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 1225F5A8C for ; Mon, 30 Mar 2015 13:41:17 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 30 Mar 2015 04:41:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="672537198" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga001.jf.intel.com with SMTP; 30 Mar 2015 04:41:15 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:39:14 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:39:12 +0200 Message-Id: <1427715552-29212-1-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 13/13] port: added port_sink 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: , X-List-Received-Date: Mon, 30 Mar 2015 11:41:18 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_port/rte_port_source_sink.c | 63 ++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 2241169..4c32f43 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -393,6 +393,7 @@ CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_SOURCE_STATS_COLLECT=n +CONFIG_RTE_PORT_SINK_STATS_COLLECT=n # # Compile librte_table diff --git a/config/common_linuxapp b/config/common_linuxapp index 16ce4ef..6a5aa87 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -400,6 +400,7 @@ CONFIG_RTE_PORT_RING_WRITER_NODROP_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_READER_STATS_COLLECT=n CONFIG_RTE_PORT_SCHED_WRITER_STATS_COLLECT=n CONFIG_RTE_PORT_SOURCE_STATS_COLLECT=n +CONFIG_RTE_PORT_SINK_STATS_COLLECT=n # # Compile librte_table diff --git a/lib/librte_port/rte_port_source_sink.c b/lib/librte_port/rte_port_source_sink.c index 4f51ec7..508fcf6 100644 --- a/lib/librte_port/rte_port_source_sink.c +++ b/lib/librte_port/rte_port_source_sink.c @@ -133,28 +133,64 @@ rte_port_source_stats_read(void *port, /* * Port SINK */ +#ifdef RTE_PORT_SINK_STATS_COLLECT + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) \ + port->stats.n_pkts_in += val +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) \ + port->stats.n_pkts_drop += val + +#else + +#define RTE_PORT_SINK_STATS_PKTS_IN_ADD(port, val) +#define RTE_PORT_SINK_STATS_PKTS_DROP_ADD(port, val) + +#endif + +struct rte_port_sink { + struct rte_port_out_stats stats; +}; + static void * -rte_port_sink_create(__rte_unused void *params, __rte_unused int socket_id) +rte_port_sink_create(__rte_unused void *params, int socket_id) { - return (void *) 1; + struct rte_port_sink *port; + + /* Memory allocation */ + port = rte_zmalloc_socket("PORT", sizeof(*port), + RTE_CACHE_LINE_SIZE, socket_id); + if (port == NULL) { + RTE_LOG(ERR, PORT, "%s: Failed to allocate port\n", __func__); + return NULL; + } + + return port; } static int -rte_port_sink_tx(__rte_unused void *port, struct rte_mbuf *pkt) +rte_port_sink_tx(void *port, struct rte_mbuf *pkt) { + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); rte_pktmbuf_free(pkt); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); return 0; } static int -rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, +rte_port_sink_tx_bulk(void *port, struct rte_mbuf **pkts, uint64_t pkts_mask) { + __rte_unused struct rte_port_sink *p = (struct rte_port_sink *) port; + if ((pkts_mask & (pkts_mask + 1)) == 0) { uint64_t n_pkts = __builtin_popcountll(pkts_mask); uint32_t i; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, n_pkts); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, n_pkts); for (i = 0; i < n_pkts; i++) { struct rte_mbuf *pkt = pkts[i]; @@ -166,6 +202,8 @@ rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, uint64_t pkt_mask = 1LLU << pkt_index; struct rte_mbuf *pkt = pkts[pkt_index]; + RTE_PORT_SINK_STATS_PKTS_IN_ADD(p, 1); + RTE_PORT_SINK_STATS_PKTS_DROP_ADD(p, 1); rte_pktmbuf_free(pkt); pkts_mask &= ~pkt_mask; } @@ -174,6 +212,22 @@ rte_port_sink_tx_bulk(__rte_unused void *port, struct rte_mbuf **pkts, return 0; } +static int +rte_port_sink_stats_read(void *port, struct rte_port_out_stats *stats, + int clear) +{ + struct rte_port_sink *p = + (struct rte_port_sink *) port; + + if (stats != NULL) + memcpy(stats, &p->stats, sizeof(p->stats)); + + if (clear) + memset(&p->stats, 0, sizeof(p->stats)); + + return 0; +} + /* * Summary of port operations */ @@ -190,4 +244,5 @@ struct rte_port_out_ops rte_port_sink_ops = { .f_tx = rte_port_sink_tx, .f_tx_bulk = rte_port_sink_tx_bulk, .f_flush = NULL, + .f_stats = rte_port_sink_stats_read, }; -- 1.7.9.5