From a0abbff4849e8b8721b70769ae1f3ef27dd6733c Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Fri, 12 Jul 2019 12:16:16 +0200 Subject: session: add thread index to all formatters Add a thread_index argument to half-open and listener session formatters because QUIC can have listeners and half-open sessions in any thread. Change-Id: I1de60e35ece4c68ba8cfdd6b63f211bc620d687b Signed-off-by: Aloys Augustin Type: feature --- src/vnet/session/application_local.c | 1 + src/vnet/session/session_cli.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/vnet/session') diff --git a/src/vnet/session/application_local.c b/src/vnet/session/application_local.c index 4a93d3a2ae5..4a268c7d30b 100644 --- a/src/vnet/session/application_local.c +++ b/src/vnet/session/application_local.c @@ -492,6 +492,7 @@ static u8 * format_ct_listener (u8 * s, va_list * args) { u32 tc_index = va_arg (*args, u32); + u32 __clib_unused thread_index = va_arg (*args, u32); u32 __clib_unused verbose = va_arg (*args, u32); ct_connection_t *ct = ct_connection_get (tc_index); s = format (s, "%-50U", format_ct_connection_id, ct); diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c index a302ddd72bc..d839532eea3 100755 --- a/src/vnet/session/session_cli.c +++ b/src/vnet/session/session_cli.c @@ -89,14 +89,14 @@ format_session (u8 * s, va_list * args) else if (ss->session_state == SESSION_STATE_LISTENING) { s = format (s, "%U%v", format_transport_listen_connection, - tp, ss->connection_index, verbose, str); + tp, ss->connection_index, ss->thread_index, verbose, 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", format_transport_half_open_connection, - tp, ss->connection_index, str); + tp, ss->connection_index, ss->thread_index, str); } else { -- cgit 1.2.3-korg