X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fhs_apps%2Fsapi%2Fvpp_echo.c;h=e460aa2bf25a18e291310c3082d718224434f3cb;hb=91af1859da0313d48fb152999a74a34cf384b490;hp=99a443a35b325d3308e6e53e8da817b162f975a2;hpb=789ac9de0674f3e5e064734dd81314716ed8cd1a;p=vpp.git diff --git a/src/plugins/hs_apps/sapi/vpp_echo.c b/src/plugins/hs_apps/sapi/vpp_echo.c index 99a443a35b3..e460aa2bf25 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo.c +++ b/src/plugins/hs_apps/sapi/vpp_echo.c @@ -42,13 +42,24 @@ echo_session_prealloc (echo_main_t * em) static void echo_assert_test_suceeded (echo_main_t * em) { - CHECK (em->n_clients * em->bytes_to_receive, - em->stats.rx_total, "Not enough data received"); - CHECK (em->n_clients * em->bytes_to_send, - em->stats.tx_total, "Not enough data sent"); + if (em->rx_results_diff) + CHECK_DIFF (ECHO_FAIL_TEST_ASSERT_RX_TOTAL, em->stats.rx_expected, + em->stats.rx_total, "Invalid amount of data received"); + else + CHECK_SAME (ECHO_FAIL_TEST_ASSERT_RX_TOTAL, em->stats.rx_expected, + em->stats.rx_total, "Invalid amount of data received"); + + if (em->tx_results_diff) + CHECK_DIFF (ECHO_FAIL_TEST_ASSERT_TX_TOTAL, em->stats.tx_expected, + em->stats.tx_total, "Invalid amount of data sent"); + else + CHECK_SAME (ECHO_FAIL_TEST_ASSERT_TX_TOTAL, em->stats.tx_expected, + em->stats.tx_total, "Invalid amount of data sent"); + clib_spinlock_lock (&em->sid_vpp_handles_lock); - CHECK (0, hash_elts (em->session_index_by_vpp_handles), - "Some sessions are still open"); + CHECK_SAME (ECHO_FAIL_TEST_ASSERT_ALL_SESSIONS_CLOSED, + 0, hash_elts (em->session_index_by_vpp_handles), + "Some sessions are still open"); clib_spinlock_unlock (&em->sid_vpp_handles_lock); } @@ -61,7 +72,8 @@ echo_session_dequeue_notify (echo_session_t * s) if ((rv = app_send_io_evt_to_vpp (s->vpp_evt_q, s->rx_fifo->master_session_index, SESSION_IO_EVT_RX, SVM_Q_WAIT))) - ECHO_FAIL ("app_send_io_evt_to_vpp errored %d", rv); + ECHO_FAIL (ECHO_FAIL_SEND_IO_EVT, "app_send_io_evt_to_vpp errored %d", + rv); svm_fifo_clear_deq_ntf (s->rx_fifo); } @@ -83,13 +95,13 @@ connect_to_vpp (char *name) if (vl_socket_client_connect ((char *) em->socket_name, name, 0 /* default rx, tx buffer */ )) { - ECHO_FAIL ("socket connect failed"); + ECHO_FAIL (ECHO_FAIL_SOCKET_CONNECT, "socket connect failed"); return -1; } if (vl_socket_client_init_shm (0, 1 /* want_pthread */ )) { - ECHO_FAIL ("init shm api failed"); + ECHO_FAIL (ECHO_FAIL_INIT_SHM_API, "init shm api failed"); return -1; } } @@ -97,7 +109,7 @@ connect_to_vpp (char *name) { if (vl_client_connect_to_vlib ("/vpe-api", name, 32) < 0) { - ECHO_FAIL ("shmem connect failed"); + ECHO_FAIL (ECHO_FAIL_SHMEM_CONNECT, "shmem connect failed"); return -1; } } @@ -106,15 +118,6 @@ connect_to_vpp (char *name) return 0; } -static void -echo_event_didnt_happen (u8 e) -{ - echo_main_t *em = &echo_main; - u8 *s = format (0, "%U", echo_format_timing_event, e); - ECHO_LOG (0, "Expected event %s to happen, but it did not!", s); - em->has_failed = 1; -} - static void print_global_json_stats (echo_main_t * em) { @@ -123,22 +126,27 @@ print_global_json_stats (echo_main_t * em) u8 *end_evt = format (0, "%U", echo_format_timing_event, em->timing.end_event); u8 start_evt_missing = !(em->timing.events_sent & em->timing.start_event); - u8 end_evt_missing = !(em->timing.events_sent & em->timing.end_event); + u8 end_evt_missing = (em->rx_results_diff || em->tx_results_diff) ? 0 : + !(em->timing.events_sent & em->timing.end_event); f64 deltat = start_evt_missing || end_evt_missing ? 0 : em->timing.end_time - em->timing.start_time; if (start_evt_missing) - echo_event_didnt_happen (em->timing.start_event); + ECHO_FAIL (ECHO_FAIL_MISSING_START_EVENT, + "Expected event %v to happen, but it did not!", start_evt); + if (end_evt_missing) - echo_event_didnt_happen (em->timing.end_event); + ECHO_FAIL (ECHO_FAIL_MISSING_END_EVENT, + "Expected event %v to happen, but it did not!", end_evt); + fformat (stdout, "vpp_echo JSON stats:\n{\n"); fformat (stdout, " \"role\": \"%s\",\n", em->i_am_master ? "server" : "client"); fformat (stdout, " \"time\": \"%.9f\",\n", deltat); - fformat (stdout, " \"start_evt\": \"%s\",\n", start_evt); + fformat (stdout, " \"start_evt\": \"%v\",\n", start_evt); fformat (stdout, " \"start_evt_missing\": \"%s\",\n", start_evt_missing ? "True" : "False"); - fformat (stdout, " \"end_evt\": \"%s\",\n", end_evt); + fformat (stdout, " \"end_evt\": \"%v\",\n", end_evt); fformat (stdout, " \"end_evt_missing\": \"%s\",\n", end_evt_missing ? "True" : "False"); fformat (stdout, " \"rx_data\": %lld,\n", em->stats.rx_total); @@ -153,33 +161,42 @@ print_global_json_stats (echo_main_t * em) fformat (stdout, " \"clean\": { \"q\": %d, \"s\": %d }\n", em->stats.clean_count.q, em->stats.clean_count.s); fformat (stdout, " }\n"); + fformat (stdout, " \"results\": {\n"); + fformat (stdout, " \"has_failed\": \"%d\"\n", em->has_failed); + fformat (stdout, " \"fail_descr\": \"%v\"\n", em->fail_descr); + fformat (stdout, " }\n"); fformat (stdout, "}\n"); fflush (stdout); + vec_free (start_evt); + vec_free (end_evt); } static void print_global_stats (echo_main_t * em) { - u8 *s; + u8 *start_evt = + format (0, "%U", echo_format_timing_event, em->timing.start_event); + u8 *end_evt = + format (0, "%U", echo_format_timing_event, em->timing.end_event); u8 start_evt_missing = !(em->timing.events_sent & em->timing.start_event); - u8 end_evt_missing = !(em->timing.events_sent & em->timing.end_event); + u8 end_evt_missing = (em->rx_results_diff || em->tx_results_diff) ? 0 : + !(em->timing.events_sent & em->timing.end_event); f64 deltat = start_evt_missing || end_evt_missing ? 0 : em->timing.end_time - em->timing.start_time; if (start_evt_missing) - echo_event_didnt_happen (em->timing.start_event); + ECHO_FAIL (ECHO_FAIL_MISSING_START_EVENT, + "Expected event %v to happen, but it did not!", start_evt); + if (end_evt_missing) - echo_event_didnt_happen (em->timing.end_event); - s = format (0, "%U:%U", - echo_format_timing_event, em->timing.start_event, - echo_format_timing_event, em->timing.end_event); - fformat (stdout, "Timing %v\n", s); + ECHO_FAIL (ECHO_FAIL_MISSING_END_EVENT, + "Expected event %v to happen, but it did not!", end_evt); + + fformat (stdout, "Timing %v:%v\n", start_evt, end_evt); if (start_evt_missing) - fformat (stdout, "Missing Start Timing Event (%U)!\n", - echo_format_timing_event, em->timing.start_event); + fformat (stdout, "Missing Start Timing Event (%v)!\n", start_evt); if (end_evt_missing) - fformat (stdout, "Missing End Timing Event (%U)!\n", - echo_format_timing_event, em->timing.end_event); + fformat (stdout, "Missing End Timing Event (%v)!\n", end_evt); fformat (stdout, "-------- TX --------\n"); fformat (stdout, "%lld bytes (%lld mbytes, %lld gbytes) in %.6f seconds\n", em->stats.tx_total, em->stats.tx_total / (1ULL << 20), @@ -203,21 +220,25 @@ print_global_stats (echo_main_t * em) 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); + if (em->has_failed) + fformat (stdout, "\nFailure Return Status: %d\n%v", em->has_failed, + em->fail_descr); + vec_free (start_evt); + vec_free (end_evt); } void echo_update_count_on_session_close (echo_main_t * em, echo_session_t * s) { - ECHO_LOG (1, "[%lu/%lu] -> S(%x) -> [%lu/%lu]", + ECHO_LOG (1, "[%lu/%lu] -> %U -> [%lu/%lu]", s->bytes_received, s->bytes_received + s->bytes_to_receive, - s->session_index, s->bytes_sent, + echo_format_session, s, s->bytes_sent, s->bytes_sent + s->bytes_to_send); clib_atomic_fetch_add (&em->stats.tx_total, s->bytes_sent); clib_atomic_fetch_add (&em->stats.rx_total, s->bytes_received); - if (PREDICT_FALSE (em->stats.rx_total == - em->n_clients * em->bytes_to_receive)) + if (PREDICT_FALSE (em->stats.rx_total == em->stats.rx_expected)) echo_notify_event (em, ECHO_EVT_LAST_BYTE); } @@ -264,7 +285,7 @@ test_recv_bytes (echo_main_t * em, echo_session_t * s, u8 * rx_buf, if (em->max_test_msg == 0) ECHO_LOG (0, "Too many errors, hiding next ones"); if (em->test_return_packets == RETURN_PACKETS_ASSERT) - ECHO_FAIL ("test-bytes errored"); + ECHO_FAIL (ECHO_FAIL_TEST_BYTES_ERR, "test-bytes errored"); } } @@ -317,12 +338,23 @@ echo_check_closed_listener (echo_main_t * em, echo_session_t * s) echo_session_t *ls; /* if parent has died, terminate gracefully */ if (s->listener_index == SESSION_INVALID_INDEX) - return; + { + ECHO_LOG (2, "%U: listener_index == SESSION_INVALID_INDEX", + echo_format_session, s); + return; + } ls = pool_elt_at_index (em->sessions, s->listener_index); if (ls->session_state < ECHO_SESSION_STATE_CLOSING) - return; - ECHO_LOG (2, "Session 0%lx died, close child 0x%lx", ls->vpp_session_handle, - s->vpp_session_handle); + { + ECHO_LOG (3, "%U: ls->session_state (%d) < " + "ECHO_SESSION_STATE_CLOSING (%d)", + echo_format_session, ls, ls->session_state, + ECHO_SESSION_STATE_CLOSING); + return; + } + + ECHO_LOG (2, "%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 */ ); } @@ -336,7 +368,7 @@ echo_handle_data (echo_main_t * em, echo_session_t * s, u8 * rx_buf) int n_read, n_sent = 0; n_read = recv_data_chunk (em, s, rx_buf); - if (em->data_source == ECHO_TEST_DATA_SOURCE) + if ((em->data_source == ECHO_TEST_DATA_SOURCE) && s->bytes_to_send) n_sent = send_data_chunk (s, em->connect_test_data, s->bytes_sent % em->tx_buf_size, em->tx_buf_size); @@ -362,6 +394,8 @@ echo_handle_data (echo_main_t * em, echo_session_t * s, u8 * rx_buf) clib_atomic_fetch_add (&em->stats.clean_count.s, 1); } } + ECHO_LOG (2, "%U: %U", echo_format_session, s, + echo_format_session_state, s->session_state); return; } @@ -378,8 +412,8 @@ echo_handle_data (echo_main_t * em, echo_session_t * s, u8 * rx_buf) ECHO_LOG (1, "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, - s->session_state); + ECHO_LOG (1, "Session 0x%lx state %U", s->vpp_session_handle, + echo_format_session_state, s->session_state); } } } @@ -387,7 +421,7 @@ echo_handle_data (echo_main_t * em, echo_session_t * s, u8 * rx_buf) static void * echo_data_thread_fn (void *arg) { - clib_mem_set_thread_index (); + clib_mem_set_thread_index (); /* First thing to do in client thread */ echo_main_t *em = &echo_main; u32 N = em->n_clients; u32 n = (N + em->n_rx_threads - 1) / em->n_rx_threads; @@ -421,22 +455,40 @@ echo_data_thread_fn (void *arg) echo_check_closed_listener (em, s); break; case ECHO_SESSION_STATE_AWAIT_CLOSING: + ECHO_LOG (3, "%U: %U", echo_format_session, s, + echo_format_session_state, s->session_state); echo_check_closed_listener (em, s); break; case ECHO_SESSION_STATE_CLOSING: + ECHO_LOG (2, "%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_format_session_state, s->session_state); n_closed_sessions++; break; } if (n_closed_sessions == thread_n_sessions) break; } + ECHO_LOG (1, "Mission accomplished!"); pthread_exit (0); } +static void +session_unlisten_handler (session_unlisten_msg_t * mp) +{ + echo_session_t *listen_session; + echo_main_t *em = &echo_main; + listen_session = pool_elt_at_index (em->sessions, em->listen_session_index); + em->proto_cb_vft->cleanup_cb (listen_session, 0 /* parent_died */ ); + listen_session->session_state = ECHO_SESSION_STATE_CLOSED; + em->state = STATE_DISCONNECTED; +} + static void session_bound_handler (session_bound_msg_t * mp) { @@ -444,7 +496,7 @@ session_bound_handler (session_bound_msg_t * mp) echo_session_t *listen_session; if (mp->retval) { - ECHO_FAIL ("bind failed: %U", format_api_error, + ECHO_FAIL (ECHO_FAIL_BIND, "bind failed: %U", format_api_error, clib_net_to_host_u32 (mp->retval)); return; } @@ -471,15 +523,24 @@ session_accepted_handler (session_accepted_msg_t * mp) svm_fifo_t *rx_fifo, *tx_fifo; echo_main_t *em = &echo_main; echo_session_t *session, *ls; - /* Allocate local session and set it up */ - session = echo_session_new (em); + if (!(ls = echo_get_session_from_handle (em, mp->listener_handle))) + { + ECHO_FAIL (ECHO_FAIL_SESSION_ACCEPTED_BAD_LISTENER, + "Unknown listener handle 0x%lx", mp->listener_handle); + return; + } if (wait_for_segment_allocation (mp->segment_handle)) { - ECHO_FAIL ("wait_for_segment_allocation errored"); + ECHO_FAIL (ECHO_FAIL_ACCEPTED_WAIT_FOR_SEG_ALLOC, + "accepted wait_for_segment_allocation errored"); return; } + /* Allocate local session and set it up */ + session = echo_session_new (em); + session->vpp_session_handle = mp->handle; + rx_fifo = uword_to_pointer (mp->server_rx_fifo, svm_fifo_t *); rx_fifo->client_session_index = session->session_index; tx_fifo = uword_to_pointer (mp->server_tx_fifo, svm_fifo_t *); @@ -501,13 +562,12 @@ session_accepted_handler (session_accepted_msg_t * mp) session->start = clib_time_now (&em->clib_time); session->vpp_evt_q = uword_to_pointer (mp->vpp_event_queue_address, svm_msg_q_t *); - if (!(ls = echo_get_session_from_handle (em, mp->listener_handle))) - return; session->listener_index = ls->session_index; /* Add it to lookup table */ - ECHO_LOG (1, "Accepted session 0x%lx -> 0x%lx", mp->handle, - mp->listener_handle); + ECHO_LOG (1, "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); app_alloc_ctrl_evt_to_vpp (session->vpp_evt_q, app_evt, @@ -529,15 +589,18 @@ session_connected_handler (session_connected_msg_t * mp) if (mp->retval) { - ECHO_FAIL ("connection failed with code: %U", format_api_error, - clib_net_to_host_u32 (mp->retval)); + if (em->proto_cb_vft->connected_cb) + em-> + proto_cb_vft->connected_cb ((session_connected_bundled_msg_t *) mp, + listener_index, 1 /* is_failed */ ); return; } session = echo_session_new (em); if (wait_for_segment_allocation (mp->segment_handle)) { - ECHO_FAIL ("wait_for_segment_allocation errored"); + ECHO_FAIL (ECHO_FAIL_CONNECTED_WAIT_FOR_SEG_ALLOC, + "connected wait_for_segment_allocation errored"); return; } @@ -580,11 +643,21 @@ session_disconnected_handler (session_disconnected_msg_t * mp) session_disconnected_reply_msg_t *rmp; echo_main_t *em = &echo_main; echo_session_t *s; - ECHO_LOG (1, "passive close session 0x%lx", mp->handle); if (!(s = echo_get_session_from_handle (em, mp->handle))) - return; - em->proto_cb_vft->disconnected_cb (mp, s); - + { + ECHO_LOG (0, "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_format_session, s); + } + else + { + ECHO_LOG (1, "%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, SESSION_CTRL_EVT_DISCONNECTED_REPLY); rmp = (session_disconnected_reply_msg_t *) app_evt->evt->data; @@ -601,9 +674,12 @@ session_reset_handler (session_reset_msg_t * mp) echo_main_t *em = &echo_main; session_reset_reply_msg_t *rmp; echo_session_t *s = 0; - ECHO_LOG (1, "Reset session 0x%lx", mp->handle); if (!(s = echo_get_session_from_handle (em, mp->handle))) - return; + { + ECHO_LOG (0, "Invalid vpp_session_handle: 0x%lx", mp->handle); + return; + } + ECHO_LOG (1, "%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, @@ -620,20 +696,18 @@ 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; + return session_bound_handler ((session_bound_msg_t *) e->data); case SESSION_CTRL_EVT_ACCEPTED: - session_accepted_handler ((session_accepted_msg_t *) e->data); - break; + return session_accepted_handler ((session_accepted_msg_t *) e->data); case SESSION_CTRL_EVT_CONNECTED: - session_connected_handler ((session_connected_msg_t *) e->data); - break; + return session_connected_handler ((session_connected_msg_t *) e->data); case SESSION_CTRL_EVT_DISCONNECTED: - session_disconnected_handler ((session_disconnected_msg_t *) e->data); - break; + return session_disconnected_handler ((session_disconnected_msg_t *) + e->data); case SESSION_CTRL_EVT_RESET: - session_reset_handler ((session_reset_msg_t *) e->data); - break; + return session_reset_handler ((session_reset_msg_t *) e->data); + case SESSION_CTRL_EVT_UNLISTEN_REPLY: + return session_unlisten_handler ((session_unlisten_msg_t *) e->data); case SESSION_IO_EVT_RX: break; default: @@ -646,44 +720,83 @@ echo_process_rpcs (echo_main_t * em) { echo_rpc_msg_t *rpc; svm_msg_q_msg_t msg; + svm_msg_q_t *mq = em->rpc_msq_queue; + while (em->state < STATE_DATA_DONE && !em->time_to_stop) { - if (svm_msg_q_sub (em->rpc_msq_queue, &msg, SVM_Q_TIMEDWAIT, 1)) - continue; - rpc = svm_msg_q_msg_data (em->rpc_msq_queue, &msg); + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq) && svm_msg_q_timedwait (mq, 1)) + { + svm_msg_q_unlock (mq); + continue; + } + svm_msg_q_sub_w_lock (mq, &msg); + rpc = svm_msg_q_msg_data (mq, &msg); + svm_msg_q_unlock (mq); ((echo_rpc_t) rpc->fp) (rpc->arg, rpc->opaque); - svm_msg_q_free_msg (em->rpc_msq_queue, &msg); + svm_msg_q_free_msg (mq, &msg); } } +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) { - clib_mem_set_thread_index (); + clib_mem_set_thread_index (); /* First thing to do in client thread */ + svm_msg_q_msg_t *msg_vec = 0; echo_main_t *em = &echo_main; session_event_t *e; - svm_msg_q_msg_t msg; - int rv; + svm_msg_q_msg_t *msg; + svm_msg_q_t *mq; + int i; + + vec_validate (msg_vec, em->evt_q_size); + vec_reset_length (msg_vec); wait_for_state_change (em, STATE_ATTACHED, 0); - if (em->state < STATE_ATTACHED || !em->our_event_queue) + mq = em->app_mq; + if (em->state < STATE_ATTACHED || !mq) { - ECHO_FAIL ("Application failed to attach"); + ECHO_FAIL (ECHO_FAIL_APP_ATTACH, "Application failed to attach"); pthread_exit (0); } - while (1) + while (em->state < STATE_DETACHED && !em->time_to_stop) { - if (!(rv = svm_msg_q_sub (em->our_event_queue, - &msg, SVM_Q_TIMEDWAIT, 1))) + svm_msg_q_lock (mq); + if (svm_msg_q_is_empty (mq) && svm_msg_q_timedwait (mq, 1)) { - e = svm_msg_q_msg_data (em->our_event_queue, &msg); + svm_msg_q_unlock (mq); + continue; + } + echo_mq_dequeue_batch (mq, msg_vec, ~0); + svm_msg_q_unlock (mq); + + for (i = 0; i < vec_len (msg_vec); i++) + { + msg = vec_elt_at_index (msg_vec, i); + e = svm_msg_q_msg_data (mq, msg); handle_mq_event (e); - svm_msg_q_free_msg (em->our_event_queue, &msg); + svm_msg_q_free_msg (mq, msg); /* No lock, single thread dequeuing */ } - if (rv == ETIMEDOUT - && (em->time_to_stop || em->state == STATE_DETACHED)) - break; + vec_reset_length (msg_vec); } + vec_free (msg_vec); pthread_exit (0); } @@ -693,7 +806,7 @@ clients_run (echo_main_t * em) u64 i; echo_notify_event (em, ECHO_EVT_FIRST_QCONNECT); for (i = 0; i < em->n_connects; i++) - echo_send_connect (em->uri, SESSION_INVALID_INDEX); + echo_send_connect (SESSION_INVALID_HANDLE, SESSION_INVALID_INDEX); wait_for_state_change (em, STATE_READY, 0); ECHO_LOG (1, "App is ready"); echo_process_rpcs (em); @@ -702,15 +815,19 @@ clients_run (echo_main_t * em) static void server_run (echo_main_t * em) { + echo_session_t *ls; echo_send_listen (em); wait_for_state_change (em, STATE_READY, 0); ECHO_LOG (1, "App is ready"); echo_process_rpcs (em); /* Cleanup */ - echo_send_unbind (em); + ECHO_LOG (1, "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)) { - ECHO_FAIL ("Timeout waiting for state disconnected"); + ECHO_FAIL (ECHO_FAIL_SERVER_DISCONNECT_TIMEOUT, + "Timeout waiting for state disconnected"); return; } } @@ -728,8 +845,9 @@ print_usage_and_exit (void) " 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 Use N Kb fifos\n" - " rx-buf N Use N Kb RX buffer\n" - " tx-buf N Use N Kb TX test buffer\n" + " mq-size N Use N event slots for vpp_echo <-> vpp events\n" + " rx-buf N[Kb|Mb|GB] Use N[Kb|Mb|GB] RX buffer\n" + " tx-buf N[Kb|Mb|GB] Use N[Kb|Mb|GB] TX test buffer\n" " appns NAMESPACE Use the namespace NAMESPACE\n" " all-scope all-scope option\n" " local-scope local-scope option\n" @@ -746,6 +864,8 @@ print_usage_and_exit (void) " sconnected - last Stream got connected\n" " lastbyte - Last expected byte received\n" " exit - Exiting of the app\n" + " rx-results-diff Rx results different to pass test\n" + " tx-results-diff Tx results different to pass test\n" " json Output global stats in json\n" " log=N Set the log level to [0: no output, 1:errors, 2:log]\n" "\n" @@ -762,7 +882,7 @@ print_usage_and_exit (void) fprintf (stderr, "\nDefault configuration is :\n" " server nclients 1/1 RX=64Kb TX=RX\n" " client nclients 1/1 RX=64Kb TX=64Kb\n"); - exit (1); + exit (ECHO_FAIL_USAGE); } static int @@ -825,10 +945,16 @@ echo_process_opts (int argc, char **argv) em->use_sock_api = 0; else if (unformat (a, "fifo-size %d", &tmp)) em->fifo_size = tmp << 10; - else if (unformat (a, "rx-buf %d", &tmp)) - em->rx_buf_size = tmp << 10; - else if (unformat (a, "tx-buf %d", &tmp)) - em->rx_buf_size = tmp << 10; + else if (unformat (a, "prealloc-fifos %u", &em->prealloc_fifo_pairs)) + ; + else + if (unformat (a, "rx-buf %U", unformat_data_size, &em->rx_buf_size)) + ; + else + if (unformat (a, "tx-buf %U", unformat_data_size, &em->tx_buf_size)) + ; + else if (unformat (a, "mq-size %d", &em->evt_q_size)) + ; else if (unformat (a, "nclients %d", &em->n_clients)) { em->n_sessions = em->n_clients + 1; @@ -836,6 +962,11 @@ echo_process_opts (int argc, char **argv) } else if (unformat (a, "nthreads %d", &em->n_rx_threads)) ; + else + if (unformat + (a, "crypto %U", echo_unformat_crypto_engine, + &em->crypto_ctx_engine)) + ; else if (unformat (a, "appns %_%v%_", &em->appns_id)) ; else if (unformat (a, "all-scope")) @@ -849,12 +980,19 @@ echo_process_opts (int argc, char **argv) ; else if (unformat (a, "TX=RX")) em->data_source = ECHO_RX_DATA_SOURCE; - else if (unformat (a, "TX=%U", unformat_data, &em->bytes_to_send)) + else if (unformat (a, "TX=%U", unformat_data_size, &em->bytes_to_send)) ; - else if (unformat (a, "RX=%U", unformat_data, &em->bytes_to_receive)) + else if (unformat (a, "RX=%U", unformat_data_size, + &em->bytes_to_receive)) ; + else if (unformat (a, "rx-results-diff")) + em->rx_results_diff = 1; + else if (unformat (a, "tx-results-diff")) + em->tx_results_diff = 1; else if (unformat (a, "json")) em->output_json = 1; + else if (unformat (a, "wait-for-gdb")) + em->wait_for_gdb = 1; else if (unformat (a, "log=%d", &em->log_lvl)) ; else if (unformat (a, "sclose=%U", @@ -895,6 +1033,16 @@ echo_process_opts (int argc, char **argv) em->bytes_to_receive == 0 ? ECHO_CLOSE_F_PASSIVE : ECHO_CLOSE_F_ACTIVE; if (em->send_stream_disconnects == ECHO_CLOSE_F_INVALID) em->send_stream_disconnects = default_f_active; + + if (em->wait_for_gdb) + { + volatile u64 nop = 0; + + clib_warning ("Waiting for gdb..."); + while (em->wait_for_gdb) + nop++; + clib_warning ("Resuming execution (%llu)!", nop); + } } void @@ -915,7 +1063,7 @@ echo_process_uri (echo_main_t * em) &em->uri_elts.ip.ip6, &port)) em->uri_elts.is_ip4 = 0; else - ECHO_FAIL ("Unable to process uri"); + ECHO_FAIL (ECHO_FAIL_INVALID_URI, "Unable to process uri"); em->uri_elts.port = clib_host_to_net_u16 (port); unformat_free (input); } @@ -946,6 +1094,7 @@ main (int argc, char **argv) em->socket_name = format (0, "%s%c", API_SOCKET_FILE, 0); em->use_sock_api = 1; em->fifo_size = 64 << 10; + em->prealloc_fifo_pairs = 16; em->n_clients = 1; em->n_connects = 1; em->n_sessions = 2; @@ -953,6 +1102,7 @@ main (int argc, char **argv) em->time_to_stop = 0; em->i_am_master = 1; em->n_rx_threads = 4; + em->evt_q_size = 256; em->test_return_packets = RETURN_PACKETS_NOTEST; em->timing.start_event = ECHO_EVT_FIRST_QCONNECT; em->timing.end_event = ECHO_EVT_LAST_BYTE; @@ -962,19 +1112,24 @@ main (int argc, char **argv) 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->crypto_ctx_engine = CRYPTO_ENGINE_NONE; echo_set_each_proto_defaults_before_opts (em); echo_process_opts (argc, argv); echo_process_uri (em); em->proto_cb_vft = em->available_proto_cb_vft[em->uri_elts.transport_proto]; if (!em->proto_cb_vft) { - ECHO_FAIL ("Protocol %U is not supported", + ECHO_FAIL (ECHO_FAIL_PROTOCOL_NOT_SUPPORTED, + "Protocol %U is not supported", format_transport_proto, em->uri_elts.transport_proto); - exit (1); + goto exit_on_error; } if (em->proto_cb_vft->set_defaults_after_opts_cb) em->proto_cb_vft->set_defaults_after_opts_cb (); + em->stats.rx_expected = em->bytes_to_receive * em->n_clients; + em->stats.tx_expected = em->bytes_to_send * em->n_clients; + vec_validate (em->data_thread_handles, em->n_rx_threads); vec_validate (em->data_thread_args, em->n_clients); for (i = 0; i < em->n_clients; i++) @@ -1006,61 +1161,83 @@ main (int argc, char **argv) if (connect_to_vpp (app_name)) { svm_region_exit (); - ECHO_FAIL ("Couldn't connect to vpe, exiting...\n"); - exit (1); + ECHO_FAIL (ECHO_FAIL_CONNECT_TO_VPP, "Couldn't connect to vpp"); + goto exit_on_error; } echo_session_prealloc (em); echo_notify_event (em, ECHO_EVT_START); echo_send_attach (em); - if (wait_for_state_change (em, STATE_ATTACHED, TIMEOUT)) + if (wait_for_state_change (em, STATE_ATTACHED_NO_CERT, TIMEOUT)) { - ECHO_FAIL ("Couldn't attach to vpp, did you run ?\n"); - exit (1); + ECHO_FAIL (ECHO_FAIL_ATTACH_TO_VPP, + "Couldn't attach to vpp, did you run ?"); + goto exit_on_error; } + + if (em->crypto_ctx_engine == CRYPTO_ENGINE_NONE) + /* when no crypto engine specified, dont expect crypto ctx */ + em->state = STATE_ATTACHED; + else + { + ECHO_LOG (1, "Adding crypto context %U", echo_format_crypto_engine, + em->crypto_ctx_engine); + echo_send_add_crypto_ctx (em); + if (wait_for_state_change (em, STATE_ATTACHED, TIMEOUT)) + { + ECHO_FAIL (ECHO_FAIL_APP_ATTACH, + "Couldn't add crypto context to vpp\n"); + exit (1); + } + } + if (pthread_create (&em->mq_thread_handle, NULL /*attr */ , echo_mq_thread_fn, 0)) { - ECHO_FAIL ("pthread create errored\n"); - exit (1); + ECHO_FAIL (ECHO_FAIL_PTHREAD_CREATE, "pthread create errored"); + goto exit_on_error; } + for (i = 0; i < em->n_rx_threads; i++) if (pthread_create (&em->data_thread_handles[i], NULL /*attr */ , echo_data_thread_fn, (void *) i)) { - ECHO_FAIL ("pthread create errored\n"); - exit (1); + ECHO_FAIL (ECHO_FAIL_PTHREAD_CREATE, + "pthread create errored (index %d)", i); + goto exit_on_error; } if (em->i_am_master) server_run (em); else clients_run (em); echo_notify_event (em, ECHO_EVT_EXIT); - if (em->output_json) - print_global_json_stats (em); - else - print_global_stats (em); echo_free_sessions (em); - echo_assert_test_suceeded (em); echo_send_detach (em); if (wait_for_state_change (em, STATE_DETACHED, TIMEOUT)) { - ECHO_FAIL ("ECHO-ERROR: Couldn't detach from vpp, exiting...\n"); - exit (1); + ECHO_FAIL (ECHO_FAIL_DETACH, "Couldn't detach from vpp"); + goto exit_on_error; } int *rv; pthread_join (em->mq_thread_handle, (void **) &rv); if (rv) { - ECHO_FAIL ("mq pthread errored %d", rv); - exit (1); + ECHO_FAIL (ECHO_FAIL_MQ_PTHREAD, "mq pthread errored %d", rv); + goto exit_on_error; } if (em->use_sock_api) vl_socket_client_disconnect (); else vl_client_disconnect_from_vlib (); + echo_assert_test_suceeded (em); +exit_on_error: ECHO_LOG (0, "Test complete !\n"); + if (em->output_json) + print_global_json_stats (em); + else + print_global_stats (em); + vec_free (em->fail_descr); exit (em->has_failed); }