Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
svm: harmonize ssvm names
[vpp.git]
/
src
/
svm
/
ssvm.h
diff --git
a/src/svm/ssvm.h
b/src/svm/ssvm.h
index
3a277cb
..
60ff3e4
100644
(file)
--- a/
src/svm/ssvm.h
+++ b/
src/svm/ssvm.h
@@
-67,12
+67,12
@@
typedef struct
uword ssvm_va;
/* The actual mmap size */
uword ssvm_size;
uword ssvm_va;
/* The actual mmap size */
uword ssvm_size;
- u32
mast
er_pid;
- u32
slave
_pid;
+ u32
serv
er_pid;
+ u32
client
_pid;
u8 *name;
void *opaque[SSVM_N_OPAQUE];
u8 *name;
void *opaque[SSVM_N_OPAQUE];
- /* Set when
the master application thinks it's time to make the donuts
*/
+ /* Set when
server init done
*/
volatile u32 ready;
ssvm_segment_type_t type;
volatile u32 ready;
ssvm_segment_type_t type;
@@
-86,7
+86,7
@@
typedef struct
u32 my_pid;
u8 *name;
u8 numa; /**< UNUSED: numa requested at alloc time */
u32 my_pid;
u8 *name;
u8 numa; /**< UNUSED: numa requested at alloc time */
- int i
_am_mast
er;
+ int i
s_serv
er;
union
{
union
{
@@
-167,11
+167,11
@@
ssvm_mem_alloc (ssvm_private_t * ssvm, uword size)
#define foreach_ssvm_api_error \
_(NO_NAME, "No shared segment name", -100) \
#define foreach_ssvm_api_error \
_(NO_NAME, "No shared segment name", -100) \
-_(NO_SIZE, "Size not set (
mast
er)", -101) \
+_(NO_SIZE, "Size not set (
serv
er)", -101) \
_(CREATE_FAILURE, "Create failed", -102) \
_(SET_SIZE, "Set size failed", -103) \
_(MMAP, "mmap failed", -104) \
_(CREATE_FAILURE, "Create failed", -102) \
_(SET_SIZE, "Set size failed", -103) \
_(MMAP, "mmap failed", -104) \
-_(
SLAVE_TIMEOUT, "Slave
map timeout", -105)
+_(
CLIENT_TIMEOUT, "Client
map timeout", -105)
typedef enum
{
typedef enum
{
@@
-182,20
+182,20
@@
typedef enum
#define SSVM_API_ERROR_NO_NAME (-10)
#define SSVM_API_ERROR_NO_NAME (-10)
-int ssvm_
mast
er_init (ssvm_private_t * ssvm, ssvm_segment_type_t type);
-int ssvm_
slave
_init (ssvm_private_t * ssvm, ssvm_segment_type_t type);
+int ssvm_
serv
er_init (ssvm_private_t * ssvm, ssvm_segment_type_t type);
+int ssvm_
client
_init (ssvm_private_t * ssvm, ssvm_segment_type_t type);
void ssvm_delete (ssvm_private_t * ssvm);
void ssvm_delete (ssvm_private_t * ssvm);
-int ssvm_
mast
er_init_shm (ssvm_private_t * ssvm);
-int ssvm_
slave
_init_shm (ssvm_private_t * ssvm);
+int ssvm_
serv
er_init_shm (ssvm_private_t * ssvm);
+int ssvm_
client
_init_shm (ssvm_private_t * ssvm);
void ssvm_delete_shm (ssvm_private_t * ssvm);
void ssvm_delete_shm (ssvm_private_t * ssvm);
-int ssvm_
mast
er_init_memfd (ssvm_private_t * memfd);
-int ssvm_
slave
_init_memfd (ssvm_private_t * memfd);
+int ssvm_
serv
er_init_memfd (ssvm_private_t * memfd);
+int ssvm_
client
_init_memfd (ssvm_private_t * memfd);
void ssvm_delete_memfd (ssvm_private_t * memfd);
void ssvm_delete_memfd (ssvm_private_t * memfd);
-int ssvm_
mast
er_init_private (ssvm_private_t * ssvm);
-int ssvm_
slave
_init_private (ssvm_private_t * ssvm);
+int ssvm_
serv
er_init_private (ssvm_private_t * ssvm);
+int ssvm_
client
_init_private (ssvm_private_t * ssvm);
void ssvm_delete_private (ssvm_private_t * ssvm);
ssvm_segment_type_t ssvm_type (const ssvm_private_t * ssvm);
void ssvm_delete_private (ssvm_private_t * ssvm);
ssvm_segment_type_t ssvm_type (const ssvm_private_t * ssvm);