return s;
s = format (s, " Rx fifo: %U", format_svm_fifo, ss->rx_fifo, verbose);
- if (verbose > 2 && ss->rx_fifo->has_event)
+ if (verbose > 2 && ss->rx_fifo->shr->has_event)
{
found = session_node_lookup_fifo_event (ss->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->tx_fifo, verbose);
- if (verbose > 2 && ss->tx_fifo->has_event)
+ if (verbose > 2 && ss->tx_fifo->shr->has_event)
{
found = session_node_lookup_fifo_event (ss->tx_fifo, e);
s = format (s, " session node event: %s\n",
return s;
}
+const char *session_state_str[] = {
+#define _(sym, str) str,
+ foreach_session_state
+#undef _
+};
+
+u8 *
+format_session_state (u8 * s, va_list * args)
+{
+ session_t *ss = va_arg (*args, session_t *);
+
+ if (ss->session_state < SESSION_N_STATES)
+ s = format (s, "%s", session_state_str[ss->session_state]);
+ else
+ s = format (s, "UNKNOWN STATE (%d)", ss->session_state);
+
+ return s;
+}
+
+const char *session_flags_str[] = {
+#define _(sym, str) str,
+ foreach_session_flag
+#undef _
+};
+
+u8 *
+format_session_flags (u8 * s, va_list * args)
+{
+ session_t *ss = va_arg (*args, session_t *);
+ int i, last = -1;
+
+ for (i = 0; i < SESSION_N_FLAGS; i++)
+ if (ss->flags & (1 << i))
+ last = i;
+
+ for (i = 0; i < last; i++)
+ {
+ if (ss->flags & (1 << i))
+ s = format (s, "%s, ", session_flags_str[i]);
+ }
+ if (last >= 0)
+ s = format (s, "%s", session_flags_str[last]);
+
+ return s;
+}
+
/**
* Format stream session as per the following format
*
if (verbose == 1)
{
- u8 post_accept = ss->session_state >= SESSION_STATE_ACCEPTING;
- u8 hasf = post_accept
- || session_transport_service_type (ss) == TRANSPORT_SERVICE_CL;
u32 rxf, txf;
- rxf = hasf ? svm_fifo_max_dequeue (ss->rx_fifo) : 0;
- txf = hasf ? svm_fifo_max_dequeue (ss->tx_fifo) : 0;
+ rxf = ss->rx_fifo ? svm_fifo_max_dequeue (ss->rx_fifo) : 0;
+ txf = ss->tx_fifo ? svm_fifo_max_dequeue (ss->tx_fifo) : 0;
str = format (0, "%-10u%-10u", rxf, txf);
}
if (verbose == 1)
s = format (s, "%v", str);
if (verbose > 1)
- s = format (s, "%U", format_session_fifos, ss, verbose);
+ {
+ s = format (s, "%U", format_session_fifos, ss, verbose);
+ s = format (s, " session: state: %U opaque: 0x%x flags: %U\n",
+ format_session_state, ss, ss->opaque,
+ format_session_flags, ss);
+ }
}
else if (ss->session_state == SESSION_STATE_LISTENING)
{
}
else if (ss->session_state == SESSION_STATE_CONNECTING)
{
- s = format (s, "%-40U%v", format_transport_half_open_connection,
- tp, ss->connection_index, ss->thread_index, str);
+ if (ss->flags & SESSION_F_HALF_OPEN)
+ s = format (s, "%U%v", format_transport_half_open_connection, tp,
+ ss->connection_index, ss->thread_index, verbose, str);
+ else
+ s = format (s, "%U", format_transport_connection, tp,
+ ss->connection_index, ss->thread_index, verbose);
}
else
{
session_cli_show_all_sessions (vlib_main_t * vm, int verbose)
{
session_main_t *smm = &session_main;
- u32 n_closed = 0, thread_index;
+ u32 n_closed, thread_index;
session_t *pool, *s;
for (thread_index = 0; thread_index < vec_len (smm->wrk); thread_index++)
}
if (verbose == 1)
- vlib_cli_output (vm, "%s%-50s%-15s%-10s%-10s",
+ vlib_cli_output (vm, "%s%-" SESSION_CLI_ID_LEN "s%-"
+ SESSION_CLI_STATE_LEN "s%-10s%-10s",
thread_index ? "\n" : "",
"Connection", "State", "Rx-f", "Tx-f");
+ n_closed = 0;
+
/* *INDENT-OFF* */
- pool_foreach(s, pool, ({
+ pool_foreach (s, pool) {
if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED)
{
n_closed += 1;
continue;
}
vlib_cli_output (vm, "%U", format_session, s, verbose);
- }));
+ }
/* *INDENT-ON* */
if (!n_closed)
check_transport:
- if (tp != TRANSPORT_N_PROTO && session_get_transport_proto (s) != tp)
+ if (tp != TRANSPORT_PROTO_INVALID && session_get_transport_proto (s) != tp)
return 0;
return 1;
pool = wrk->sessions;
- if (tp == TRANSPORT_N_PROTO && states == 0 && !verbose
+ if (tp == TRANSPORT_PROTO_INVALID && states == 0 && !verbose
&& (start == 0 && end == ~0))
{
vlib_cli_output (vm, "Thread %d: %u sessions", thread_index,
count);
}
+void
+session_cli_show_events_thread (vlib_main_t * vm, u32 thread_index)
+{
+ session_worker_t *wrk;
+
+ wrk = session_main_get_worker_if_valid (thread_index);
+ if (!wrk)
+ {
+ vlib_cli_output (vm, "invalid thread index %u", thread_index);
+ return;
+ }
+
+ vlib_cli_output (vm, "Thread %d:\n", thread_index);
+ vlib_cli_output (vm, " evt elements alloc: %u",
+ clib_llist_elts (wrk->event_elts));
+ vlib_cli_output (vm, " ctrl evt elt data alloc: %d",
+ clib_llist_elts (wrk->ctrl_evts_data));
+}
+
static void
-session_cli_print_transport_protos (vlib_main_t * vm)
+session_cli_show_events (vlib_main_t * vm, u32 thread_index)
{
-#define _(sym, str, sstr) vlib_cli_output (vm, str);
- foreach_transport_proto
-#undef _
+ session_main_t *smm = &session_main;
+ if (!thread_index)
+ {
+ session_cli_show_events_thread (vm, thread_index);
+ return;
+ }
+
+ for (thread_index = 0; thread_index < vec_len (smm->wrk); thread_index++)
+ session_cli_show_events_thread (vm, thread_index);
}
static void
u8 one_session = 0, do_listeners = 0, sst, do_elog = 0, do_filter = 0;
u32 track_index, thread_index = 0, start = 0, end = ~0, session_index;
unformat_input_t _line_input, *line_input = &_line_input;
- transport_proto_t transport_proto = TRANSPORT_N_PROTO;
+ transport_proto_t transport_proto = TRANSPORT_PROTO_INVALID;
session_state_t state = SESSION_N_STATES, *states = 0;
session_main_t *smm = &session_main;
clib_error_t *error = 0;
app_worker_t *app_wrk;
u32 transport_index;
const u8 *app_name;
+ u8 do_events = 0;
int verbose = 0;
session_t *s;
do_elog = 1;
else if (unformat (line_input, "protos"))
{
- session_cli_print_transport_protos (vm);
+ vlib_cli_output (vm, "%U", format_transport_protos);
goto done;
}
else if (unformat (line_input, "states"))
session_cli_print_session_states (vm);
goto done;
}
+ else if (unformat (line_input, "events"))
+ do_events = 1;
else
{
error = clib_error_return (0, "unknown input `%U'",
u8 *str = format (0, "%U", format_session, s, 3);
if (do_elog && s->session_state != SESSION_STATE_LISTENING)
{
- elog_main_t *em = &vm->elog_main;
+ elog_main_t *em = &vlib_global_main.elog_main;
transport_connection_t *tc;
f64 dt;
if (do_listeners)
{
sst = session_type_from_proto_and_ip (transport_proto, 1);
- vlib_cli_output (vm, "%-50s%-24s", "Listener", "App");
+ vlib_cli_output (vm, "%-" SESSION_CLI_ID_LEN "s%-24s", "Listener",
+ "App");
+
/* *INDENT-OFF* */
- pool_foreach (s, smm->wrk[0].sessions, ({
+ pool_foreach (s, smm->wrk[0].sessions) {
if (s->session_state != SESSION_STATE_LISTENING
|| s->session_type != sst)
continue;
app_name = application_name_from_index (app_wrk->app_index);
vlib_cli_output (vm, "%U%-25v%", format_session, s, 0,
app_name);
- }));
+ }
/* *INDENT-ON* */
goto done;
}
+ if (do_events)
+ {
+ session_cli_show_events (vm, thread_index);
+ goto done;
+ }
+
if (do_filter)
{
if (end < start)
/* *INDENT-OFF* */
vec_foreach (wrk, smm->wrk)
{
- pool_foreach(session, wrk->sessions, ({
+ pool_foreach (session, wrk->sessions) {
clear_session (session);
- }));
+ }
};
/* *INDENT-ON* */
}
Code Review / vpp.git / blobdiff