X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_table_tables.c;h=a7a69b857e4aee3231403a1c1ed5c35a3076049a;hb=85c73894b9277d85456e6601366366f152c9a7e4;hp=2f916b79d222c4e698739293eeade909b15bc3cf;hpb=fc972a130589bc43aeee7b09baf36e35873224ed;p=dpdk.git

diff --git a/test/test/test_table_tables.c b/test/test/test_table_tables.c
index 2f916b79d2..a7a69b857e 100644
--- a/test/test/test_table_tables.c
+++ b/test/test/test_table_tables.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
  */
 
 #include <string.h>
@@ -60,7 +31,7 @@ table_test table_tests[] = {
 	memset(key, 0, 32);						\
 	k32 = (uint32_t *) key;						\
 	k32[0] = (value);						\
-	*signature = pipeline_test_hash(key, 0, 0);			\
+	*signature = pipeline_test_hash(key, NULL, 0, 0);			\
 } while (0)
 
 unsigned n_table_tests = RTE_DIM(table_tests);
@@ -674,7 +645,7 @@ test_table_hash_lru_generic(struct rte_table_ops *ops, uint32_t key_size)
 		.key_mask = NULL,
 		.n_keys = 1 << 10,
 		.n_buckets = 1 << 10,
-		.f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+		.f_hash = pipeline_test_hash,
 		.seed = 0,
 	};
 
@@ -691,7 +662,7 @@ test_table_hash_lru_generic(struct rte_table_ops *ops, uint32_t key_size)
 	if (table != NULL)
 		return -4;
 
-	hash_params.f_hash = (rte_table_hash_op_hash)pipeline_test_hash;
+	hash_params.f_hash = pipeline_test_hash;
 
 	table = ops->f_create(&hash_params, 0, 1);
 	if (table == NULL)
@@ -777,7 +748,7 @@ test_table_hash_ext_generic(struct rte_table_ops *ops, uint32_t key_size)
 		.key_mask = NULL,
 		.n_keys = 1 << 10,
 		.n_buckets = 1 << 10,
-		.f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+		.f_hash = pipeline_test_hash,
 		.seed = 0,
 	};
 
@@ -801,7 +772,7 @@ test_table_hash_ext_generic(struct rte_table_ops *ops, uint32_t key_size)
 	if (table != NULL)
 		return -4;
 
-	hash_params.f_hash = (rte_table_hash_op_hash)pipeline_test_hash;
+	hash_params.f_hash = pipeline_test_hash;
 
 	table = ops->f_create(&hash_params, 0, 1);
 	if (table == NULL)
@@ -883,6 +854,13 @@ test_table_hash_lru(void)
 		16);
 	if (status < 0)
 		return status;
+
+	status = test_table_hash_lru_generic(
+		&rte_table_hash_key32_lru_ops,
+		32);
+	if (status < 0)
+		return status;
+
 	status = test_lru_update();
 	if (status < 0)
 		return status;
@@ -902,6 +880,11 @@ test_table_hash_ext(void)
 	status = test_table_hash_ext_generic(&rte_table_hash_key16_ext_ops, 16);
 	if (status < 0)
 		return status;
+
+	status = test_table_hash_ext_generic(&rte_table_hash_key32_ext_ops, 32);
+	if (status < 0)
+		return status;
+
 	return 0;
 }
 
@@ -920,14 +903,15 @@ test_table_hash_cuckoo(void)
 	uint32_t entry_size = 1;
 
 	/* Initialize params and create tables */
-	struct rte_table_hash_cuckoo_params cuckoo_params = {
+	struct rte_table_hash_params cuckoo_params = {
+		.name = "TABLE",
 		.key_size = 32,
-		.n_keys = 1 << 24,
-		.f_hash = pipeline_test_hash,
-		.seed = 0,
-		.signature_offset = APP_METADATA_OFFSET(0),
 		.key_offset = APP_METADATA_OFFSET(32),
-		.name = "CUCKOO",
+		.key_mask = NULL,
+		.n_keys = 1 << 16,
+		.n_buckets = 1 << 16,
+		.f_hash = (rte_table_hash_op_hash)pipeline_test_hash,
+		.seed = 0, 
 	};
 
 	table = rte_table_hash_cuckoo_ops.f_create(NULL, 0, entry_size);