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/vlibmemory | |
parent | f2b4a375d68b29130801c17f05ae66294d007d90 (diff) |
svm: harmonize ssvm names
Type: refactor
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I26e4ad6bfd9e0be7745f6ba948bf51550fd4215e
Diffstat (limited to 'src/vlibmemory')
-rw-r--r-- | src/vlibmemory/socket_api.c | 4 | ||||
-rw-r--r-- | src/vlibmemory/socket_client.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vlibmemory/socket_api.c b/src/vlibmemory/socket_api.c index a3a0c3b2eb9..51c52b43e7a 100644 --- a/src/vlibmemory/socket_api.c +++ b/src/vlibmemory/socket_api.c @@ -639,10 +639,10 @@ vl_api_sock_init_shm_t_handler (vl_api_sock_init_shm_t * mp) clib_memset (memfd, 0, sizeof (*memfd)); memfd->ssvm_size = mp->requested_size; memfd->requested_va = 0ULL; - memfd->i_am_master = 1; + memfd->is_server = 1; memfd->name = format (0, "%s%c", regp->name, 0); - if ((rv = ssvm_master_init_memfd (memfd))) + if ((rv = ssvm_server_init_memfd (memfd))) goto reply; /* Remember to close this fd when the socket connection goes away */ diff --git a/src/vlibmemory/socket_client.c b/src/vlibmemory/socket_client.c index b7d4f2d6e54..8d9d7cefc0d 100644 --- a/src/vlibmemory/socket_client.c +++ b/src/vlibmemory/socket_client.c @@ -379,7 +379,7 @@ static void vl_api_sock_init_shm_reply_t_handler memfd->fd = my_fd; /* Note: this closes memfd.fd */ - retval = ssvm_slave_init_memfd (memfd); + retval = ssvm_client_init_memfd (memfd); if (retval) clib_warning ("WARNING: segment map returned %d", retval); |