ss: add option to suppress queue columns

Commit Message

Christian Göttsche Dec. 27, 2023, 1:44 p.m. UTC

Add a new option `-Q/--no-queues` to ss(8) to suppress the two standard
columns Send-Q and Recv-Q.  This helps to keep the output steady for
monitoring purposes (like listening sockets).

Signed-off-by: Christian Göttsche <[e-mail]>
---
 man/man8/ss.8 |  3 +++
 misc/ss.c     | 24 +++++++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

Comments

David Ahern Jan. 8, 2024, 1:43 a.m. UTC | #1

On 12/27/23 6:44 AM, Christian Göttsche wrote:
> Add a new option `-Q/--no-queues` to ss(8) to suppress the two standard
> columns Send-Q and Recv-Q.  This helps to keep the output steady for
> monitoring purposes (like listening sockets).
> 
> Signed-off-by: Christian Göttsche <[e-mail]>
> ---
>  man/man8/ss.8 |  3 +++
>  misc/ss.c     | 24 +++++++++++++++++++-----
>  2 files changed, 22 insertions(+), 5 deletions(-)
> 

does not apply to iproute2-next.

--
pw-bot: cr

Patch

diff --git a/man/man8/ss.8 b/man/man8/ss.8
index 073e9f03..ecb3ae35 100644
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -24,6 +24,9 @@  Output version information.
 .B \-H, \-\-no-header
 Suppress header line.
 .TP
+.B \-Q, \-\-no-queues
+Suppress sending and receiving queue columns.
+.TP
 .B \-O, \-\-oneline
 Print each socket's data on a single line.
 .TP
diff --git a/misc/ss.c b/misc/ss.c
index 09dc1f37..00b661e1 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -75,6 +75,7 @@ 
 int preferred_family = AF_UNSPEC;
 static int show_options;
 int show_details;
+static int show_queues = 1;
 static int show_processes;
 static int show_threads;
 static int show_mem;
@@ -1420,10 +1421,13 @@  static void sock_state_print(struct sockstat *s)
 		out("%s", sstate_name[s->state]);
 	}
 
-	field_set(COL_RECVQ);
-	out("%-6d", s->rq);
-	field_set(COL_SENDQ);
-	out("%-6d", s->wq);
+	if (show_queues) {
+		field_set(COL_RECVQ);
+		out("%-6d", s->rq);
+		field_set(COL_SENDQ);
+		out("%-6d", s->wq);
+	}
+
 	field_set(COL_ADDR);
 }
 
@@ -5367,6 +5371,7 @@  static void _usage(FILE *dest)
 "\n"
 "   -K, --kill          forcibly close sockets, display what was closed\n"
 "   -H, --no-header     Suppress header line\n"
+"   -Q, --no-queues     Suppress sending and receiving queue columns\n"
 "   -O, --oneline       socket's data printed on a single line\n"
 "       --inet-sockopt  show various inet socket options\n"
 "\n"
@@ -5500,6 +5505,7 @@  static const struct option long_opts[] = {
 	{ "cgroup", 0, 0, OPT_CGROUP },
 	{ "kill", 0, 0, 'K' },
 	{ "no-header", 0, 0, 'H' },
+	{ "no-queues", 0, 0, 'Q' },
 	{ "xdp", 0, 0, OPT_XDPSOCK},
 	{ "mptcp", 0, 0, 'M' },
 	{ "oneline", 0, 0, 'O' },
@@ -5519,7 +5525,7 @@  int main(int argc, char *argv[])
 	int state_filter = 0;
 
 	while ((ch = getopt_long(argc, argv,
-				 "dhaletuwxnro460spTbEf:mMiA:D:F:vVzZN:KHSO",
+				 "dhaletuwxnro460spTbEf:mMiA:D:F:vVzZN:KHQSO",
 				 long_opts, NULL)) != EOF) {
 		switch (ch) {
 		case 'n':
@@ -5700,6 +5706,9 @@  int main(int argc, char *argv[])
 		case 'H':
 			show_header = 0;
 			break;
+		case 'Q':
+			show_queues = 0;
+			break;
 		case 'O':
 			oneline = 1;
 			break;
@@ -5795,6 +5804,11 @@  int main(int argc, char *argv[])
 	if (ssfilter_parse(&current_filter.f, argc, argv, filter_fp))
 		usage();
 
+	if (!show_queues) {
+		columns[COL_SENDQ].disabled = 1;
+		columns[COL_RECVQ].disabled = 1;
+	}
+
 	if (!show_processes)
 		columns[COL_PROC].disabled = 1;