From: Cristian Dumitrescu Date: Wed, 18 Oct 2017 15:03:42 +0000 (+0100) Subject: table: rename cuckoo hash table ops X-Git-Tag: spdx-start~1259 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=1880e755f7522f27e44ff90642d65964e54797c8;p=dpdk.git table: rename cuckoo hash table ops The dosig particle is eliminated from the cuckoo hash ops name. Signed-off-by: Cristian Dumitrescu --- diff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h index f9835185c1..5f655ee24b 100644 --- a/lib/librte_table/rte_table_hash.h +++ b/lib/librte_table/rte_table_hash.h @@ -361,8 +361,7 @@ struct rte_table_hash_cuckoo_params { const char *name; }; -/** Cuckoo hash table operations */ -extern struct rte_table_ops rte_table_hash_cuckoo_dosig_ops; +extern struct rte_table_ops rte_table_hash_cuckoo_ops; #ifdef __cplusplus } diff --git a/lib/librte_table/rte_table_hash_cuckoo.c b/lib/librte_table/rte_table_hash_cuckoo.c index da1597fad9..beb45c5ed7 100644 --- a/lib/librte_table/rte_table_hash_cuckoo.c +++ b/lib/librte_table/rte_table_hash_cuckoo.c @@ -286,7 +286,7 @@ rte_table_hash_cuckoo_entry_delete(void *table, void *key, static int -rte_table_hash_cuckoo_lookup_dosig(void *table, +rte_table_hash_cuckoo_lookup(void *table, struct rte_mbuf **pkts, uint64_t pkts_mask, uint64_t *lookup_hit_mask, @@ -370,13 +370,13 @@ rte_table_hash_cuckoo_stats_read(void *table, struct rte_table_stats *stats, return 0; } -struct rte_table_ops rte_table_hash_cuckoo_dosig_ops = { +struct rte_table_ops rte_table_hash_cuckoo_ops = { .f_create = rte_table_hash_cuckoo_create, .f_free = rte_table_hash_cuckoo_free, .f_add = rte_table_hash_cuckoo_entry_add, .f_delete = rte_table_hash_cuckoo_entry_delete, .f_add_bulk = NULL, .f_delete_bulk = NULL, - .f_lookup = rte_table_hash_cuckoo_lookup_dosig, + .f_lookup = rte_table_hash_cuckoo_lookup, .f_stats = rte_table_hash_cuckoo_stats_read, }; diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map index e1eaa275fa..b19b12de79 100644 --- a/lib/librte_table/rte_table_version.map +++ b/lib/librte_table/rte_table_version.map @@ -30,9 +30,9 @@ DPDK_2.2 { }; -DPDK_16.07 { +DPDK_17.11 { global: - rte_table_hash_cuckoo_dosig_ops; + rte_table_hash_cuckoo_ops; } DPDK_2.0; diff --git a/test/test-pipeline/pipeline_hash.c b/test/test-pipeline/pipeline_hash.c index 991e381e21..2f8c6258a2 100644 --- a/test/test-pipeline/pipeline_hash.c +++ b/test/test-pipeline/pipeline_hash.c @@ -406,7 +406,7 @@ app_main_loop_worker_pipeline_hash(void) { }; struct rte_pipeline_table_params table_params = { - .ops = &rte_table_hash_cuckoo_dosig_ops, + .ops = &rte_table_hash_cuckoo_ops, .arg_create = &table_hash_params, .f_action_hit = NULL, .f_action_miss = NULL, diff --git a/test/test/test_table_combined.c b/test/test/test_table_combined.c index a2d19a1a23..f65d34abe8 100644 --- a/test/test/test_table_combined.c +++ b/test/test/test_table_combined.c @@ -847,7 +847,7 @@ test_table_hash_cuckoo_combined(void) table_packets.n_hit_packets = 50; table_packets.n_miss_packets = 50; - status = test_table_type(&rte_table_hash_cuckoo_dosig_ops, + status = test_table_type(&rte_table_hash_cuckoo_ops, (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_OK); @@ -855,7 +855,7 @@ test_table_hash_cuckoo_combined(void) /* Invalid parameters */ cuckoo_params.key_size = 0; - status = test_table_type(&rte_table_hash_cuckoo_dosig_ops, + status = test_table_type(&rte_table_hash_cuckoo_ops, (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -863,7 +863,7 @@ test_table_hash_cuckoo_combined(void) cuckoo_params.key_size = 32; cuckoo_params.n_keys = 0; - status = test_table_type(&rte_table_hash_cuckoo_dosig_ops, + status = test_table_type(&rte_table_hash_cuckoo_ops, (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); @@ -871,7 +871,7 @@ test_table_hash_cuckoo_combined(void) cuckoo_params.n_keys = 1<<16; cuckoo_params.f_hash = NULL; - status = test_table_type(&rte_table_hash_cuckoo_dosig_ops, + status = test_table_type(&rte_table_hash_cuckoo_ops, (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets, NULL, 0); VERIFY(status, CHECK_TABLE_TABLE_CONFIG); diff --git a/test/test/test_table_tables.c b/test/test/test_table_tables.c index 19aa5a4d47..efbd0c6a04 100644 --- a/test/test/test_table_tables.c +++ b/test/test/test_table_tables.c @@ -969,13 +969,13 @@ test_table_hash_cuckoo(void) .name = "CUCKOO", }; - table = rte_table_hash_cuckoo_dosig_ops.f_create(NULL, 0, entry_size); + table = rte_table_hash_cuckoo_ops.f_create(NULL, 0, entry_size); if (table != NULL) return -1; cuckoo_params.key_size = 0; - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, entry_size); if (table != NULL) return -2; @@ -983,7 +983,7 @@ test_table_hash_cuckoo(void) cuckoo_params.key_size = 32; cuckoo_params.n_keys = 0; - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, entry_size); if (table != NULL) return -3; @@ -991,7 +991,7 @@ test_table_hash_cuckoo(void) cuckoo_params.n_keys = 1 << 24; cuckoo_params.f_hash = NULL; - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, entry_size); if (table != NULL) return -4; @@ -999,24 +999,24 @@ test_table_hash_cuckoo(void) cuckoo_params.f_hash = pipeline_test_hash; cuckoo_params.name = NULL; - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, entry_size); if (table != NULL) return -5; cuckoo_params.name = "CUCKOO"; - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, entry_size); if (table == NULL) return -6; /* Free */ - status = rte_table_hash_cuckoo_dosig_ops.f_free(table); + status = rte_table_hash_cuckoo_ops.f_free(table); if (status < 0) return -7; - status = rte_table_hash_cuckoo_dosig_ops.f_free(NULL); + status = rte_table_hash_cuckoo_ops.f_free(NULL); if (status == 0) return -8; @@ -1027,60 +1027,60 @@ test_table_hash_cuckoo(void) memset(key_cuckoo, 0, 32); kcuckoo[0] = rte_be_to_cpu_32(0xadadadad); - table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0, 1); + table = rte_table_hash_cuckoo_ops.f_create(&cuckoo_params, 0, 1); if (table == NULL) return -9; entry = 'A'; - status = rte_table_hash_cuckoo_dosig_ops.f_add(NULL, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_add(NULL, &key_cuckoo, &entry, &key_found, &entry_ptr); if (status == 0) return -10; - status = rte_table_hash_cuckoo_dosig_ops.f_add(table, NULL, &entry, + status = rte_table_hash_cuckoo_ops.f_add(table, NULL, &entry, &key_found, &entry_ptr); if (status == 0) return -11; - status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_add(table, &key_cuckoo, NULL, &key_found, &entry_ptr); if (status == 0) return -12; - status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_add(table, &key_cuckoo, &entry, &key_found, &entry_ptr); if (status != 0) return -13; - status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_add(table, &key_cuckoo, &entry, &key_found, &entry_ptr); if (status != 0) return -14; /* Delete */ - status = rte_table_hash_cuckoo_dosig_ops.f_delete(NULL, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_delete(NULL, &key_cuckoo, &key_found, NULL); if (status == 0) return -15; - status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, NULL, + status = rte_table_hash_cuckoo_ops.f_delete(table, NULL, &key_found, NULL); if (status == 0) return -16; - status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_delete(table, &key_cuckoo, &key_found, NULL); if (status != 0) return -17; - status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_delete(table, &key_cuckoo, &key_found, NULL); if (status != -ENOENT) return -18; /* Traffic flow */ entry = 'A'; - status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo, + status = rte_table_hash_cuckoo_ops.f_add(table, &key_cuckoo, &entry, &key_found, &entry_ptr); if (status < 0) @@ -1093,7 +1093,7 @@ test_table_hash_cuckoo(void) } else PREPARE_PACKET(mbufs[i], 0xadadadab); - rte_table_hash_cuckoo_dosig_ops.f_lookup(table, mbufs, -1, + rte_table_hash_cuckoo_ops.f_lookup(table, mbufs, -1, &result_mask, (void **)entries); if (result_mask != expected_mask) return -20; @@ -1102,7 +1102,7 @@ test_table_hash_cuckoo(void) for (i = 0; i < RTE_PORT_IN_BURST_SIZE_MAX; i++) rte_pktmbuf_free(mbufs[i]); - status = rte_table_hash_cuckoo_dosig_ops.f_free(table); + status = rte_table_hash_cuckoo_ops.f_free(table); return 0; }