From patchwork Wed Oct 18 15:03:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 30556 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 629501B264; Wed, 18 Oct 2017 17:05:08 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id CC3441B1BC for ; Wed, 18 Oct 2017 17:04:26 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Oct 2017 08:04:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,397,1503385200"; d="scan'208";a="139673164" Received: from silpixa00382658.ir.intel.com ([10.237.223.29]) by orsmga004.jf.intel.com with ESMTP; 18 Oct 2017 08:04:24 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Cc: thomas@monjalon.net Date: Wed, 18 Oct 2017 16:03:42 +0100 Message-Id: <1508339034-171115-26-git-send-email-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508339034-171115-1-git-send-email-cristian.dumitrescu@intel.com> References: <1507634341-72277-2-git-send-email-cristian.dumitrescu@intel.com> <1508339034-171115-1-git-send-email-cristian.dumitrescu@intel.com> Subject: [dpdk-dev] [PATCH v3 06/18] librte_table: rename cuckoo hash table ops X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The dosig particle is eliminated from the cuckoo hash ops name. Signed-off-by: Cristian Dumitrescu --- lib/librte_table/rte_table_hash.h | 3 +-- lib/librte_table/rte_table_hash_cuckoo.c | 6 ++--- test/test-pipeline/pipeline_hash.c | 2 +- test/test/test_table_combined.c | 8 +++--- test/test/test_table_tables.c | 42 ++++++++++++++++---------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/lib/librte_table/rte_table_hash.h b/lib/librte_table/rte_table_hash.h index f983518..5f655ee 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 da1597f..beb45c5 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/test/test-pipeline/pipeline_hash.c b/test/test-pipeline/pipeline_hash.c index 991e381..2f8c625 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 a2d19a1..f65d34a 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 19aa5a4..efbd0c6 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; }