X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fplugins%2Fhs_apps%2Fsapi%2Fvpp_echo_common.c;h=60ea5a1321401f48b9078f9e2108790a0f3702b8;hp=03ed278d497436228c7e8f036ded3f60ee66151f;hb=07063b8ea;hpb=0e402a98b20fbb7c5b715abd038c244c539bad36 diff --git a/src/plugins/hs_apps/sapi/vpp_echo_common.c b/src/plugins/hs_apps/sapi/vpp_echo_common.c index 03ed278d497..60ea5a13214 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_common.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_common.c @@ -113,30 +113,6 @@ format_ip46_address (u8 * s, va_list * args) format (s, "%U", format_ip6_address, &ip46->ip6); } -uword -unformat_data (unformat_input_t * input, va_list * args) -{ - u64 _a; - u64 *a = va_arg (*args, u64 *); - if (unformat (input, "%lluGb", &_a)) - *a = _a << 30; - else if (unformat (input, "%lluG", &_a)) - *a = _a << 30; - else if (unformat (input, "%lluMb", &_a)) - *a = _a << 20; - else if (unformat (input, "%lluM", &_a)) - *a = _a << 20; - else if (unformat (input, "%lluKb", &_a)) - *a = _a << 10; - else if (unformat (input, "%lluK", &_a)) - *a = _a << 10; - else if (unformat (input, "%llu", a)) - ; - else - return 0; - return 1; -} - u8 * format_api_error (u8 * s, va_list * args) { @@ -166,26 +142,81 @@ init_error_string_table () hash_set (em->error_string_by_error_number, 99, "Misc"); } +u8 * +echo_format_session (u8 * s, va_list * args) +{ + echo_session_t *session = va_arg (*args, echo_session_t *); + + return format (s, "%U 0x%lx S[%u]", echo_format_session_type, + session->session_type, session->vpp_session_handle, + session->session_index); +} + +u8 * +echo_format_session_type (u8 * s, va_list * args) +{ + u32 session_type = va_arg (*args, u32); + switch (session_type) + { + case ECHO_SESSION_TYPE_QUIC: + return format (s, "Qsession"); + case ECHO_SESSION_TYPE_STREAM: + return format (s, "Stream"); + case ECHO_SESSION_TYPE_LISTEN: + return format (s, "Lsession"); + default: + break; + } + return format (s, "BadSession"); +} + +u8 * +echo_format_session_state (u8 * s, va_list * args) +{ + u32 session_state = va_arg (*args, u32); + switch (session_state) + { + case ECHO_SESSION_STATE_INITIAL: + return format (s, "ECHO_SESSION_STATE_INITIAL (%u)", session_state); + case ECHO_SESSION_STATE_READY: + return format (s, "ECHO_SESSION_STATE_READY (%u)", session_state); + case ECHO_SESSION_STATE_AWAIT_CLOSING: + return format (s, "ECHO_SESSION_STATE_AWAIT_CLOSING (%u)", + session_state); + case ECHO_SESSION_STATE_AWAIT_DATA: + return format (s, "ECHO_SESSION_STATE_AWAIT_DATA (%u)", session_state); + case ECHO_SESSION_STATE_CLOSING: + return format (s, "ECHO_SESSION_STATE_CLOSING (%u)", session_state); + case ECHO_SESSION_STATE_CLOSED: + return format (s, "ECHO_SESSION_STATE_CLOSED (%u)", session_state); + default: + break; + } + return format (s, "unknown session state (%u)", session_state); +} + u8 * echo_format_app_state (u8 * s, va_list * args) { u32 state = va_arg (*args, u32); if (state == STATE_START) - return format (s, "STATE_START"); + return format (s, "STATE_START (%u)", state); if (state == STATE_ATTACHED) - return format (s, "STATE_ATTACHED"); + return format (s, "STATE_ATTACHED (%u)", state); + if (state == STATE_ATTACHED_NO_CERT) + return format (s, "STATE_ATTACHED_NO_CERT (%u)", state); if (state == STATE_LISTEN) - return format (s, "STATE_LISTEN"); + return format (s, "STATE_LISTEN (%u)", state); if (state == STATE_READY) - return format (s, "STATE_READY"); + return format (s, "STATE_READY (%u)", state); if (state == STATE_DATA_DONE) - return format (s, "STATE_DATA_DONE"); + return format (s, "STATE_DATA_DONE (%u)", state); if (state == STATE_DISCONNECTED) - return format (s, "STATE_DISCONNECTED"); + return format (s, "STATE_DISCONNECTED (%u)", state); if (state == STATE_DETACHED) - return format (s, "STATE_DETACHED"); + return format (s, "STATE_DETACHED (%u)", state); else - return format (s, "unknown state"); + return format (s, "unknown state (%u)", state); } uword @@ -226,6 +257,20 @@ echo_unformat_timing_event (unformat_input_t * input, va_list * args) return 1; } +u8 * +echo_format_bytes_per_sec (u8 * s, va_list * args) +{ + f64 bps = va_arg (*args, f64) * 8; + if (bps > 1e9) + return format (s, "%.3f Gb/s", bps / 1e9); + else if (bps > 1e6) + return format (s, "%.3f Mb/s", bps / 1e6); + else if (bps > 1e3) + return format (s, "%.3f Kb/s", bps / 1e3); + else + return format (s, "%.3f b/s", bps); +} + u8 * echo_format_timing_event (u8 * s, va_list * args) { @@ -264,10 +309,6 @@ unformat_transport_proto (unformat_input_t * input, va_list * args) *proto = TRANSPORT_PROTO_UDP; else if (unformat (input, "UDP")) *proto = TRANSPORT_PROTO_UDP; - else if (unformat (input, "sctp")) - *proto = TRANSPORT_PROTO_SCTP; - else if (unformat (input, "SCTP")) - *proto = TRANSPORT_PROTO_SCTP; else if (unformat (input, "tls")) *proto = TRANSPORT_PROTO_TLS; else if (unformat (input, "TLS")) @@ -293,9 +334,6 @@ format_transport_proto (u8 * s, va_list * args) case TRANSPORT_PROTO_UDP: s = format (s, "UDP"); break; - case TRANSPORT_PROTO_SCTP: - s = format (s, "SCTP"); - break; case TRANSPORT_PROTO_NONE: s = format (s, "NONE"); break; @@ -426,6 +464,54 @@ unformat_ip6_address (unformat_input_t * input, va_list * args) } } +uword +unformat_ip46_address (unformat_input_t * input, va_list * args) +{ + ip46_address_t *ip = va_arg (*args, ip46_address_t *); + + if (unformat (input, "%U", unformat_ip4_address, &ip->ip4)) + ; + else if (unformat (input, "%U", unformat_ip6_address, &ip->ip6)) + ; + else + return 0; + return 1; +} + +u8 * +echo_format_crypto_engine (u8 * s, va_list * args) +{ + u32 state = va_arg (*args, u32); + if (state == CRYPTO_ENGINE_MBEDTLS) + return format (s, "mbedtls"); + if (state == CRYPTO_ENGINE_OPENSSL) + return format (s, "openssl"); + if (state == CRYPTO_ENGINE_PICOTLS) + return format (s, "picotls"); + if (state == CRYPTO_ENGINE_VPP) + return format (s, "vpp"); + else + return format (s, "unknown crypto engine"); +} + +uword +echo_unformat_crypto_engine (unformat_input_t * input, va_list * args) +{ + u8 *a = va_arg (*args, u8 *); + if (unformat (input, "mbedtls")) + *a = CRYPTO_ENGINE_MBEDTLS; + else if (unformat (input, "openssl")) + *a = CRYPTO_ENGINE_OPENSSL; + else if (unformat (input, "picotls")) + *a = CRYPTO_ENGINE_PICOTLS; + else if (unformat (input, "vpp")) + *a = CRYPTO_ENGINE_VPP; + else + return 0; + return 1; +} + + /* * * End of format functions @@ -437,48 +523,48 @@ echo_session_handle_add_del (echo_main_t * em, u64 handle, u32 sid) { clib_spinlock_lock (&em->sid_vpp_handles_lock); if (sid == SESSION_INVALID_INDEX) - hash_unset (em->session_index_by_vpp_handles, handle); + { + ECHO_LOG (3, "hash_unset(0x%lx)", handle); + hash_unset (em->session_index_by_vpp_handles, handle); + } else - hash_set (em->session_index_by_vpp_handles, handle, sid); + { + ECHO_LOG (3, "hash_set(0x%lx) S[%d]", handle, sid); + hash_set (em->session_index_by_vpp_handles, handle, sid); + } clib_spinlock_unlock (&em->sid_vpp_handles_lock); } echo_session_t * echo_session_new (echo_main_t * em) { - /* thread safe new prealloced session */ + /* thread safe new prealloced session + * see echo_session_prealloc */ return pool_elt_at_index (em->sessions, clib_atomic_fetch_add (&em->nxt_available_sidx, 1)); } int -echo_send_rpc (echo_main_t * em, void *fp, void *arg, u32 opaque) +echo_send_rpc (echo_main_t * em, void *fp, echo_rpc_args_t * args) { svm_msg_q_msg_t msg; echo_rpc_msg_t *evt; if (PREDICT_FALSE (svm_msg_q_lock (em->rpc_msq_queue))) { - ECHO_LOG (1, "RPC lock failed"); + ECHO_FAIL (ECHO_FAIL_RPC_SIZE, "RPC lock failed"); return -1; } if (PREDICT_FALSE (svm_msg_q_ring_is_full (em->rpc_msq_queue, 0))) { svm_msg_q_unlock (em->rpc_msq_queue); - ECHO_LOG (1, "RPC ring is full"); + ECHO_FAIL (ECHO_FAIL_RPC_SIZE, "RPC ring is full"); return -2; } msg = svm_msg_q_alloc_msg_w_ring (em->rpc_msq_queue, 0); - if (PREDICT_FALSE (svm_msg_q_msg_is_invalid (&msg))) - { - ECHO_LOG (1, "RPC msg is invalid"); - svm_msg_q_unlock (em->rpc_msq_queue); - return -2; - } evt = (echo_rpc_msg_t *) svm_msg_q_msg_data (em->rpc_msq_queue, &msg); - evt->arg = arg; - evt->opaque = opaque; evt->fp = fp; + clib_memcpy (&evt->args, args, sizeof (evt->args)); svm_msg_q_add_and_unlock (em->rpc_msq_queue, &msg); return 0; @@ -493,35 +579,12 @@ echo_get_session_from_handle (echo_main_t * em, u64 handle) clib_spinlock_unlock (&em->sid_vpp_handles_lock); if (!p) { - ECHO_FAIL (ECHO_FAIL_GET_SESSION_FROM_HANDLE, - "unknown handle 0x%lx", handle); + ECHO_LOG (2, "unknown handle 0x%lx", handle); return 0; } return pool_elt_at_index (em->sessions, p[0]); } -int -wait_for_segment_allocation (u64 segment_handle) -{ - echo_main_t *em = &echo_main; - f64 timeout; - timeout = clib_time_now (&em->clib_time) + TIMEOUT; - uword *segment_present; - ECHO_LOG (1, "Waiting for segment 0x%lx...", segment_handle); - while (clib_time_now (&em->clib_time) < timeout) - { - clib_spinlock_lock (&em->segment_handles_lock); - segment_present = hash_get (em->shared_segment_handles, segment_handle); - clib_spinlock_unlock (&em->segment_handles_lock); - if (segment_present != 0) - return 0; - if (em->time_to_stop == 1) - return 0; - } - ECHO_LOG (1, "timeout wait_for_segment_allocation (0x%lx)", segment_handle); - return -1; -} - int wait_for_state_change (echo_main_t * em, connection_state_t state, f64 timeout) @@ -534,7 +597,7 @@ wait_for_state_change (echo_main_t * em, connection_state_t state, if (em->time_to_stop) return 1; } - ECHO_LOG (1, "timeout waiting for %U", echo_format_app_state, state); + ECHO_LOG (2, "timeout waiting for %U", echo_format_app_state, state); return -1; } @@ -554,7 +617,7 @@ void echo_session_print_stats (echo_main_t * em, echo_session_t * session) { f64 deltat = clib_time_now (&em->clib_time) - session->start; - ECHO_LOG (0, "Session 0x%x done in %.6fs RX[%.4f] TX[%.4f] Gbit/s\n", + ECHO_LOG (1, "Session 0x%x done in %.6fs RX[%.4f] TX[%.4f] Gbit/s\n", session->vpp_session_handle, deltat, (session->bytes_received * 8.0) / deltat / 1e9, (session->bytes_sent * 8.0) / deltat / 1e9);