typedef struct segment_manager_main_
{
segment_manager_t *segment_managers; /**< Pool of segment managers */
- clib_valloc_main_t va_allocator; /**< Virtual address allocator */
u32 seg_name_counter; /**< Counter for segment names */
/*
int
segment_manager_add_segment (segment_manager_t * sm, uword segment_size)
{
- uword baseva = (uword) ~ 0ULL, alloc_size, page_size;
- u32 rnd_margin = 128 << 10, fs_index = ~0;
segment_manager_main_t *smm = &sm_main;
segment_manager_props_t *props;
fifo_segment_t *fs;
+ u32 fs_index = ~0;
u8 *seg_name;
int rv;
* Allocate ssvm segment
*/
segment_size = segment_size ? segment_size : props->add_segment_size;
- page_size = clib_mem_get_page_size ();
- /* Protect against segment size u32 wrap */
- segment_size = clib_max (segment_size + page_size - 1, segment_size);
- segment_size = segment_size & ~(page_size - 1);
+ segment_size = round_pow2 (segment_size, clib_mem_get_page_size ());
if (props->segment_type != SSVM_SEGMENT_PRIVATE)
{
seg_name = format (0, "%d-%d%c", getpid (), smm->seg_name_counter++, 0);
- alloc_size = (uword) segment_size + rnd_margin;
- baseva = clib_valloc_alloc (&smm->va_allocator, alloc_size, 0);
- if (!baseva)
- {
- clib_warning ("out of space for segments");
- pool_put (sm->segments, fs);
- goto done;
- }
}
else
{
fs->ssvm.ssvm_size = segment_size;
fs->ssvm.name = seg_name;
- /* clib_mem_vm_map_shared consumes first page before requested_va */
- fs->ssvm.requested_va = baseva + page_size;
+ fs->ssvm.requested_va = 0;
if ((rv = ssvm_server_init (&fs->ssvm, props->segment_type)))
{
clib_warning ("svm_master_init ('%v', %u) failed", seg_name,
segment_size);
-
- if (props->segment_type != SSVM_SEGMENT_PRIVATE)
- clib_valloc_free (&smm->va_allocator, baseva);
pool_put (sm->segments, fs);
goto done;
}
void
segment_manager_del_segment (segment_manager_t * sm, fifo_segment_t * fs)
{
- segment_manager_main_t *smm = &sm_main;
-
if (ssvm_type (&fs->ssvm) != SSVM_SEGMENT_PRIVATE)
{
- /* clib_mem_vm_map_shared consumes first page before requested_va */
- clib_valloc_free (&smm->va_allocator,
- fs->ssvm.requested_va - clib_mem_get_page_size ());
-
if (!segment_manager_app_detached (sm))
{
app_worker_t *app_wrk;
}
}
+ fifo_segment_cleanup (fs);
ssvm_delete (&fs->ssvm);
if (CLIB_DEBUG)
}
/* *INDENT-ON* */
+ pool_free (sm->segments);
clib_rwlock_writer_unlock (&sm->segments_rwlock);
clib_rwlock_free (&sm->segments_rwlock);
*/
while (f)
{
- session = session_get_if_valid (f->master_session_index,
- f->master_thread_index);
- if (session)
- vec_add1 (handles, session_handle (session));
- f = f->next;
- }
+ session = session_get_if_valid (f->shr->master_session_index,
+ f->master_thread_index);
+ if (session)
+ vec_add1 (handles, session_handle (session));
+ f = f->next;
+ }
}
/* Instead of removing the segment, test when cleaning up disconnected
/* Avoid propagating notifications back to the app */
session->app_wrk_index = APP_INVALID_INDEX;
}
+ vec_free (handles);
}
int
}
void
-segment_manager_detach_fifo (segment_manager_t * sm, svm_fifo_t * f)
+segment_manager_detach_fifo (segment_manager_t *sm, svm_fifo_t **f)
{
fifo_segment_t *fs;
- fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+ fs = segment_manager_get_segment_w_lock (sm, (*f)->segment_index);
fifo_segment_detach_fifo (fs, f);
segment_manager_segment_reader_unlock (sm);
}
void
-segment_manager_attach_fifo (segment_manager_t * sm, svm_fifo_t * f,
- session_t * s)
+segment_manager_attach_fifo (segment_manager_t *sm, svm_fifo_t **f,
+ session_t *s)
{
fifo_segment_t *fs;
- fs = segment_manager_get_segment_w_lock (sm, f->segment_index);
+ fs = segment_manager_get_segment_w_lock (sm, (*f)->segment_index);
fifo_segment_attach_fifo (fs, f, s->thread_index);
segment_manager_segment_reader_unlock (sm);
- f->master_session_index = s->session_index;
- f->master_thread_index = s->thread_index;
+ (*f)->shr->master_session_index = s->session_index;
+ (*f)->master_thread_index = s->thread_index;
}
u32
u32 fifo_evt_size, session_evt_size = 256, notif_q_size;
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
svm_msg_q_t *q;
- void *oldheap;
fifo_evt_size = sizeof (session_event_t);
notif_q_size = clib_max (16, props->evt_q_size >> 4);
cfg->q_nitems = props->evt_q_size;
cfg->ring_cfgs = rc;
- oldheap = ssvm_push_heap (segment->ssvm.sh);
- q = svm_msg_q_alloc (cfg);
- fifo_segment_update_free_bytes (segment);
- ssvm_pop_heap (oldheap);
+ q = fifo_segment_msg_q_alloc (segment, 0, cfg);
if (props->use_mq_eventfd)
{
- if (svm_msg_q_alloc_producer_eventfd (q))
+ if (svm_msg_q_alloc_eventfd (q))
clib_warning ("failed to alloc eventfd");
}
return q;
* Init segment vm address allocator
*/
void
-segment_manager_main_init (segment_manager_main_init_args_t * a)
+segment_manager_main_init (void)
{
segment_manager_main_t *sm = &sm_main;
- clib_valloc_chunk_t _ip, *ip = &_ip;
-
- ip->baseva = a->baseva;
- ip->size = a->size;
-
- clib_valloc_init (&sm->va_allocator, ip, 1 /* lock */ );
sm->default_fifo_size = 1 << 12;
sm->default_segment_size = 1 << 20;
u32 session_index, thread_index;
session_t *session;
- session_index = f->master_session_index;
- thread_index = f->master_thread_index;
+ session_index = f->shr->master_session_index;
+ thread_index = f->master_thread_index;
- session = session_get (session_index, thread_index);
- str = format (0, "%U", format_session, session, verbose);
+ session = session_get (session_index, thread_index);
+ str = format (0, "%U", format_session, session, verbose);
- if (verbose)
- s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
- app_wrk->api_client_index, app_wrk->connects_seg_manager);
- else
- s = format (s, "%-40v%-20v", str, app_name);
+ if (verbose)
+ s = format (s, "%-40v%-20v%-15u%-10u", str, app_name,
+ app_wrk->api_client_index,
+ app_wrk->connects_seg_manager);
+ else
+ s = format (s, "%-40v%-20v", str, app_name);
- vlib_cli_output (vm, "%v", s);
- vec_reset_length (s);
- vec_free (str);
+ vlib_cli_output (vm, "%v", s);
+ vec_reset_length (s);
+ vec_free (str);
- f = f->next;
- }
- vec_free (s);
+ f = f->next;
+ }
+ vec_free (s);
}
}
/* *INDENT-ON* */