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: switch ct to vc and track half-opens
[vpp.git]
/
src
/
plugins
/
unittest
/
session_test.c
diff --git
a/src/plugins/unittest/session_test.c
b/src/plugins/unittest/session_test.c
index
862d81f
..
b54712c
100644
(file)
--- a/
src/plugins/unittest/session_test.c
+++ b/
src/plugins/unittest/session_test.c
@@
-337,6
+337,9
@@
session_test_endpoint_cfg (vlib_main_t * vm, unformat_input_t * input)
attach_args.name = format (0, "session_test_server");
attach_args.namespace_id = appns_id;
attach_args.name = format (0, "session_test_server");
attach_args.namespace_id = appns_id;
+ /* Allow server to allocate another segment for listens. Needed
+ * because by default we do not allow segment additions */
+ attach_args.options[APP_OPTIONS_ADD_SEGMENT_SIZE] = 32 << 20;
attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server app attached: %U", format_clib_error,
attach_args.options[APP_OPTIONS_NAMESPACE_SECRET] = placeholder_secret;
error = vnet_application_attach (&attach_args);
SESSION_TEST ((error == 0), "server app attached: %U", format_clib_error,
@@
-622,15
+625,12
@@
session_test_namespace (vlib_main_t * vm, unformat_input_t * input)
SESSION_TEST ((error == 0), "client connect should not return error code");
/* wait for accept */
SESSION_TEST ((error == 0), "client connect should not return error code");
/* wait for accept */
- if (vlib_num_workers ())
+ tries = 0;
+ while (!placeholder_accept && ++tries < 100)
{
{
- tries = 0;
- while (!placeholder_accept && ++tries < 100)
- {
- vlib_worker_thread_barrier_release (vm);
- vlib_process_suspend (vm, 100e-3);
- vlib_worker_thread_barrier_sync (vm);
- }
+ vlib_worker_thread_barrier_release (vm);
+ vlib_process_suspend (vm, 100e-3);
+ vlib_worker_thread_barrier_sync (vm);
}
SESSION_TEST ((placeholder_segment_count == 1),
}
SESSION_TEST ((placeholder_segment_count == 1),
@@
-1738,9
+1738,7
@@
wait_for_event (svm_msg_q_t * mq, int fd, int epfd, u8 use_eventfd)
{
if (!use_eventfd)
{
{
if (!use_eventfd)
{
- svm_msg_q_lock (mq);
- while (svm_msg_q_is_empty (mq))
- svm_msg_q_wait (mq);
+ svm_msg_q_wait (mq, SVM_MQ_WAIT_EMPTY);
}
else
{
}
else
{
@@
-1764,10
+1762,7
@@
wait_for_event (svm_msg_q_t * mq, int fd, int epfd, u8 use_eventfd)
continue;
if (!svm_msg_q_is_empty (mq))
continue;
if (!svm_msg_q_is_empty (mq))
- {
- svm_msg_q_lock (mq);
- break;
- }
+ break;
}
}
}
}
}
}
@@
-1839,18
+1834,17
@@
session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input)
mq = app_wrk->event_queue;
if (use_eventfd)
{
mq = app_wrk->event_queue;
if (use_eventfd)
{
- svm_msg_q_alloc_producer_eventfd (mq);
- svm_msg_q_alloc_consumer_eventfd (mq);
- prod_fd = svm_msg_q_get_producer_eventfd (mq);
+ svm_msg_q_alloc_eventfd (mq);
+ prod_fd = svm_msg_q_get_eventfd (mq);
SESSION_TEST (prod_fd != -1, "mq producer eventd valid %u", prod_fd);
}
SESSION_TEST (prod_fd != -1, "mq producer eventd valid %u", prod_fd);
}
- sm = app_worker_get_
or_alloc_
connect_segment_manager (app_wrk);
+ sm = app_worker_get_connect_segment_manager (app_wrk);
segment_manager_alloc_session_fifos (sm, 0, &rx_fifo, &tx_fifo);
s.rx_fifo = rx_fifo;
s.tx_fifo = tx_fifo;
s.session_state = SESSION_STATE_READY;
segment_manager_alloc_session_fifos (sm, 0, &rx_fifo, &tx_fifo);
s.rx_fifo = rx_fifo;
s.tx_fifo = tx_fifo;
s.session_state = SESSION_STATE_READY;
- counter = (u64 *)
rx_fifo->shr->head_chunk
->data;
+ counter = (u64 *)
f_head_cptr (rx_fifo)
->data;
start = vlib_time_now (vm);
pid = fork ();
start = vlib_time_now (vm);
pid = fork ();
@@
-1872,7
+1866,7
@@
session_test_mq_speed (vlib_main_t * vm, unformat_input_t * input)
for (i = 0; i < n_test_msgs; i++)
{
wait_for_event (mq, prod_fd, epfd, use_eventfd);
for (i = 0; i < n_test_msgs; i++)
{
wait_for_event (mq, prod_fd, epfd, use_eventfd);
- svm_msg_q_sub_
w_lock
(mq, &msg);
+ svm_msg_q_sub_
raw
(mq, &msg);
svm_msg_q_free_msg (mq, &msg);
svm_msg_q_unlock (mq);
*counter = *counter + 1;
svm_msg_q_free_msg (mq, &msg);
svm_msg_q_unlock (mq);
*counter = *counter + 1;
@@
-1909,8
+1903,9
@@
session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
svm_msg_q_msg_t msg1, msg2, msg[12];
int __clib_unused verbose, i, rv;
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
svm_msg_q_msg_t msg1, msg2, msg[12];
int __clib_unused verbose, i, rv;
- svm_msg_q_
t *
mq;
+ svm_msg_q_
shared_t *s
mq;
svm_msg_q_ring_t *ring;
svm_msg_q_ring_t *ring;
+ svm_msg_q_t _mq = { 0 }, *mq = &_mq;
u8 *rings_ptr;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
u8 *rings_ptr;
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
@@
-1933,28
+1928,30
@@
session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
cfg->q_nitems = 16;
cfg->ring_cfgs = rc;
cfg->q_nitems = 16;
cfg->ring_cfgs = rc;
- mq = svm_msg_q_alloc (cfg);
+ smq = svm_msg_q_alloc (cfg);
+ svm_msg_q_attach (mq, smq);
SESSION_TEST (mq != 0, "svm_msg_q_alloc");
SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation");
SESSION_TEST (mq != 0, "svm_msg_q_alloc");
SESSION_TEST (vec_len (mq->rings) == 2, "ring allocation");
- rings_ptr = (u8 *) mq->rings
+ vec_bytes (mq->rings)
;
+ rings_ptr = (u8 *) mq->rings
[0].shr->data
;
vec_foreach (ring, mq->rings)
{
vec_foreach (ring, mq->rings)
{
- SESSION_TEST (ring->data == rings_ptr, "ring data");
+ SESSION_TEST (ring->
shr->
data == rings_ptr, "ring data");
rings_ptr += (uword) ring->nitems * ring->elsize;
rings_ptr += (uword) ring->nitems * ring->elsize;
+ rings_ptr += sizeof (svm_msg_q_ring_shared_t);
}
msg1 = svm_msg_q_alloc_msg (mq, 8);
}
msg1 = svm_msg_q_alloc_msg (mq, 8);
- rv = (mq->rings[0].
cursize != 1
-
|| msg1.ring_index != 0 ||
msg1.elt_index != 0);
+ rv = (mq->rings[0].
shr->cursize != 1 || msg1.ring_index != 0 ||
+ msg1.elt_index != 0);
SESSION_TEST (rv == 0, "msg alloc1");
msg2 = svm_msg_q_alloc_msg (mq, 15);
SESSION_TEST (rv == 0, "msg alloc1");
msg2 = svm_msg_q_alloc_msg (mq, 15);
- rv = (mq->rings[1].
cursize != 1
-
|| msg2.ring_index != 1 ||
msg2.elt_index != 0);
+ rv = (mq->rings[1].
shr->cursize != 1 || msg2.ring_index != 1 ||
+ msg2.elt_index != 0);
SESSION_TEST (rv == 0, "msg alloc2");
svm_msg_q_free_msg (mq, &msg1);
SESSION_TEST (rv == 0, "msg alloc2");
svm_msg_q_free_msg (mq, &msg1);
- SESSION_TEST (mq->rings[0].cursize == 0, "free msg");
+ SESSION_TEST (mq->rings[0].
shr->
cursize == 0, "free msg");
for (i = 0; i < 12; i++)
{
for (i = 0; i < 12; i++)
{
@@
-1962,7
+1959,7
@@
session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
*(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i;
}
*(u32 *) svm_msg_q_msg_data (mq, &msg[i]) = i;
}
- rv = (mq->rings[0].
cursize != 8 || mq->rings[1].
cursize != 5);
+ rv = (mq->rings[0].
shr->cursize != 8 || mq->rings[1].shr->
cursize != 5);
SESSION_TEST (rv == 0, "msg alloc3");
*(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123;
SESSION_TEST (rv == 0, "msg alloc3");
*(u32 *) svm_msg_q_msg_data (mq, &msg2) = 123;
@@
-1998,7
+1995,7
@@
session_test_mq_basic (vlib_main_t * vm, unformat_input_t * input)
SESSION_TEST (0, "dequeue2 wrong data");
svm_msg_q_free_msg (mq, &msg[i]);
}
SESSION_TEST (0, "dequeue2 wrong data");
svm_msg_q_free_msg (mq, &msg[i]);
}
- rv = (mq->rings[0].
cursize == 0 && mq->rings[1].
cursize == 0);
+ rv = (mq->rings[0].
shr->cursize == 0 && mq->rings[1].shr->
cursize == 0);
SESSION_TEST (rv, "post dequeue");
return 0;
SESSION_TEST (rv, "post dequeue");
return 0;