connect_to_vpp (char *name)
{
echo_main_t *em = &echo_main;
- api_main_t *am = &api_main;
+ api_main_t *am = vlibapi_get_main ();
if (em->use_sock_api)
{
em->stats.active_count.q, em->stats.active_count.s);
fformat (stdout, " \"clean\": { \"q\": %d, \"s\": %d }\n",
em->stats.clean_count.q, em->stats.clean_count.s);
+ fformat (stdout, " \"accepted\": { \"q\": %d, \"s\": %d }\n",
+ em->stats.accepted_count.q, em->stats.accepted_count.s);
+ fformat (stdout, " \"connected\": { \"q\": %d, \"s\": %d }\n",
+ em->stats.connected_count.q, em->stats.connected_count.s);
fformat (stdout, " }\n");
fformat (stdout, " \"results\": {\n");
fformat (stdout, " \"has_failed\": \"%d\"\n", em->has_failed);
em->stats.active_count.s, em->stats.active_count.q);
fformat (stdout, "Discarded %d streams (and %d Quic conn)\n",
em->stats.clean_count.s, em->stats.clean_count.q);
+ fformat (stdout, "--------------------\n");
+ fformat (stdout, "Got accept on %d streams (and %d Quic conn)\n",
+ em->stats.accepted_count.s, em->stats.accepted_count.q);
+ fformat (stdout, "Got connected on %d streams (and %d Quic conn)\n",
+ em->stats.connected_count.s, em->stats.connected_count.q);
if (em->has_failed)
fformat (stdout, "\nFailure Return Status: %d\n%v", em->has_failed,
em->fail_descr);
echo_update_count_on_session_close (echo_main_t * em, echo_session_t * s)
{
- ECHO_LOG (1, "[%lu/%lu] -> %U -> [%lu/%lu]",
+ ECHO_LOG (2, "[%lu/%lu] -> %U -> [%lu/%lu]",
s->bytes_received, s->bytes_received + s->bytes_to_receive,
echo_format_session, s, s->bytes_sent,
s->bytes_sent + s->bytes_to_send);
expected = (s->bytes_received + i) & 0xff;
if (rx_buf[i] == expected || em->max_test_msg > 0)
continue;
- ECHO_LOG (0, "Session 0x%lx byte %lld was 0x%x expected 0x%x",
+ ECHO_LOG (1, "Session 0x%lx byte %lld was 0x%x expected 0x%x",
s->vpp_session_handle, s->bytes_received + i, rx_buf[i],
expected);
em->max_test_msg--;
if (em->max_test_msg == 0)
- ECHO_LOG (0, "Too many errors, hiding next ones");
+ ECHO_LOG (1, "Too many errors, hiding next ones");
if (em->test_return_packets == RETURN_PACKETS_ASSERT)
ECHO_FAIL (ECHO_FAIL_TEST_BYTES_ERR, "test-bytes errored");
}
/* if parent has died, terminate gracefully */
if (s->listener_index == SESSION_INVALID_INDEX)
{
- ECHO_LOG (2, "%U: listener_index == SESSION_INVALID_INDEX",
+ ECHO_LOG (3, "%U: listener_index == SESSION_INVALID_INDEX",
echo_format_session, s);
return;
}
return;
}
- ECHO_LOG (2, "%U died, close child %U", echo_format_session, ls,
+ ECHO_LOG (3, "%U died, close child %U", echo_format_session, ls,
echo_format_session, s);
echo_update_count_on_session_close (em, s);
em->proto_cb_vft->cleanup_cb (s, 1 /* parent_died */ );
clib_atomic_fetch_add (&em->stats.clean_count.s, 1);
}
}
- ECHO_LOG (2, "%U: %U", echo_format_session, s,
+ ECHO_LOG (3, "%U: %U", echo_format_session, s,
echo_format_session_state, s->session_state);
return;
}
else if (s->idle_cycles++ == 1e7)
{
s->idle_cycles = 0;
- ECHO_LOG (1, "Idle client TX:%dB RX:%dB", s->bytes_to_send,
+ ECHO_LOG (2, "Idle client TX:%dB RX:%dB", s->bytes_to_send,
s->bytes_to_receive);
- ECHO_LOG (1, "Idle FIFOs TX:%dB RX:%dB",
+ ECHO_LOG (2, "Idle FIFOs TX:%dB RX:%dB",
svm_fifo_max_dequeue (s->tx_fifo),
svm_fifo_max_dequeue (s->rx_fifo));
- ECHO_LOG (1, "Session 0x%lx state %U", s->vpp_session_handle,
+ ECHO_LOG (2, "Session 0x%lx state %U", s->vpp_session_handle,
echo_format_session_state, s->session_state);
}
}
u32 idx = (u64) arg;
if (n * idx >= N)
{
- ECHO_LOG (1, "Thread %u exiting, no sessions to care for", idx);
+ ECHO_LOG (2, "Thread %u exiting, no sessions to care for", idx);
pthread_exit (0);
}
u32 thread_n_sessions = clib_min (n, N - n * idx);
echo_check_closed_listener (em, s);
break;
case ECHO_SESSION_STATE_CLOSING:
- ECHO_LOG (2, "%U: %U", echo_format_session, s,
+ ECHO_LOG (3, "%U: %U", echo_format_session, s,
echo_format_session_state, s->session_state);
echo_update_count_on_session_close (em, s);
em->proto_cb_vft->cleanup_cb (s, 0 /* parent_died */ );
break;
case ECHO_SESSION_STATE_CLOSED:
- ECHO_LOG (2, "%U: %U", echo_format_session, s,
+ ECHO_LOG (3, "%U: %U", echo_format_session, s,
echo_format_session_state, s->session_state);
n_closed_sessions++;
break;
if (n_closed_sessions == thread_n_sessions)
break;
}
- ECHO_LOG (1, "Mission accomplished!");
+ ECHO_LOG (2, "Mission accomplished!");
pthread_exit (0);
}
clib_net_to_host_u32 (mp->retval));
return;
}
- ECHO_LOG (0, "listening on %U:%u", format_ip46_address, mp->lcl_ip,
+ ECHO_LOG (1, "listening on %U:%u", format_ip46_address, mp->lcl_ip,
mp->lcl_is_ip4 ? IP46_TYPE_IP4 : IP46_TYPE_IP6,
clib_net_to_host_u16 (mp->lcl_port));
session->listener_index = ls->session_index;
/* Add it to lookup table */
- ECHO_LOG (1, "Accepted session 0x%lx S[%u] -> 0x%lx S[%u]",
+ ECHO_LOG (2, "Accepted session 0x%lx S[%u] -> 0x%lx S[%u]",
mp->handle, session->session_index,
mp->listener_handle, session->listener_index);
echo_session_handle_add_del (em, mp->handle, session->session_index);
u32 listener_index = htonl (mp->context);
svm_fifo_t *rx_fifo, *tx_fifo;
+ clib_atomic_add_fetch (&em->max_sim_connects, 1);
+
if (mp->retval)
{
if (em->proto_cb_vft->connected_cb)
echo_session_t *s;
if (!(s = echo_get_session_from_handle (em, mp->handle)))
{
- ECHO_LOG (0, "Invalid vpp_session_handle: 0x%lx", mp->handle);
+ ECHO_LOG (1, "Invalid vpp_session_handle: 0x%lx", mp->handle);
return;
}
if (s->session_state == ECHO_SESSION_STATE_CLOSED)
{
- ECHO_LOG (1, "%U: already in ECHO_SESSION_STATE_CLOSED",
+ ECHO_LOG (2, "%U: already in ECHO_SESSION_STATE_CLOSED",
echo_format_session, s);
}
else
{
- ECHO_LOG (1, "%U: passive close", echo_format_session, s);
+ ECHO_LOG (2, "%U: passive close", echo_format_session, s);
em->proto_cb_vft->disconnected_cb (mp, s);
}
app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt,
echo_session_t *s = 0;
if (!(s = echo_get_session_from_handle (em, mp->handle)))
{
- ECHO_LOG (0, "Invalid vpp_session_handle: 0x%lx", mp->handle);
+ ECHO_LOG (1, "Invalid vpp_session_handle: 0x%lx", mp->handle);
return;
}
- ECHO_LOG (1, "%U: session reset", echo_format_session, s);
+ ECHO_LOG (2, "%U: session reset", echo_format_session, s);
em->proto_cb_vft->reset_cb (mp, s);
app_alloc_ctrl_evt_to_vpp (s->vpp_evt_q, app_evt,
case SESSION_IO_EVT_RX:
break;
default:
- ECHO_LOG (0, "unhandled event %u", e->event_type);
+ ECHO_LOG (1, "unhandled event %u", e->event_type);
}
}
}
}
-static inline int
-echo_mq_dequeue_batch (svm_msg_q_t * mq, svm_msg_q_msg_t * msg_vec,
- u32 n_max_msg)
-{
- svm_msg_q_msg_t *msg;
- u32 n_msgs;
- int i;
-
- n_msgs = clib_min (svm_msg_q_size (mq), n_max_msg);
- for (i = 0; i < n_msgs; i++)
- {
- vec_add2 (msg_vec, msg, 1);
- svm_msg_q_sub_w_lock (mq, msg);
- }
- return n_msgs;
-}
-
static void *
echo_mq_thread_fn (void *arg)
{
svm_msg_q_unlock (mq);
continue;
}
- echo_mq_dequeue_batch (mq, msg_vec, ~0);
+ for (i = 0; i < svm_msg_q_size (mq); i++)
+ {
+ vec_add2 (msg_vec, msg, 1);
+ svm_msg_q_sub_w_lock (mq, msg);
+ }
svm_msg_q_unlock (mq);
for (i = 0; i < vec_len (msg_vec); i++)
for (i = 0; i < em->n_connects; i++)
echo_send_connect (SESSION_INVALID_HANDLE, SESSION_INVALID_INDEX);
wait_for_state_change (em, STATE_READY, 0);
- ECHO_LOG (1, "App is ready");
+ ECHO_LOG (2, "App is ready");
echo_process_rpcs (em);
}
echo_session_t *ls;
echo_send_listen (em);
wait_for_state_change (em, STATE_READY, 0);
- ECHO_LOG (1, "App is ready");
+ ECHO_LOG (2, "App is ready");
echo_process_rpcs (em);
/* Cleanup */
- ECHO_LOG (1, "Unbind listen port");
+ ECHO_LOG (2, "Unbind listen port");
ls = pool_elt_at_index (em->sessions, em->listen_session_index);
echo_send_unbind (em, ls);
if (wait_for_state_change (em, STATE_DISCONNECTED, TIMEOUT))
int i;
fprintf (stderr,
"Usage: vpp_echo [socket-name SOCKET] [client|server] [uri URI] [OPTIONS]\n"
- "Generates traffic and assert correct teardown of the QUIC hoststack\n"
+ "Generates traffic and assert correct teardown of the hoststack\n"
"\n"
" socket-name PATH Specify the binary socket path to connect to VPP\n"
" use-svm-api Use SVM API to connect to VPP\n"
" test-bytes[:assert] Check data correctness when receiving (assert fails on first error)\n"
" fifo-size N[K|M|G] Use N[K|M|G] fifos\n"
- " mq-size N Use N event slots for vpp_echo <-> vpp events\n"
+ " mq-size N Use mq with N slots for [vpp_echo->vpp] communication\n"
+ " max-sim-connects N Do not allow more than N mq events inflight\n"
" rx-buf N[K|M|G] Use N[Kb|Mb|GB] RX buffer\n"
" tx-buf N[K|M|G] Use N[Kb|Mb|GB] TX test buffer\n"
" appns NAMESPACE Use the namespace NAMESPACE\n"
echo_unformat_timing_event, &em->timing.start_event,
echo_unformat_timing_event, &em->timing.end_event))
;
+ else if (unformat (a, "max-sim-connects %d", &em->max_sim_connects))
+ ;
else
print_usage_and_exit ();
}
if (em->send_stream_disconnects == ECHO_CLOSE_F_INVALID)
em->send_stream_disconnects = default_f_active;
+ if (em->max_sim_connects == 0)
+ em->max_sim_connects = em->evt_q_size >> 1;
+
if (em->wait_for_gdb)
{
volatile u64 nop = 0;
char *app_name;
u64 i;
svm_msg_q_cfg_t _cfg, *cfg = &_cfg;
- u32 rpc_queue_size = 64 << 10;
+ u32 rpc_queue_size = 256 << 10;
em->session_index_by_vpp_handles = hash_create (0, sizeof (uword));
clib_spinlock_init (&em->sid_vpp_handles_lock);
em->tx_buf_size = 1 << 20;
em->data_source = ECHO_INVALID_DATA_SOURCE;
em->uri = format (0, "%s%c", "tcp://0.0.0.0/1234", 0);
+ em->max_sim_connects = 0;
em->crypto_engine = CRYPTO_ENGINE_NONE;
echo_set_each_proto_defaults_before_opts (em);
echo_process_opts (argc, argv);
em->state = STATE_ATTACHED;
else
{
- ECHO_LOG (1, "Adding crypto context %U", echo_format_crypto_engine,
+ ECHO_LOG (2, "Adding crypto context %U", echo_format_crypto_engine,
em->crypto_engine);
echo_send_add_cert_key (em);
if (wait_for_state_change (em, STATE_ATTACHED, TIMEOUT))
vl_client_disconnect_from_vlib ();
echo_assert_test_suceeded (em);
exit_on_error:
- ECHO_LOG (0, "Test complete !\n");
+ ECHO_LOG (1, "Test complete !\n");
if (em->output_json)
print_global_json_stats (em);
else