X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=test%2Ftest%2Ftest_table_combined.c;h=73ad0155d677a69cc3086dab36855d54725a4525;hb=7c7b7562252742a6c298de64df486873336fd058;hp=4cfd955585b68943c3caa211236a0953a25e0550;hpb=fc972a130589bc43aeee7b09baf36e35873224ed;p=dpdk.git diff --git a/test/test/test_table_combined.c b/test/test/test_table_combined.c index 4cfd955585..73ad0155d6 100644 --- a/test/test/test_table_combined.c +++ b/test/test/test_table_combined.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 @@ -448,7 +419,7 @@ test_table_hash8lru(void) .key_mask = NULL, .n_keys = 1 << 16, .n_buckets = 1 << 16, - .f_hash = (rte_table_hash_op_hash)pipeline_test_hash, + .f_hash = pipeline_test_hash, .seed = 0, }; @@ -509,7 +480,7 @@ test_table_hash16lru(void) .key_mask = NULL, .n_keys = 1 << 16, .n_buckets = 1 << 16, - .f_hash = (rte_table_hash_op_hash)pipeline_test_hash, + .f_hash = pipeline_test_hash, .seed = 0, }; @@ -563,12 +534,15 @@ test_table_hash32lru(void) int status, i; /* Traffic flow */ - struct rte_table_hash_key32_lru_params key32lru_params = { - .n_entries = 1<<16, + struct rte_table_hash_params key32lru_params = { + .name = "TABLE", + .key_size = 32, + .key_offset = APP_METADATA_OFFSET(32), + .key_mask = NULL, + .n_keys = 1 << 16, + .n_buckets = 1 << 16, .f_hash = pipeline_test_hash, .seed = 0, - .signature_offset = APP_METADATA_OFFSET(0), - .key_offset = APP_METADATA_OFFSET(32), }; uint8_t key32lru[32]; @@ -597,14 +571,14 @@ test_table_hash32lru(void) VERIFY(status, CHECK_TABLE_OK); /* Invalid parameters */ - key32lru_params.n_entries = 0; + key32lru_params.n_keys = 0; status = test_table_type(&rte_table_hash_key32_lru_ops, (void *)&key32lru_params, (void *)key32lru, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); - key32lru_params.n_entries = 1<<16; + key32lru_params.n_keys = 1<<16; key32lru_params.f_hash = NULL; status = test_table_type(&rte_table_hash_key32_lru_ops, @@ -628,7 +602,7 @@ test_table_hash8ext(void) .key_mask = NULL, .n_keys = 1 << 16, .n_buckets = 1 << 16, - .f_hash = (rte_table_hash_op_hash)pipeline_test_hash, + .f_hash = pipeline_test_hash, .seed = 0, }; @@ -689,7 +663,7 @@ test_table_hash16ext(void) .key_mask = NULL, .n_keys = 1 << 16, .n_buckets = 1 << 16, - .f_hash = (rte_table_hash_op_hash)pipeline_test_hash, + .f_hash = pipeline_test_hash, .seed = 0, }; @@ -743,13 +717,15 @@ test_table_hash32ext(void) int status, i; /* Traffic flow */ - struct rte_table_hash_key32_ext_params key32ext_params = { - .n_entries = 1<<16, - .n_entries_ext = 1<<15, + struct rte_table_hash_params key32ext_params = { + .name = "TABLE", + .key_size = 32, + .key_offset = APP_METADATA_OFFSET(32), + .key_mask = NULL, + .n_keys = 1 << 16, + .n_buckets = 1 << 16, .f_hash = pipeline_test_hash, .seed = 0, - .signature_offset = APP_METADATA_OFFSET(0), - .key_offset = APP_METADATA_OFFSET(32), }; uint8_t key32ext[32]; @@ -778,14 +754,14 @@ test_table_hash32ext(void) VERIFY(status, CHECK_TABLE_OK); /* Invalid parameters */ - key32ext_params.n_entries = 0; + key32ext_params.n_keys = 0; status = test_table_type(&rte_table_hash_key32_ext_ops, (void *)&key32ext_params, (void *)key32ext, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); - key32ext_params.n_entries = 1<<16; + key32ext_params.n_keys = 1<<16; key32ext_params.f_hash = NULL; status = test_table_type(&rte_table_hash_key32_ext_ops, @@ -793,14 +769,6 @@ test_table_hash32ext(void) NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); - key32ext_params.f_hash = pipeline_test_hash; - key32ext_params.n_entries_ext = 0; - - status = test_table_type(&rte_table_hash_key32_ext_ops, - (void *)&key32ext_params, (void *)key32ext, &table_packets, - NULL, 0); - VERIFY(status, CHECK_TABLE_TABLE_CONFIG); - return 0; } @@ -811,13 +779,14 @@ test_table_hash_cuckoo_combined(void) /* Traffic flow */ struct rte_table_hash_cuckoo_params cuckoo_params = { + .name = "TABLE", .key_size = 32, - .n_keys = 1<<16, - .f_hash = pipeline_test_hash, - .seed = 0, - .signature_offset = APP_METADATA_OFFSET(0), .key_offset = APP_METADATA_OFFSET(32), - .name = "CUCKOO_HASH", + .key_mask = NULL, + .n_keys = 1 << 16, + .n_buckets = 1 << 16, + .f_hash = pipeline_test_hash_cuckoo, + .seed = 0, }; uint8_t key_cuckoo[32];