From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 6BDC65A73 for ; Mon, 30 Mar 2015 13:53:17 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 30 Mar 2015 04:53:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,493,1422950400"; d="scan'208";a="706098205" Received: from unknown (HELO Sent) ([10.217.248.233]) by orsmga002.jf.intel.com with SMTP; 30 Mar 2015 04:53:14 -0700 Received: by Sent (sSMTP sendmail emulation); Mon, 30 Mar 2015 13:46:59 +0200 From: Maciej Gajdzica To: dev@dpdk.org Date: Mon, 30 Mar 2015 13:42:10 +0200 Message-Id: <1427715737-29252-4-git-send-email-maciejx.t.gajdzica@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427715737-29252-1-git-send-email-maciejx.t.gajdzica@intel.com> References: <1427715737-29252-1-git-send-email-maciejx.t.gajdzica@intel.com> Subject: [dpdk-dev] [PATCH 03/10] table: added array table 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:53:17 -0000 --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + lib/librte_table/rte_table_array.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index 20aa745..1aba0d5 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -400,6 +400,7 @@ CONFIG_RTE_PORT_SINK_STATS_COLLECT=n # CONFIG_RTE_LIBRTE_TABLE=y CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n +CONFIG_RTE_TABLE_ARRAY_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/config/common_linuxapp b/config/common_linuxapp index 7d70229..b4ad91b 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -407,6 +407,7 @@ CONFIG_RTE_PORT_SINK_STATS_COLLECT=n # CONFIG_RTE_LIBRTE_TABLE=y CONFIG_RTE_TABLE_ACL_STATS_COLLECT=n +CONFIG_RTE_TABLE_ARRAY_STATS_COLLECT=n # # Compile librte_pipeline diff --git a/lib/librte_table/rte_table_array.c b/lib/librte_table/rte_table_array.c index c031070..3f25fa6 100644 --- a/lib/librte_table/rte_table_array.c +++ b/lib/librte_table/rte_table_array.c @@ -42,7 +42,23 @@ #include "rte_table_array.h" +#ifdef RTE_TABLE_ARRAY_STATS_COLLECT + +#define RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(table, val) \ + table->stats.n_pkts_in += val +#define RTE_TABLE_ARRAY_STATS_PKTS_LOOKUP_MISS(table, val) \ + table->stats.n_pkts_lookup_miss += val + +#else + +#define RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(table, val) +#define RTE_TABLE_ARRAY_STATS_PKTS_LOOKUP_MISS(table, val) + +#endif + struct rte_table_array { + struct rte_table_stats stats; + /* Input parameters */ uint32_t entry_size; uint32_t n_entries; @@ -164,7 +180,8 @@ rte_table_array_lookup( void **entries) { struct rte_table_array *t = (struct rte_table_array *) table; - + __rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask); + RTE_TABLE_ARRAY_STATS_PKTS_IN_ADD(t, n_pkts_in); *lookup_hit_mask = pkts_mask; if ((pkts_mask & (pkts_mask + 1)) == 0) { @@ -196,10 +213,25 @@ rte_table_array_lookup( return 0; } +static int +rte_table_array_stats_read(void *table, struct rte_table_stats *stats, int clear) +{ + struct rte_table_array *array = (struct rte_table_array *) table; + + if (stats != NULL) + memcpy(stats, &array->stats, sizeof(array->stats)); + + if (clear) + memset(&array->stats, 0, sizeof(array->stats)); + + return 0; +} + struct rte_table_ops rte_table_array_ops = { .f_create = rte_table_array_create, .f_free = rte_table_array_free, .f_add = rte_table_array_entry_add, .f_delete = NULL, .f_lookup = rte_table_array_lookup, + .f_stats = rte_table_array_stats_read, }; -- 1.7.9.5