diff options
| author |   Dave Barach <dave@barachs.net> | 2020-08-06 11:38:40 -0400 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2020-08-16 10:42:19 +0000 |
| commit | aa6207f44b235397db5afbed512737eaf8bb13e3 (patch) | |
| tree | 28432d4c35e27d7131cd018a7c4a7a626d0f40ed /src | |
| parent | 88d730c09e14c16e93006b68ee08ddf39fe132d9 (diff) | |
vppinfra: harmonize function names
Type: fix
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Icce7eab4510785e15bdcf97e4d1881b0f46f6899
(cherry picked from commit d4a639bbd2257a88fa3f06939a23c13af1d56dd3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/vppinfra/bihash_template.c | 4 | ||||
| -rw-r--r-- | src/vppinfra/bihash_template.h | 4 | ||||
| -rw-r--r-- | src/vppinfra/test_bihash_template.c | 24 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/vppinfra/bihash_template.c b/src/vppinfra/bihash_template.c index de59abe63af..268da6b7e89 100644 --- a/src/vppinfra/bihash_template.c +++ b/src/vppinfra/bihash_template.c @@ -118,7 +118,7 @@ void BV (clib_bihash_init) #define MFD_ALLOW_SEALING 0x0002U #endif -void BV (clib_bihash_master_init_svm) +void BV (clib_bihash_initiator_init_svm) (BVT (clib_bihash) * h, char *name, u32 nbuckets, u64 memory_size) { uword bucket_size; @@ -188,7 +188,7 @@ void BV (clib_bihash_master_init_svm) h->instantiated = 1; } -void BV (clib_bihash_slave_init_svm) +void BV (clib_bihash_responder_init_svm) (BVT (clib_bihash) * h, char *name, int fd) { u8 *mmap_addr; diff --git a/src/vppinfra/bihash_template.h b/src/vppinfra/bihash_template.h index ebd70c03371..43930b849eb 100644 --- a/src/vppinfra/bihash_template.h +++ b/src/vppinfra/bihash_template.h @@ -305,9 +305,9 @@ void BV (clib_bihash_init) void BV (clib_bihash_init2) (BVT (clib_bihash_init2_args) * a); #if BIHASH_32_64_SVM -void BV (clib_bihash_master_init_svm) +void BV (clib_bihash_initiator_init_svm) (BVT (clib_bihash) * h, char *name, u32 nbuckets, u64 memory_size); -void BV (clib_bihash_slave_init_svm) +void BV (clib_bihash_responder_init_svm) (BVT (clib_bihash) * h, char *name, int fd); #endif diff --git a/src/vppinfra/test_bihash_template.c b/src/vppinfra/test_bihash_template.c index c1a44691966..f8ad631e99c 100644 --- a/src/vppinfra/test_bihash_template.c +++ b/src/vppinfra/test_bihash_template.c @@ -73,9 +73,9 @@ test_bihash_vec64 (test_main_t * tm) h = &tm->hash; #if BIHASH_32_64_SVM - BV (clib_bihash_master_init_svm) (h, "test", user_buckets, - 0x30000000 /* base_addr */ , - user_memory_size); + BV (clib_bihash_initiator_init_svm) (h, "test", user_buckets, + 0x30000000 /* base_addr */ , + user_memory_size); #else BV (clib_bihash_init) (h, "test", user_buckets, user_memory_size); #endif @@ -123,9 +123,9 @@ test_bihash_stale_overwrite (test_main_t * tm) h = &tm->hash; #if BIHASH_32_64_SVM - BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, - 0x30000000 /* base_addr */ , - tm->hash_memory_size); + BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets, + 0x30000000 /* base_addr */ , + tm->hash_memory_size); #else BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); #endif @@ -208,9 +208,9 @@ test_bihash_threads (test_main_t * tm) h = &tm->hash; #if BIHASH_32_64_SVM - BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, - 0x30000000 /* base_addr */ , - tm->hash_memory_size); + BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets, + 0x30000000 /* base_addr */ , + tm->hash_memory_size); #else BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); #endif @@ -262,9 +262,9 @@ test_bihash (test_main_t * tm) h = &tm->hash; #if BIHASH_32_64_SVM - BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, - 0x30000000 /* base_addr */ , - tm->hash_memory_size); + BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets, + 0x30000000 /* base_addr */ , + tm->hash_memory_size); #else BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); #endif |