d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

table: rename cuckoo hash table ops

Browse Source 
The dosig particle is eliminated from the cuckoo hash ops name.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
This commit is contained in:
Cristian Dumitrescu 2017-10-18 16:03:42 +01:00
parent 326223fea3
commit 1880e755f7
6 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/librte_table/rte_table_hash.h
View File

@ -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
}

6
lib/librte_table/rte_table_hash_cuckoo.c
View File

@ -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,
};

4
lib/librte_table/rte_table_version.map
View File

@ -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;

2
test/test-pipeline/pipeline_hash.c
View File

@ -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,

8
test/test/test_table_combined.c
View File

@ -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);

42
test/test/test_table_tables.c
View File

@ -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;
}