[dpdk-dev] [PATCH] table: fix hash_ext stats update

2017-03-10 Thread Aleksey Katargin
Fixed stats double update.

Signed-off-by: Aleksey Katargin 
---
 lib/librte_table/rte_table_hash_ext.c | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/librte_table/rte_table_hash_ext.c 
b/lib/librte_table/rte_table_hash_ext.c
index e283a3d..353f930 100644
--- a/lib/librte_table/rte_table_hash_ext.c
+++ b/lib/librte_table/rte_table_hash_ext.c
@@ -444,7 +444,6 @@ static int rte_table_hash_ext_lookup_unoptimized(
uint64_t pkts_mask_out = 0;
 
__rte_unused uint32_t n_pkts_in = __builtin_popcountll(pkts_mask);
-   RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
 
for ( ; pkts_mask; ) {
struct bucket *bkt0, *bkt;
@@ -490,7 +489,6 @@ static int rte_table_hash_ext_lookup_unoptimized(
}
 
*lookup_hit_mask = pkts_mask_out;
-   RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - 
__builtin_popcountll(pkts_mask_out));
return 0;
 }
 
@@ -874,9 +872,12 @@ static int rte_table_hash_ext_lookup(
RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
 
/* Cannot run the pipeline with less than 7 packets */
-   if (__builtin_popcountll(pkts_mask) < 7)
-   return rte_table_hash_ext_lookup_unoptimized(table, pkts,
+   if (__builtin_popcountll(pkts_mask) < 7) {
+   status = rte_table_hash_ext_lookup_unoptimized(table, pkts,
pkts_mask, lookup_hit_mask, entries, 0);
+   RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - 
__builtin_popcountll(*lookup_hit_mask));
+   return status;
+   }
 
/* Pipeline stage 0 */
lookup2_stage0(t, g, pkts, pkts_mask, pkt00_index, pkt01_index);
@@ -1007,9 +1008,12 @@ static int rte_table_hash_ext_lookup_dosig(
RTE_TABLE_HASH_EXT_STATS_PKTS_IN_ADD(t, n_pkts_in);
 
/* Cannot run the pipeline with less than 7 packets */
-   if (__builtin_popcountll(pkts_mask) < 7)
-   return rte_table_hash_ext_lookup_unoptimized(table, pkts,
+   if (__builtin_popcountll(pkts_mask) < 7) {
+   status = rte_table_hash_ext_lookup_unoptimized(table, pkts,
pkts_mask, lookup_hit_mask, entries, 1);
+   RTE_TABLE_HASH_EXT_STATS_PKTS_LOOKUP_MISS(t, n_pkts_in - 
__builtin_popcountll(*lookup_hit_mask));
+   return status;
+   }
 
/* Pipeline stage 0 */
lookup2_stage0(t, g, pkts, pkts_mask, pkt00_index, pkt01_index);
-- 
2.1.4



[dpdk-dev] [PATCH] table: add missing exports

2016-08-01 Thread Aleksey Katargin
Signed-off-by: Aleksey Katargin 
---
 lib/librte_table/rte_table_version.map | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_table/rte_table_version.map 
b/lib/librte_table/rte_table_version.map
index 2138698..459c2da 100644
--- a/lib/librte_table/rte_table_version.map
+++ b/lib/librte_table/rte_table_version.map
@@ -3,6 +3,7 @@ DPDK_2.0 {

rte_table_acl_ops;
rte_table_array_ops;
+   rte_table_hash_ext_dosig_ops;
rte_table_hash_ext_ops;
rte_table_hash_key8_ext_dosig_ops;
rte_table_hash_key8_ext_ops;
@@ -12,6 +13,7 @@ DPDK_2.0 {
rte_table_hash_key16_lru_ops;
rte_table_hash_key32_ext_ops;
rte_table_hash_key32_lru_ops;
+   rte_table_hash_lru_dosig_ops;
rte_table_hash_lru_ops;
rte_table_lpm_ipv6_ops;
rte_table_lpm_ops;
@@ -24,5 +26,6 @@ DPDK_2.2 {
global:

rte_table_hash_key16_ext_dosig_ops;
+   rte_table_hash_key16_lru_dosig_ops;

 } DPDK_2.0;
-- 
2.1.4