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/vnet | |
| parent | f2b4a375d68b29130801c17f05ae66294d007d90 (diff) | |
svm: harmonize ssvm names
Type: refactor
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I26e4ad6bfd9e0be7745f6ba948bf51550fd4215e
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/session/segment_manager.c | 2 | ||||
| -rw-r--r-- | src/vnet/session/session.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/vnet/session/segment_manager.c b/src/vnet/session/segment_manager.c index 44ff5fefd70..d734d64172e 100644 --- a/src/vnet/session/segment_manager.c +++ b/src/vnet/session/segment_manager.c @@ -149,7 +149,7 @@ segment_manager_add_segment (segment_manager_t * sm, uword segment_size) /* clib_mem_vm_map_shared consumes first page before requested_va */ fs->ssvm.requested_va = baseva + page_size; - if ((rv = ssvm_master_init (&fs->ssvm, props->segment_type))) + if ((rv = ssvm_server_init (&fs->ssvm, props->segment_type))) { clib_warning ("svm_master_init ('%v', %u) failed", seg_name, segment_size); diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 5065f7834b1..3295ce7649d 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -1494,13 +1494,12 @@ session_vpp_event_queues_allocate (session_main_t * smm) eqs_size = smm->evt_qs_segment_size; eqs->ssvm_size = eqs_size; - eqs->i_am_master = 1; eqs->my_pid = vpp_pid; eqs->name = format (0, "%s%c", "session: evt-qs-segment", 0); /* clib_mem_vm_map_shared consumes first page before requested_va */ eqs->requested_va = smm->session_baseva + clib_mem_get_page_size (); - if (ssvm_master_init (eqs, SSVM_SEGMENT_MEMFD)) + if (ssvm_server_init (eqs, SSVM_SEGMENT_MEMFD)) { clib_warning ("failed to initialize queue segment"); return; |