X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_cli.c;h=ea6e635715f685a8051b0d0a53957fbddb4f4da2;hb=ad9d528;hp=3423026147cc7b084515bd664e59af727eabd379;hpb=82d8ec2571720310f0a7c41deeba30534be28ed0;p=vpp.git diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c index 3423026147c..ea6e635715f 100755 --- a/src/vnet/session/session_cli.c +++ b/src/vnet/session/session_cli.c @@ -16,21 +16,26 @@ #include u8 * -format_stream_session_fifos (u8 * s, va_list * args) +format_session_fifos (u8 * s, va_list * args) { stream_session_t *ss = va_arg (*args, stream_session_t *); int verbose = va_arg (*args, int); - session_fifo_event_t _e, *e = &_e; + session_event_t _e, *e = &_e; u8 found; - s = format (s, " Rx fifo: %U", format_svm_fifo, ss->server_rx_fifo, 1); + if (!ss->server_rx_fifo || !ss->server_tx_fifo) + return s; + + s = format (s, " Rx fifo: %U", format_svm_fifo, ss->server_rx_fifo, + verbose); if (verbose > 2 && ss->server_rx_fifo->has_event) { found = session_node_lookup_fifo_event (ss->server_rx_fifo, e); s = format (s, " session node event: %s\n", found ? "found" : "not found"); } - s = format (s, " Tx fifo: %U", format_svm_fifo, ss->server_tx_fifo, 1); + s = format (s, " Tx fifo: %U", format_svm_fifo, ss->server_tx_fifo, + verbose); if (verbose > 2 && ss->server_tx_fifo->has_event) { found = session_node_lookup_fifo_event (ss->server_tx_fifo, e); @@ -53,34 +58,34 @@ format_stream_session (u8 * s, va_list * args) { stream_session_t *ss = va_arg (*args, stream_session_t *); int verbose = va_arg (*args, int); - transport_proto_vft_t *tp_vft; + u32 tp = session_get_transport_proto (ss); u8 *str = 0; - tp_vft = transport_protocol_get_vft (ss->session_type); if (verbose == 1 && ss->session_state >= SESSION_STATE_ACCEPTING) - str = format (0, "%-10u%-10u%-10lld", + str = format (0, "%-10u%-10u", svm_fifo_max_dequeue (ss->server_rx_fifo), - svm_fifo_max_enqueue (ss->server_tx_fifo), - stream_session_get_index (ss)); + svm_fifo_max_dequeue (ss->server_tx_fifo)); if (ss->session_state >= SESSION_STATE_ACCEPTING) { - s = format (s, "%U", tp_vft->format_connection, ss->connection_index, - ss->thread_index, verbose); + s = format (s, "%U", format_transport_connection, tp, + ss->connection_index, ss->thread_index, verbose); if (verbose == 1) s = format (s, "%v", str); if (verbose > 1) - s = format (s, "%U", format_stream_session_fifos, ss, verbose); + s = format (s, "%U", format_session_fifos, ss, verbose); } else if (ss->session_state == SESSION_STATE_LISTENING) { - s = format (s, "%-40U%v", tp_vft->format_listener, ss->connection_index, - str); + s = format (s, "%-40U%v", format_transport_listen_connection, + tp, ss->connection_index, str); + if (verbose > 1) + s = format (s, "\n%U", format_session_fifos, ss, verbose); } else if (ss->session_state == SESSION_STATE_CONNECTING) { - s = format (s, "%-40U%v", tp_vft->format_half_open, - ss->connection_index, str); + s = format (s, "%-40U%v", format_transport_half_open_connection, + tp, ss->connection_index, str); } else { @@ -102,8 +107,8 @@ unformat_stream_session_id (unformat_input_t * input, va_list * args) u8 *is_ip4 = va_arg (*args, u8 *); u8 tuple_is_set = 0; - memset (lcl, 0, sizeof (*lcl)); - memset (rmt, 0, sizeof (*rmt)); + clib_memset (lcl, 0, sizeof (*lcl)); + clib_memset (rmt, 0, sizeof (*rmt)); if (unformat (input, "tcp")) { @@ -199,11 +204,14 @@ static clib_error_t * show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { + u8 *str = 0, one_session = 0, do_listeners = 0, sst, do_elog = 0; session_manager_main_t *smm = &session_manager_main; - u8 *str = 0, one_session = 0, do_listeners = 0, sst, *app_name; - int verbose = 0, i; + u32 transport_proto = ~0, track_index; stream_session_t *pool, *s; - u32 transport_proto = ~0; + transport_connection_t *tc; + app_worker_t *app_wrk; + int verbose = 0, i; + const u8 *app_name; if (!smm->is_enabled) { @@ -223,6 +231,8 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, { one_session = 1; } + else if (unformat (input, "elog")) + do_elog = 1; else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input); @@ -230,35 +240,46 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, if (one_session) { - vlib_cli_output (vm, "%U", format_stream_session, s, 3); + str = format (0, "%U", format_stream_session, s, 3); + if (do_elog && s->session_state != SESSION_STATE_LISTENING) + { + elog_main_t *em = &vm->elog_main; + f64 dt; + + tc = session_get_transport (s); + track_index = transport_elog_track_index (tc); + dt = (em->init_time.cpu - vm->clib_time.init_cpu_time) + * vm->clib_time.seconds_per_clock; + if (track_index != ~0) + str = format (str, " session elog:\n%U", format_elog_track, em, + dt, track_index); + } + vlib_cli_output (vm, "%v", str); return 0; } if (do_listeners) { sst = session_type_from_proto_and_ip (transport_proto, 1); - vlib_cli_output (vm, "There are %d active %U listeners", - pool_elts (smm->listen_sessions[sst]), - format_transport_proto, transport_proto); - if (verbose) - { - vlib_cli_output (vm, "%-40s%-24s%-10s", "Listener", "App", "S-idx"); - /* *INDENT-OFF* */ - pool_foreach (s, smm->listen_sessions[sst], ({ - app_name = application_name_from_index (s->app_index); - vlib_cli_output (vm, "%U%-25v%-10u", format_stream_session, s, 1, - app_name, s->session_index); - vec_free (app_name); - })); - /* *INDENT-ON* */ - } + vlib_cli_output (vm, "%-40s%-24s", "Listener", "App"); + /* *INDENT-OFF* */ + pool_foreach (s, smm->wrk[0].sessions, ({ + if (s->session_state != SESSION_STATE_LISTENING + || s->session_type != sst) + continue; + app_wrk = app_worker_get (s->app_wrk_index); + app_name = application_name_from_index (app_wrk->app_index); + vlib_cli_output (vm, "%U%-25v%", format_stream_session, s, 1, + app_name); + })); + /* *INDENT-ON* */ return 0; } - for (i = 0; i < vec_len (smm->sessions); i++) + for (i = 0; i < vec_len (smm->wrk); i++) { u32 once_per_pool; - pool = smm->sessions[i]; + pool = smm->wrk[i].sessions; once_per_pool = 1; @@ -271,9 +292,8 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input, { if (once_per_pool && verbose == 1) { - str = format (str, "%-50s%-15s%-10s%-10s%-10s", - "Connection", "State", "Rx-f", "Tx-f", - "S-idx"); + str = format (str, "%-50s%-15s%-10s%-10s", + "Connection", "State", "Rx-f", "Tx-f"); vlib_cli_output (vm, "%v", str); vec_reset_length (str); once_per_pool = 0; @@ -310,7 +330,8 @@ VLIB_CLI_COMMAND (vlib_cli_show_session_command) = static int clear_session (stream_session_t * s) { - application_t *server = application_get (s->app_index); + app_worker_t *server_wrk = app_worker_get (s->app_wrk_index); + application_t *server = application_get (server_wrk->app_index); server->cb_fns.session_disconnect_callback (s); return 0; } @@ -321,8 +342,9 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input, { session_manager_main_t *smm = &session_manager_main; u32 thread_index = 0, clear_all = 0; + session_manager_worker_t *wrk; u32 session_index = ~0; - stream_session_t **pool, *session; + stream_session_t *session; if (!smm->is_enabled) { @@ -357,9 +379,9 @@ clear_session_command_fn (vlib_main_t * vm, unformat_input_t * input, if (clear_all) { /* *INDENT-OFF* */ - vec_foreach (pool, smm->sessions) + vec_foreach (wrk, smm->wrk) { - pool_foreach(session, *pool, ({ + pool_foreach(session, wrk->sessions, ({ clear_session (session); })); };