Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: support multiple worker binds
[vpp.git]
/
src
/
vnet
/
session
/
segment_manager.c
diff --git
a/src/vnet/session/segment_manager.c
b/src/vnet/session/segment_manager.c
index
c7d2482
..
83d1963
100644
(file)
--- a/
src/vnet/session/segment_manager.c
+++ b/
src/vnet/session/segment_manager.c
@@
-34,7
+34,8
@@
static u32 default_app_evt_queue_size = 128;
segment_manager_properties_t *
segment_manager_properties_get (segment_manager_t * sm)
{
segment_manager_properties_t *
segment_manager_properties_get (segment_manager_t * sm)
{
- return application_get_segment_manager_properties (sm->app_index);
+ app_worker_t *app_wrk = app_worker_get (sm->app_wrk_index);
+ return application_get_segment_manager_properties (app_wrk->app_index);
}
segment_manager_properties_t *
}
segment_manager_properties_t *
@@
-50,13
+51,13
@@
segment_manager_properties_init (segment_manager_properties_t * props)
static u8
segment_manager_app_detached (segment_manager_t * sm)
{
static u8
segment_manager_app_detached (segment_manager_t * sm)
{
- return (sm->app_index == SEGMENT_MANAGER_INVALID_APP_INDEX);
+ return (sm->app_
wrk_
index == SEGMENT_MANAGER_INVALID_APP_INDEX);
}
void
segment_manager_app_detach (segment_manager_t * sm)
{
}
void
segment_manager_app_detach (segment_manager_t * sm)
{
- sm->app_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
+ sm->app_
wrk_
index = SEGMENT_MANAGER_INVALID_APP_INDEX;
}
always_inline u32
}
always_inline u32
@@
-88,7
+89,7
@@
segment_manager_del_segment (segment_manager_t * sm,
/**
* Removes segment after acquiring writer lock
*/
/**
* Removes segment after acquiring writer lock
*/
-
always_
inline void
+
static
inline void
segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
{
svm_fifo_segment_private_t *fs;
segment_manager_lock_and_del_segment (segment_manager_t * sm, u32 fs_index)
{
svm_fifo_segment_private_t *fs;
@@
-290,8
+291,7
@@
segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
segment = segment_manager_get_segment (sm, seg_index);
if (i == 0)
segment = segment_manager_get_segment (sm, seg_index);
if (i == 0)
- sm->event_queue = segment_manager_alloc_queue (segment,
- props->evt_q_size);
+ sm->event_queue = segment_manager_alloc_queue (segment, props);
svm_fifo_segment_preallocate_fifo_pairs (segment,
props->rx_fifo_size,
svm_fifo_segment_preallocate_fifo_pairs (segment,
props->rx_fifo_size,
@@
-311,8
+311,7
@@
segment_manager_init (segment_manager_t * sm, u32 first_seg_size,
return seg_index;
}
segment = segment_manager_get_segment (sm, seg_index);
return seg_index;
}
segment = segment_manager_get_segment (sm, seg_index);
- sm->event_queue = segment_manager_alloc_queue (segment,
- props->evt_q_size);
+ sm->event_queue = segment_manager_alloc_queue (segment, props);
}
return 0;
}
return 0;
@@
-371,7
+370,7
@@
segment_manager_del_sessions (segment_manager_t * sm)
if (fifo->master_thread_index == 255)
{
svm_fifo_t *next = fifo->next;
if (fifo->master_thread_index == 255)
{
svm_fifo_t *next = fifo->next;
- application_local_session_disconnect_w_index (sm->app_index,
+ application_local_session_disconnect_w_index (sm->app_
wrk_
index,
fifo->master_session_index);
fifo = next;
continue;
fifo->master_session_index);
fifo = next;
continue;
@@
-520,8
+519,8
@@
alloc_check:
*fifo_segment_index = segment_manager_segment_index (sm, fifo_segment);
if (added_a_segment)
*fifo_segment_index = segment_manager_segment_index (sm, fifo_segment);
if (added_a_segment)
- rv = app
lication_add_segment_notify (sm->app
_index,
-
&fifo_segment->ssvm);
+ rv = app
_worker_add_segment_notify (sm->app_wrk
_index,
+ &fifo_segment->ssvm);
/* Drop the lock after app is notified */
segment_manager_segment_reader_unlock (sm);
return rv;
/* Drop the lock after app is notified */
segment_manager_segment_reader_unlock (sm);
return rv;
@@
-623,7
+622,7
@@
segment_manager_evt_q_expected_size (u32 q_len)
*/
svm_msg_q_t *
segment_manager_alloc_queue (svm_fifo_segment_private_t * segment,
*/
svm_msg_q_t *
segment_manager_alloc_queue (svm_fifo_segment_private_t * segment,
-
u32 queue_size
)
+
segment_manager_properties_t * props
)
{
u32 fifo_evt_size, session_evt_size = 256, notif_q_size;
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
{
u32 fifo_evt_size, session_evt_size = 256, notif_q_size;
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
@@
-631,21
+630,27
@@
segment_manager_alloc_queue (svm_fifo_segment_private_t * segment,
void *oldheap;
fifo_evt_size = sizeof (session_event_t);
void *oldheap;
fifo_evt_size = sizeof (session_event_t);
- notif_q_size = clib_max (16,
queue
_size >> 4);
+ notif_q_size = clib_max (16,
props->evt_q
_size >> 4);
/* *INDENT-OFF* */
svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = {
/* *INDENT-OFF* */
svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = {
- {
queue
_size, fifo_evt_size, 0},
+ {
props->evt_q
_size, fifo_evt_size, 0},
{notif_q_size, session_evt_size, 0}
};
/* *INDENT-ON* */
cfg->consumer_pid = 0;
cfg->n_rings = 2;
{notif_q_size, session_evt_size, 0}
};
/* *INDENT-ON* */
cfg->consumer_pid = 0;
cfg->n_rings = 2;
- cfg->q_nitems =
queue
_size;
+ cfg->q_nitems =
props->evt_q
_size;
cfg->ring_cfgs = rc;
oldheap = ssvm_push_heap (segment->ssvm.sh);
q = svm_msg_q_alloc (cfg);
ssvm_pop_heap (oldheap);
cfg->ring_cfgs = rc;
oldheap = ssvm_push_heap (segment->ssvm.sh);
q = svm_msg_q_alloc (cfg);
ssvm_pop_heap (oldheap);
+
+ if (props->use_mq_eventfd)
+ {
+ if (svm_msg_q_alloc_producer_eventfd (q))
+ clib_warning ("failed to alloc eventfd");
+ }
return q;
}
return q;
}
@@
-717,8
+722,8
@@
segment_manager_show_fn (vlib_main_t * vm, unformat_input_t * input,
/* *INDENT-OFF* */
pool_foreach (sm, smm->segment_managers, ({
/* *INDENT-OFF* */
pool_foreach (sm, smm->segment_managers, ({
- vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index(sm),
- sm->app_index, pool_elts (sm->segments));
+ vlib_cli_output (vm, "%-10d%=15d%=12d", segment_manager_index
(sm),
+ sm->app_
wrk_
index, pool_elts (sm->segments));
}));
/* *INDENT-ON* */
}));
/* *INDENT-ON* */