diff options
| author |   Florin Coras <fcoras@cisco.com> | 2020-09-29 18:11:24 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2020-09-30 21:52:42 +0000 |
| commit | 5220a26af059d7578abcbad2aea158b32cdb22b9 (patch) | |
| tree | b496eedcb27f502ad327f8c4ba14727066233a17 /src/svm/ssvm.h | |
| parent | f2b4a375d68b29130801c17f05ae66294d007d90 (diff) | |
svm: harmonize ssvm names
Type: refactor
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I26e4ad6bfd9e0be7745f6ba948bf51550fd4215e
Diffstat (limited to 'src/svm/ssvm.h')
| -rw-r--r-- | src/svm/ssvm.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/svm/ssvm.h b/src/svm/ssvm.h index 3a277cb5c5f..60ff3e4a2d0 100644 --- 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; - u32 master_pid; - u32 slave_pid; + u32 server_pid; + u32 client_pid; 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; @@ -86,7 +86,7 @@ typedef struct u32 my_pid; u8 *name; u8 numa; /**< UNUSED: numa requested at alloc time */ - int i_am_master; + int is_server; 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) \ -_(NO_SIZE, "Size not set (master)", -101) \ +_(NO_SIZE, "Size not set (server)", -101) \ _(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 { @@ -182,20 +182,20 @@ typedef enum #define SSVM_API_ERROR_NO_NAME (-10) -int ssvm_master_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_server_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); -int ssvm_master_init_shm (ssvm_private_t * ssvm); -int ssvm_slave_init_shm (ssvm_private_t * ssvm); +int ssvm_server_init_shm (ssvm_private_t * ssvm); +int ssvm_client_init_shm (ssvm_private_t * ssvm); void ssvm_delete_shm (ssvm_private_t * ssvm); -int ssvm_master_init_memfd (ssvm_private_t * memfd); -int ssvm_slave_init_memfd (ssvm_private_t * memfd); +int ssvm_server_init_memfd (ssvm_private_t * memfd); +int ssvm_client_init_memfd (ssvm_private_t * memfd); void ssvm_delete_memfd (ssvm_private_t * memfd); -int ssvm_master_init_private (ssvm_private_t * ssvm); -int ssvm_slave_init_private (ssvm_private_t * ssvm); +int ssvm_server_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); |