/* Our event queue */
svm_msg_q_t *our_event_queue;
+ svm_msg_q_t *ct_event_queue;
/* $$$ single thread only for the moment */
svm_msg_q_t *vpp_event_queue;
uword *segments_table;
u8 do_echo;
u8 have_return;
+ u64 total_to_send;
u64 bytes_to_send;
+ u64 bytes_sent;
} udp_echo_main_t;
-#if CLIB_DEBUG > 0
-#define NITER 10000
-#else
-#define NITER 4000000
-#endif
-
udp_echo_main_t udp_echo_main;
static void
return;
}
- utm->our_event_queue =
- uword_to_pointer (mp->app_event_queue_address, svm_msg_q_t *);
+ utm->our_event_queue = uword_to_pointer (mp->app_event_queue_address,
+ svm_msg_q_t *);
utm->state = STATE_ATTACHED;
}
{
if (utm->state == state)
return 0;
+ if (utm->state == STATE_FAILED)
+ return -1;
}
return -1;
}
u8 *my_copy_buffer = 0;
udp_echo_main_t *utm = &udp_echo_main;
i32 actual_transfer;
- int rv;
+ int rv, do_dequeue = 0;
u32 buffer_offset;
while (utm->cut_through_session_index == ~0)
vec_validate (my_copy_buffer, 64 * 1024 - 1);
- while (true)
+ while (1)
{
- /* We read from the tx fifo and write to the rx fifo */
do
{
- actual_transfer = svm_fifo_dequeue_nowait (rx_fifo,
- vec_len (my_copy_buffer),
- my_copy_buffer);
+ /* We read from the tx fifo and write to the rx fifo */
+ if (utm->have_return || do_dequeue)
+ actual_transfer = svm_fifo_dequeue_nowait (rx_fifo,
+ vec_len
+ (my_copy_buffer),
+ my_copy_buffer);
+ else
+ {
+ /* We don't do anything with the data, drop it */
+ actual_transfer = svm_fifo_max_dequeue (rx_fifo);
+ svm_fifo_dequeue_drop (rx_fifo, actual_transfer);
+ }
}
while (actual_transfer <= 0);
server_bytes_received += actual_transfer;
- buffer_offset = 0;
- while (actual_transfer > 0)
+ if (utm->have_return)
{
- rv = svm_fifo_enqueue_nowait (tx_fifo, actual_transfer,
- my_copy_buffer + buffer_offset);
- if (rv > 0)
+ buffer_offset = 0;
+ while (actual_transfer > 0)
{
- actual_transfer -= rv;
- buffer_offset += rv;
- server_bytes_sent += rv;
- }
+ rv = svm_fifo_enqueue_nowait (tx_fifo, actual_transfer,
+ my_copy_buffer + buffer_offset);
+ if (rv > 0)
+ {
+ actual_transfer -= rv;
+ buffer_offset += rv;
+ server_bytes_sent += rv;
+ }
+ }
}
if (PREDICT_FALSE (utm->time_to_stop))
break;
pool_get (utm->sessions, session);
memset (session, 0, sizeof (*session));
session_index = session - utm->sessions;
+ session->session_index = session_index;
/* Cut-through case */
if (mp->server_event_queue_address)
{
clib_warning ("cut-through session");
- utm->our_event_queue = uword_to_pointer (mp->server_event_queue_address,
- svm_msg_q_t *);
+ session->vpp_evt_q = uword_to_pointer (mp->client_event_queue_address,
+ svm_msg_q_t *);
+ sleep (1);
rx_fifo->master_session_index = session_index;
tx_fifo->master_session_index = session_index;
utm->cut_through_session_index = session_index;
session->rx_fifo = rx_fifo;
session->tx_fifo = tx_fifo;
+ session->is_dgram = 0;
rv = pthread_create (&utm->cut_through_thread_handle,
NULL /*attr */ , cut_through_thread_fn, 0);
clib_warning ("pthread_create returned %d", rv);
rv = VNET_API_ERROR_SYSCALL_ERROR_1;
}
- utm->do_echo = 1;
}
else
{
(f64) pool_elts (utm->sessions) / (now - start_time));
}
- app_alloc_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt,
+ app_alloc_ctrl_evt_to_vpp (utm->vpp_event_queue, app_evt,
SESSION_CTRL_EVT_ACCEPTED_REPLY);
rmp = (session_accepted_reply_msg_t *) app_evt->evt->data;
rmp->handle = mp->handle;
rmp->context = mp->context;
rmp->retval = rv;
- app_send_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt);
+ app_send_ctrl_evt_to_vpp (utm->vpp_event_queue, app_evt);
CLIB_MEMORY_BARRIER ();
utm->state = STATE_READY;
{
session = pool_elt_at_index (utm->sessions, p[0]);
hash_unset (utm->session_index_by_vpp_handles, mp->handle);
+ clib_warning ("disconnecting %u", session->session_index);
pool_put (utm->sessions, session);
}
else
ASSERT (mp->server_rx_fifo && mp->server_tx_fifo);
pool_get (utm->sessions, session);
+ session->session_index = session - utm->sessions;
session->rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *);
session->tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *);
- session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address,
- svm_msg_q_t *);
+
/* Cut-through case */
if (mp->client_event_queue_address)
{
clib_warning ("cut-through session");
- utm->cut_through_session_index = session - utm->sessions;
- utm->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address,
- svm_msg_q_t *);
- utm->our_event_queue = uword_to_pointer (mp->client_event_queue_address,
- svm_msg_q_t *);
- utm->do_echo = 1;
+ session->vpp_evt_q = uword_to_pointer (mp->server_event_queue_address,
+ svm_msg_q_t *);
+ utm->ct_event_queue = uword_to_pointer (mp->client_event_queue_address,
+ svm_msg_q_t *);
+ utm->cut_through_session_index = session->session_index;
+ session->is_dgram = 0;
+ sleep (1);
+ session->rx_fifo->client_session_index = session->session_index;
+ session->tx_fifo->client_session_index = session->session_index;
}
else
{
- utm->connected_session = session - utm->sessions;
+ utm->connected_session = session->session_index;
utm->vpp_event_queue = uword_to_pointer (mp->vpp_event_queue_address,
svm_msg_q_t *);
+ session->rx_fifo->client_session_index = session->session_index;
+ session->tx_fifo->client_session_index = session->session_index;
clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip,
sizeof (ip46_address_t));
session->transport.is_ip4 = mp->is_ip4;
utm->state = STATE_READY;
}
+static void
+session_bound_handler (session_bound_msg_t * mp)
+{
+ udp_echo_main_t *utm = &udp_echo_main;
+ svm_fifo_t *rx_fifo, *tx_fifo;
+ app_session_t *session;
+ u32 session_index;
+
+ if (mp->retval)
+ {
+ clib_warning ("bind failed: %d", mp->retval);
+ utm->state = STATE_FAILED;
+ return;
+ }
+
+ rx_fifo = uword_to_pointer (mp->rx_fifo, svm_fifo_t *);
+ tx_fifo = uword_to_pointer (mp->tx_fifo, svm_fifo_t *);
+
+ pool_get (utm->sessions, session);
+ memset (session, 0, sizeof (*session));
+ session_index = session - utm->sessions;
+
+ rx_fifo->client_session_index = session_index;
+ tx_fifo->client_session_index = session_index;
+ session->rx_fifo = rx_fifo;
+ session->tx_fifo = tx_fifo;
+ clib_memcpy (&session->transport.lcl_ip, mp->lcl_ip,
+ sizeof (ip46_address_t));
+ session->transport.is_ip4 = mp->lcl_is_ip4;
+ session->transport.lcl_port = mp->lcl_port;
+ session->vpp_evt_q = uword_to_pointer (mp->vpp_evt_q, svm_msg_q_t *);
+
+ utm->state = utm->is_connected ? STATE_BOUND : STATE_READY;
+}
+
static void
handle_mq_event (session_event_t * e)
{
switch (e->event_type)
{
+ case SESSION_CTRL_EVT_BOUND:
+ session_bound_handler ((session_bound_msg_t *) e->data);
+ break;
case SESSION_CTRL_EVT_ACCEPTED:
session_accepted_handler ((session_accepted_msg_t *) e->data);
break;
vl_msg_api_send_shmem (utm->vl_input_queue, (u8 *) & cmp);
}
-static void
-client_send_cut_through (udp_echo_main_t * utm, app_session_t * session)
-{
- int i;
- u8 *test_data = 0;
- u64 bytes_received = 0, bytes_sent = 0;
- i32 bytes_to_read;
- int rv;
- f64 before, after, delta, bytes_per_second;
- svm_fifo_t *rx_fifo, *tx_fifo;
- int buffer_offset, bytes_to_send = 0;
-
- /*
- * Prepare test data
- */
- vec_validate (test_data, 64 * 1024 - 1);
- for (i = 0; i < vec_len (test_data); i++)
- test_data[i] = i & 0xff;
-
- rx_fifo = session->rx_fifo;
- tx_fifo = session->tx_fifo;
-
- before = clib_time_now (&utm->clib_time);
-
- vec_validate (utm->rx_buf, vec_len (test_data) - 1);
-
- for (i = 0; i < NITER; i++)
- {
- bytes_to_send = vec_len (test_data);
- buffer_offset = 0;
- while (bytes_to_send > 0)
- {
- rv = svm_fifo_enqueue_nowait (tx_fifo, bytes_to_send,
- test_data + buffer_offset);
-
- if (rv > 0)
- {
- bytes_to_send -= rv;
- buffer_offset += rv;
- bytes_sent += rv;
- }
- }
-
- bytes_to_read = svm_fifo_max_dequeue (rx_fifo);
- bytes_to_read = vec_len (utm->rx_buf) > bytes_to_read ?
- bytes_to_read : vec_len (utm->rx_buf);
-
- buffer_offset = 0;
- while (bytes_to_read > 0)
- {
- rv = svm_fifo_dequeue_nowait (rx_fifo,
- bytes_to_read,
- utm->rx_buf + buffer_offset);
- if (rv > 0)
- {
- bytes_to_read -= rv;
- buffer_offset += rv;
- bytes_received += rv;
- }
- }
- }
- while (bytes_received < bytes_sent)
- {
- rv =
- svm_fifo_dequeue_nowait (rx_fifo, vec_len (utm->rx_buf), utm->rx_buf);
- if (rv > 0)
- {
-#if CLIB_DEBUG > 0
- int j;
- for (j = 0; j < rv; j++)
- {
- if (utm->rx_buf[j] != ((bytes_received + j) & 0xff))
- {
- clib_warning ("error at byte %lld, 0x%x not 0x%x",
- bytes_received + j,
- utm->rx_buf[j],
- ((bytes_received + j) & 0xff));
- }
- }
-#endif
- bytes_received += (u64) rv;
- }
- }
-
- after = clib_time_now (&utm->clib_time);
- delta = after - before;
- bytes_per_second = 0.0;
-
- if (delta > 0.0)
- bytes_per_second = (f64) bytes_received / delta;
-
- fformat (stdout,
- "Done: %lld recv bytes in %.2f seconds, %.2f bytes/sec...\n\n",
- bytes_received, delta, bytes_per_second);
- fformat (stdout,
- "Done: %lld sent bytes in %.2f seconds, %.2f bytes/sec...\n\n",
- bytes_sent, delta, bytes_per_second);
- fformat (stdout,
- "client -> server -> client round trip: %.2f Gbit/sec \n\n",
- (bytes_per_second * 8.0) / 1e9);
-}
-
static void
send_test_chunk (udp_echo_main_t * utm, app_session_t * s, u32 bytes)
{
+ u64 test_buf_len, bytes_this_chunk, test_buf_offset;
+
u8 *test_data = utm->connect_test_data;
- int test_buf_offset = 0;
- u64 bytes_sent = 0;
u32 bytes_to_snd, enq_space, min_chunk;
- int rv;
-
- min_chunk = clib_min (65536, s->tx_fifo->nitems);
- bytes_to_snd = (bytes == 0) ? vec_len (test_data) : bytes;
- if (bytes_to_snd > vec_len (test_data))
- bytes_to_snd = vec_len (test_data);
+ session_evt_type_t et = FIFO_EVENT_APP_TX;
+ int written;
+
+ test_buf_len = vec_len (test_data);
+ test_buf_offset = utm->bytes_sent % test_buf_len;
+ bytes_this_chunk = clib_min (test_buf_len - test_buf_offset,
+ utm->bytes_to_send);
+ enq_space = svm_fifo_max_enqueue (s->tx_fifo);
+ bytes_this_chunk = clib_min (bytes_this_chunk, enq_space);
+ et += (s->session_index == utm->cut_through_session_index);
+
+ if (s->is_dgram)
+ written = app_send_dgram_raw (s->tx_fifo, &s->transport, s->vpp_evt_q,
+ test_data + test_buf_offset,
+ bytes_this_chunk, et, SVM_Q_WAIT);
+ else
+ written = app_send_stream_raw (s->tx_fifo, s->vpp_evt_q,
+ test_data + test_buf_offset,
+ bytes_this_chunk, et, SVM_Q_WAIT);
- while (bytes_to_snd > 0 && !utm->time_to_stop)
+ if (written > 0)
{
- enq_space = svm_fifo_max_enqueue (s->tx_fifo);
- if (enq_space < clib_min (bytes_to_snd, min_chunk))
- continue;
-
- rv = app_send (s, test_data + test_buf_offset, bytes_to_snd, 0);
- if (rv > 0)
- {
- bytes_to_snd -= rv;
- test_buf_offset += rv;
- bytes_sent += rv;
- }
+ utm->bytes_to_send -= written;
+ utm->bytes_sent += written;
}
}
}
void
-client_send_data (udp_echo_main_t * utm)
+client_send_data (udp_echo_main_t * utm, u32 session_index)
{
f64 start_time, end_time, delta;
app_session_t *session;
char *transfer_type;
- u32 n_iterations;
u8 *test_data;
int i;
- vec_validate (utm->connect_test_data, 1024 * 1024 - 1);
+ vec_validate_aligned (utm->connect_test_data, 1024 * 1024 - 1,
+ CLIB_CACHE_LINE_BYTES);
for (i = 0; i < vec_len (utm->connect_test_data); i++)
utm->connect_test_data[i] = i & 0xff;
test_data = utm->connect_test_data;
- session = pool_elt_at_index (utm->sessions, utm->connected_session);
+ session = pool_elt_at_index (utm->sessions, session_index);
ASSERT (vec_len (test_data) > 0);
+ utm->total_to_send = utm->bytes_to_send;
vec_validate (utm->rx_buf, vec_len (test_data) - 1);
- n_iterations = utm->bytes_to_send / vec_len (test_data);
- if (!n_iterations)
- n_iterations = 1;
-
start_time = clib_time_now (&utm->clib_time);
- for (i = 0; i < n_iterations; i++)
+ while (!utm->time_to_stop && utm->bytes_to_send)
{
send_test_chunk (utm, session, 0);
if (utm->have_return)
delta = end_time - start_time;
transfer_type = utm->have_return ? "full-duplex" : "half-duplex";
clib_warning ("%lld bytes (%lld mbytes, %lld gbytes) in %.2f seconds",
- utm->bytes_to_send, utm->bytes_to_send / (1ULL << 20),
- utm->bytes_to_send / (1ULL << 30), delta);
- clib_warning ("%.2f bytes/second %s", ((f64) utm->bytes_to_send) / (delta),
+ utm->total_to_send, utm->total_to_send / (1ULL << 20),
+ utm->total_to_send / (1ULL << 30), delta);
+ clib_warning ("%.2f bytes/second %s", ((f64) utm->total_to_send) / (delta),
transfer_type);
clib_warning ("%.4f gbit/second %s",
- (((f64) utm->bytes_to_send * 8.0) / delta / 1e9),
+ (((f64) utm->total_to_send * 8.0) / delta / 1e9),
transfer_type);
}
udp_client_send_connect (utm);
start_time = clib_time_now (&utm->clib_time);
- while (pool_elts (utm->sessions) != 1
- && clib_time_now (&utm->clib_time) - start_time < timeout
- && utm->state != STATE_FAILED)
-
+ while (pool_elts (utm->sessions) != 1 && utm->state != STATE_FAILED)
{
svm_msg_q_sub (utm->our_event_queue, &msg, SVM_Q_WAIT, 0);
e = svm_msg_q_msg_data (utm->our_event_queue, &msg);
handle_mq_event (e);
svm_msg_q_free_msg (utm->our_event_queue, &msg);
+
+ if (clib_time_now (&utm->clib_time) - start_time >= timeout)
+ break;
}
if (utm->cut_through_session_index != ~0)
- {
- session = pool_elt_at_index (utm->sessions,
- utm->cut_through_session_index);
- client_send_cut_through (utm, session);
- }
+ client_send_data (utm, utm->cut_through_session_index);
else
- {
- session = pool_elt_at_index (utm->sessions, utm->connected_session);
- client_send_data (utm);
- }
+ client_send_data (utm, utm->connected_session);
application_detach (utm);
wait_for_state_change (utm, STATE_DETACHED);
utm->state = STATE_START;
}
-#define foreach_tcp_echo_msg \
-_(BIND_URI_REPLY, bind_uri_reply) \
-_(UNBIND_URI_REPLY, unbind_uri_reply) \
-_(MAP_ANOTHER_SEGMENT, map_another_segment) \
-_(UNMAP_SEGMENT, unmap_segment) \
-_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
-_(APPLICATION_DETACH_REPLY, application_detach_reply) \
+static void
+ vl_api_app_cut_through_registration_add_t_handler
+ (vl_api_app_cut_through_registration_add_t * mp)
+{
+
+}
+
+#define foreach_tcp_echo_msg \
+_(BIND_URI_REPLY, bind_uri_reply) \
+_(UNBIND_URI_REPLY, unbind_uri_reply) \
+_(MAP_ANOTHER_SEGMENT, map_another_segment) \
+_(UNMAP_SEGMENT, unmap_segment) \
+_(APPLICATION_ATTACH_REPLY, application_attach_reply) \
+_(APPLICATION_DETACH_REPLY, application_detach_reply) \
+_(APP_CUT_THROUGH_REGISTRATION_ADD, app_cut_through_registration_add) \
void
tcp_echo_api_hookup (udp_echo_main_t * utm)
}
void
-server_handle_fifo_event_rx (udp_echo_main_t * utm, session_event_t * e)
+server_handle_fifo_event_rx (udp_echo_main_t * utm, u32 session_index)
{
- app_session_t *s;
+ svm_fifo_t *rx_fifo, *tx_fifo;
+ int n_read;
+ app_session_t *session;
int rv;
+ u32 max_dequeue, offset, max_transfer, rx_buf_len;
+ session_evt_type_t et = FIFO_EVENT_APP_TX;
- s = pool_elt_at_index (utm->sessions, e->fifo->client_session_index);
- app_recv (s, utm->rx_buf, vec_len (utm->rx_buf));
+ session = pool_elt_at_index (utm->sessions, session_index);
+ rx_buf_len = vec_len (utm->rx_buf);
+ rx_fifo = session->rx_fifo;
+ tx_fifo = session->tx_fifo;
+
+ et += (session->session_index == utm->cut_through_session_index);
+
+ max_dequeue = svm_fifo_max_dequeue (rx_fifo);
+ /* Allow enqueuing of a new event */
+ svm_fifo_unset_event (rx_fifo);
- if (utm->do_echo)
+ if (PREDICT_FALSE (!max_dequeue))
+ return;
+
+ /* Read the max_dequeue */
+ do
{
- do
+ max_transfer = clib_min (rx_buf_len, max_dequeue);
+ if (session->is_dgram)
+ n_read = app_recv_dgram_raw (rx_fifo, utm->rx_buf, max_transfer,
+ &session->transport, 0, 0);
+ else
+ n_read = app_recv_stream_raw (rx_fifo, utm->rx_buf, max_transfer, 0,
+ 0);
+
+ if (n_read > 0)
+ max_dequeue -= n_read;
+
+ /* Reflect if a non-drop session */
+ if (utm->have_return && n_read > 0)
{
- rv = app_send_stream (s, utm->rx_buf, vec_len (utm->rx_buf), 0);
+ offset = 0;
+ do
+ {
+ if (session->is_dgram)
+ rv = app_send_dgram_raw (tx_fifo, &session->transport,
+ session->vpp_evt_q,
+ &utm->rx_buf[offset], n_read, et,
+ SVM_Q_WAIT);
+ else
+ rv = app_send_stream_raw (tx_fifo, session->vpp_evt_q,
+ &utm->rx_buf[offset], n_read, et,
+ SVM_Q_WAIT);
+ if (rv > 0)
+ {
+ n_read -= rv;
+ offset += rv;
+ }
+ }
+ while ((rv <= 0 || n_read > 0) && !utm->time_to_stop);
+
+ /* If event wasn't set, add one */
+ if (svm_fifo_set_event (tx_fifo))
+ app_send_io_evt_to_vpp (session->vpp_evt_q, tx_fifo,
+ et, SVM_Q_WAIT);
}
- while (rv == SVM_FIFO_FULL);
}
+ while ((n_read < 0 || max_dequeue > 0) && !utm->time_to_stop);
}
-void
+static void
server_handle_event_queue (udp_echo_main_t * utm)
{
session_event_t *e;
svm_msg_q_msg_t msg;
+ svm_msg_q_t *mq = utm->our_event_queue;
+ int i;
while (utm->state != STATE_READY)
sleep (5);
while (1)
{
- if (svm_msg_q_sub (utm->our_event_queue, &msg, SVM_Q_WAIT, 0))
+ if (svm_msg_q_sub (mq, &msg, SVM_Q_WAIT, 0))
{
clib_warning ("svm msg q returned");
continue;
}
- e = svm_msg_q_msg_data (utm->our_event_queue, &msg);
+ e = svm_msg_q_msg_data (mq, &msg);
switch (e->event_type)
{
case FIFO_EVENT_APP_RX:
- server_handle_fifo_event_rx (utm, e);
+ server_handle_fifo_event_rx (utm, e->fifo->client_session_index);
+ break;
+ case SESSION_IO_EVT_CT_TX:
break;
default:
handle_mq_event (e);
break;
}
- svm_msg_q_free_msg (utm->our_event_queue, &msg);
+ svm_msg_q_free_msg (mq, &msg);
if (PREDICT_FALSE (utm->time_to_stop == 1))
return;
if (PREDICT_FALSE (utm->time_to_print_stats == 1))
svm_fifo_segment_main_init (0x200000000ULL, 20);
- vec_validate (utm->rx_buf, 8192);
+ vec_validate (utm->rx_buf, 128 << 10);
utm->session_index_by_vpp_handles = hash_create (0, sizeof (uword));
utm->my_pid = getpid ();
utm->configured_segment_size = 1 << 20;
Code Review / vpp.git / commitdiff