netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH iproute2] ss: Don't pad the last (enabled) column
@ 2025-08-21  5:45 Paul Wayper
  2025-08-21 10:35 ` Stefano Brivio
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Wayper @ 2025-08-21  5:45 UTC (permalink / raw)
  To: Stephen Hemminger, Stefano Brivio, netdev; +Cc: paulway, jbainbri

ss will emit spaces on the right hand side of a left-justified, enabled
column even if it's the last column.  In situations where one or more
lines are very long - e.g. because of a large PROCESS field value - this
causes a lot of excess output.

Firstly, calculate the last enabled column.  Then use this in the check
for whether to emit trailing spaces on the last column.

Also remove the 'EXT' column which does not seem to be used.

Fixes: 59f46b7b5be86 ("ss: Introduce columns lightweight abstraction")
Signed-off-by: Paul Wayper <paulway@redhat.com>
---
 misc/ss.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/misc/ss.c b/misc/ss.c
index 989e168ae35026249ccec0e2d4a3df07b0438c7b..27cf7434c616e0030efc8876f00715d4b37dd567 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -123,10 +123,11 @@ enum col_id {
 	COL_RADDR,
 	COL_RSERV,
 	COL_PROC,
-	COL_EXT,
 	COL_MAX
 };
 
+int LAST_COL = COL_MAX;
+
 enum col_align {
 	ALIGN_LEFT,
 	ALIGN_CENTER,
@@ -152,7 +153,6 @@ static struct column columns[] = {
 	{ ALIGN_RIGHT,	"Peer Address:",	" ",	0, 0, 0 },
 	{ ALIGN_LEFT,	"Port",			"",	0, 0, 0 },
 	{ ALIGN_LEFT,	"Process",		"",	0, 0, 0 },
-	{ ALIGN_LEFT,	"",			"",	0, 0, 0 },
 };
 
 static struct column *current_field = columns;
@@ -1079,6 +1079,24 @@ static void out(const char *fmt, ...)
 	va_end(args);
 }
 
+static void check_last_column(void)
+{
+	/* Find the last non-disabled column and set LAST_COL. */
+	for (int i = COL_MAX - 1; i > 0; i--) {
+		struct column c = columns[i];
+
+		if (!c.disabled) {
+			LAST_COL = i;
+			return;
+		}
+	}
+}
+
+static int field_is_last(struct column *f)
+{
+	return f - columns == LAST_COL;
+}
+
 static int print_left_spacing(struct column *f, int stored, int printed)
 {
 	int s;
@@ -1104,6 +1122,10 @@ static void print_right_spacing(struct column *f, int printed)
 	if (!f->width || f->align == ALIGN_RIGHT)
 		return;
 
+	/* Don't print trailing space if this is the last column. */
+	if (field_is_last(f))
+		return;
+
 	s = f->width - printed;
 	if (f->align == ALIGN_CENTER)
 		s /= 2;
@@ -1143,11 +1165,6 @@ static void field_flush(struct column *f)
 	buffer.tail->end = buffer.cur->data;
 }
 
-static int field_is_last(struct column *f)
-{
-	return f - columns == COL_MAX - 1;
-}
-
 /* Get the next available token in the buffer starting from the current token */
 static struct buf_token *buf_token_next(struct buf_token *cur)
 {
@@ -1316,6 +1333,9 @@ static void render(void)
 	if (!buffer.head)
 		return;
 
+	/* Find last non-disabled column */
+	check_last_column();
+
 	token = (struct buf_token *)buffer.head->data;
 
 	/* Ensure end alignment of last token, it wasn't necessarily flushed */
-- 
2.50.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [PATCH iproute2] ss: Don't pad the last (enabled) column
@ 2025-08-26  0:22 Paul Wayper
  2025-08-26  6:55 ` Stefano Brivio
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Paul Wayper @ 2025-08-26  0:22 UTC (permalink / raw)
  To: Stephen Hemminger, Stefano Brivio, netdev; +Cc: paulway, jbainbri

ss will emit spaces on the right hand side of a left-justified, enabled
column even if it's the last column.  In situations where one or more
lines are very long - e.g. because of a large PROCESS field value - this
causes a lot of excess output.

Firstly, calculate the last enabled column.  Then use this in the check
for whether to emit trailing spaces on the last column.

Also name the 'EXT' column as 'Details' and mark it as disabled by
default, enabled when the -e or --extended options are supplied.

Fixes: 59f46b7b5be86 ("ss: Introduce columns lightweight abstraction")
Signed-off-by: Paul Wayper <paulway@redhat.com>
---
 misc/ss.c | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/misc/ss.c b/misc/ss.c
