ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vppinfra: harmonize function names

Browse Source 
Type: fix

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Icce7eab4510785e15bdcf97e4d1881b0f46f6899
This commit is contained in:
Dave Barach
2020-08-06 11:38:40 -04:00
committed by Florin Coras
parent 11fb09e38f
commit d4a639bbd2
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vppinfra/bihash_template.c
View File

@ -184,7 +184,7 @@ void BV (clib_bihash_init)
#define MFD_ALLOW_SEALING 0x0002U #define MFD_ALLOW_SEALING 0x0002U
#endif #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) (BVT (clib_bihash) * h, char *name, u32 nbuckets, u64 memory_size)
{ {
uword bucket_size; uword bucket_size;
@ -253,7 +253,7 @@ void BV (clib_bihash_master_init_svm)
h->instantiated = 1; 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) (BVT (clib_bihash) * h, char *name, int fd)
{ {
u8 *mmap_addr; u8 *mmap_addr;

4
src/vppinfra/bihash_template.h
View File

@ -318,9 +318,9 @@ void BV (clib_bihash_init)
void BV (clib_bihash_init2) (BVT (clib_bihash_init2_args) * a); void BV (clib_bihash_init2) (BVT (clib_bihash_init2_args) * a);
#if BIHASH_32_64_SVM #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); (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); (BVT (clib_bihash) * h, char *name, int fd);
#endif #endif

24
src/vppinfra/test_bihash_template.c
View File

@ -73,9 +73,9 @@ test_bihash_vec64 (test_main_t * tm)
h = &tm->hash; h = &tm->hash;
#if BIHASH_32_64_SVM #if BIHASH_32_64_SVM
BV (clib_bihash_master_init_svm) (h, "test", user_buckets, BV (clib_bihash_initiator_init_svm) (h, "test", user_buckets,
0x30000000 /* base_addr */ , 0x30000000 /* base_addr */ ,
user_memory_size); user_memory_size);
#else #else
BV (clib_bihash_init) (h, "test", user_buckets, user_memory_size); BV (clib_bihash_init) (h, "test", user_buckets, user_memory_size);
#endif #endif
@ -123,9 +123,9 @@ test_bihash_stale_overwrite (test_main_t * tm)
h = &tm->hash; h = &tm->hash;
#if BIHASH_32_64_SVM #if BIHASH_32_64_SVM
BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets,
0x30000000 /* base_addr */ , 0x30000000 /* base_addr */ ,
tm->hash_memory_size); tm->hash_memory_size);
#else #else
BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
#endif #endif
@ -208,9 +208,9 @@ test_bihash_threads (test_main_t * tm)
h = &tm->hash; h = &tm->hash;
#if BIHASH_32_64_SVM #if BIHASH_32_64_SVM
BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets,
0x30000000 /* base_addr */ , 0x30000000 /* base_addr */ ,
tm->hash_memory_size); tm->hash_memory_size);
#else #else
BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
#endif #endif
@ -262,9 +262,9 @@ test_bihash (test_main_t * tm)
h = &tm->hash; h = &tm->hash;
#if BIHASH_32_64_SVM #if BIHASH_32_64_SVM
BV (clib_bihash_master_init_svm) (h, "test", tm->nbuckets, BV (clib_bihash_initiator_init_svm) (h, "test", tm->nbuckets,
0x30000000 /* base_addr */ , 0x30000000 /* base_addr */ ,
tm->hash_memory_size); tm->hash_memory_size);
#else #else
BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size); BV (clib_bihash_init) (h, "test", tm->nbuckets, tm->hash_memory_size);
#endif #endif