index 989e168ae35026249ccec0e2d4a3df07b0438c7b..1c576c1e5997ccbca448b6ed5af3d41d7867ba76 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -127,6 +127,8 @@ enum col_id {
 	COL_MAX
 };
 
+int LAST_COL = COL_MAX;
+
 enum col_align {
 	ALIGN_LEFT,
 	ALIGN_CENTER,
@@ -151,8 +153,8 @@ static struct column columns[] = {
 	{ ALIGN_LEFT,	"Port",			"",	0, 0, 0 },
 	{ ALIGN_RIGHT,	"Peer Address:",	" ",	0, 0, 0 },
 	{ ALIGN_LEFT,	"Port",			"",	0, 0, 0 },
-	{ ALIGN_LEFT,	"Process",		"",	0, 0, 0 },
-	{ ALIGN_LEFT,	"",			"",	0, 0, 0 },
+	{ ALIGN_LEFT,	"Process",		" ",	0, 0, 0 },
+	{ ALIGN_LEFT,	"Details",		" ",	1, 0, 0 },
 };
 
 static struct column *current_field = columns;
@@ -1079,6 +1081,22 @@ static void out(const char *fmt, ...)
 	va_end(args);
 }
 
+static void check_last_column(void)
+{
+	/* Find the last non-disabled column and set LAST_COL. */
+	for (int i = COL_MAX - 1; i > 0; i--) {
+		if (!columns[i].disabled) {
+			LAST_COL = i;
+			return;
+		}
+	}
+}
+
+static int field_is_last(struct column *f)
+{
+	return f - columns == LAST_COL;
+}
+
 static int print_left_spacing(struct column *f, int stored, int printed)
 {
 	int s;
@@ -1104,6 +1122,10 @@ static void print_right_spacing(struct column *f, int printed)
 	if (!f->width || f->align == ALIGN_RIGHT)
 		return;
 
+	/* Don't print trailing space if this is the last column. */
+	if (field_is_last(f))
+		return;
+
 	s = f->width - printed;
 	if (f->align == ALIGN_CENTER)
 		s /= 2;
@@ -1143,11 +1165,6 @@ static void field_flush(struct column *f)
 	buffer.tail->end = buffer.cur->data;
 }
 
-static int field_is_last(struct column *f)
-{
-	return f - columns == COL_MAX - 1;
-}
-
 /* Get the next available token in the buffer starting from the current token */
 static struct buf_token *buf_token_next(struct buf_token *cur)
 {
@@ -1316,6 +1333,9 @@ static void render(void)
 	if (!buffer.head)
 		return;
 
+	/* Find last non-disabled column */
+	check_last_column();
+
 	token = (struct buf_token *)buffer.head->data;
 
 	/* Ensure end alignment of last token, it wasn't necessarily flushed */
@@ -2452,12 +2472,12 @@ static void proc_ctx_print(struct sockstat *s)
 		if (find_entry(s->ino, &buf,
 				(show_proc_ctx & show_sock_ctx) ?
 				PROC_SOCK_CTX : PROC_CTX) > 0) {
-			out(" users:(%s)", buf);
+			out("users:(%s)", buf);
 			free(buf);
 		}
 	} else if (show_processes || show_threads) {
 		if (find_entry(s->ino, &buf, USERS) > 0) {
-			out(" users:(%s)", buf);
+			out("users:(%s)", buf);
 			free(buf);
 		}
 	}
@@ -6241,6 +6261,10 @@ int main(int argc, char *argv[])
 	if (ssfilter_parse(&current_filter.f, argc, argv, filter_fp))
 		usage();
 
+	/* Details column normally disabled, enable if asked */
+	if (show_details)
+		columns[COL_EXT].disabled = 0;
+
 	if (!show_processes)
 		columns[COL_PROC].disabled = 1;
 
-- 
2.51.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-08-29 11:09 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-21  5:45 [PATCH iproute2] ss: Don't pad the last (enabled) column Paul Wayper
2025-08-21 10:35 ` Stefano Brivio
     [not found]   ` <137a3493-bbda-490f-8ad4-fa3a511c2742@redhat.com>
2025-08-28 23:49     ` Stefano Brivio
  -- strict thread matches above, loose matches on Subject: below --
2025-08-26  0:22 Paul Wayper
2025-08-26  6:55 ` Stefano Brivio
2025-08-26 23:22 ` Stefano Brivio
2025-08-29 11:09 ` Stefano Brivio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).