ss: netlink_show_one() clean-up, minor output fix
Subsystems (2)
cover ss: netlink_show_one() clean-up, minor output fix
Patches 1/3 and 2/3 streamline process context prints in netlink_show_one(). Patch 3/3 fixes a display issue happening when Netid or State columns are not displayed.
In general, the output layout of 'ss', also in the cases handled here, still has a number of issues. I will address further issues more structurally in a later patchset.
Stefano Brivio (3):
ss: Remove useless width specifier in process context print
ss: Streamline process context printing in netlink_show_one()
ss: Fix width calculations when Netid or State columns are missing
misc/ss.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
Signature · 1 line
2.9.4
PATCH 1/3 ss: Remove useless width specifier in process context print
Both local address and service, and remote address and service fields are already printed out in netlink_show_one() before we start printing process context, by calling sock_addr_print() twice.
At this point, sock_addr_print() has already forced the remote service field to be 'serv_width' wide -- that is, 'serv_width' width has already been consumed, before we print process context.
Hence, it makes no sense to force the display width of process context to be 'serv_width' wide again: previous prints have filled up the line already. Remove the width specifier and prefix with a space instead, to keep this consistent with fields which are displayed after the first output line.
--- misc/ss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
misc/ss.c +2 -2
@@ -3594,10 +3594,10 @@ static int netlink_show_one(struct filter *f,getpidcon (pid, &pid_context);if (pid_context !=NULL ) { -printf ("proc_ctx=%-*s " , serv_width, pid_context); +printf (" proc_ctx=%s" , pid_context);free (pid_context); }else { -printf ("proc_ctx=%-*s " , serv_width,"unavailable" ); +printf (" proc_ctx=unavailable" ); } }
Signature · 1 line
2.9.4
PATCH 2/3 ss: Streamline process context printing in netlink_show_one()
In reply to Stefano BrivioThere's no need to check 'pid_context' before calling free().
--- misc/ss.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
misc/ss.c +2 -6
@@ -3593,12 +3593,8 @@ static int netlink_show_one(struct filter *f,else if (pid >0 )getpidcon (pid, &pid_context); -if (pid_context !=NULL ) { -printf (" proc_ctx=%s" , pid_context); -free (pid_context); - }else { -printf (" proc_ctx=unavailable" ); - } +printf (" proc_ctx=%s" , pid_context ? :"unavailable" ); +free (pid_context); }if (show_details) {
Signature · 1 line
2.9.4
PATCH 3/3 ss: Fix width calculations when Netid or State columns are missing
In reply to Stefano BrivioIf Netid or State columns are missing, we must not subtract one for each of these two columns from the remaining screen width, while distributing available space to columns. This one character corresponding to one delimiting space has to be subtracted only if the columns are actually printed.
Further, in the existing implementation, if the screen width is an odd number, one additional character is added to the width of one of the two columns.
But if both are not printed, this filling character needs to be added somewhere else, in order to have the right spacing allowing us to fill lines completely.
Address and port fields are printed in pairs (local and remote), so we can't distribute the space to any of them, because it would be doubled. Instead, print this additional space to the right of the Send-Q column, to keep code changes to a minimum.
This is particularly visible with 'ss -f netlink -Z'. Before this patch, with an 80 column terminal, we have:
$ ss -f netlink -Z|head -n3 Recv-Q Send-Q Local Address:Port Peer Address:Port
0 0 rtnl:evolution-calen/2049 * pr
oc_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
0 0 rtnl:clock-applet/1944 * pr
oc_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
and with an 81 column terminal:
$ ss -f netlink -Z|head -n3 Recv-Q Send-Q Local Address:Port Peer Address:Port
0 0 rtnl:evolution-calen/2049 * pro
c_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
0 0 rtnl:clock-applet/1944 * pro
c_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
After this patch, in both cases, the output is:
$ ss -f netlink -Z|head -n3 Recv-Q Send-Q Local Address:Port Peer Address:Port
0 0 rtnl:evolution-calen/2049 *
proc_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
0 0 rtnl:clock-applet/1944 *
proc_ctx=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
---
Note: the extra line printed after the header is still present, we will need some slightly more invasive changes to fix this.
misc/ss.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
misc/ss.c +7 -4
@@ -107,6 +107,7 @@ int netid_width;int state_width;int addr_width;int serv_width; +char *odd_width_pad="" ;static const char *TCP_PROTO ="tcp" ;static const char *SCTP_PROTO ="sctp" ;
@@ -838,7 +839,7 @@ static void sock_state_print(struct sockstat *s)printf ("%-*s " , state_width, sstate_name[s->state]); } -printf ("%-6d %-6d " , s->rq, s->wq); +printf ("%-6d %-6d %s" , s->rq, s->wq, odd_width_pad); }static void sock_details_print (struct sockstat *s)
@@ -4364,8 +4365,8 @@ int main(int argc, char *argv[]) } addrp_width = screen_width; - addrp_width -= netid_width+1 ; - addrp_width -= state_width+1 ; + addrp_width -= netid_width +1 * !!netid_width; + addrp_width -= state_width +1 * !!state_width; addrp_width -=14 ;if (addrp_width&1 ) {
@@ -4373,6 +4374,8 @@ int main(int argc, char *argv[]) netid_width++; else if (state_width) state_width++; + else + odd_width_pad=" "; } addrp_width /=2 ;
@@ -4390,7 +4393,7 @@ int main(int argc, char *argv[])printf ("%-*s " , netid_width,"Netid" );if (state_width)printf ("%-*s " , state_width,"State" ); -printf ("%-6s %-6s " ,"Recv-Q" ,"Send-Q" ); +printf ("%-6s %-6s %s" ,"Recv-Q" ,"Send-Q" , odd_width_pad); }/* Make enough space for the local/remote port field */
Signature · 1 line
2.9.4
Re: [iproute PATCH 3/3] ss: Fix width calculations when Netid or State columns are missing
misc/ss.c int main(int argc, char *argv[]) · line 4369
Quoted 2 lines · On Sun, 29 Oct 2017 21:22:34 +0100 Stefano Brivio <[email protected]> wrote:
misc/ss.c +2
-0+ addrp_width -= netid_width +1 * !!netid_width; + addrp_width -= state_width +1 * !!state_width;
Doing !! here is being too bit tricky for code that is not performance sensitive. Just use an if statement or ? :
misc/ss.c int main(int argc, char *argv[]) · line 4378
Quoted 6 lines
misc/ss.c +2
-0@@ -4373,6 +4374,8 @@ int main(int argc, char *argv[]) netid_width++; else if (state_width) state_width++; + else + odd_width_pad=" ";
Missing whitespace.
Re: [iproute PATCH 3/3] ss: Fix width calculations when Netid or State columns are missing
Quoted 8 lines · On Tue, 31 Oct 2017 17:55:06 +0100 Stephen Hemminger…
misc/ss.c int main(int argc, char *argv[]) · line 4369
Quoted 2 lines · On Sun, 29 Oct 2017 21:22:34 +0100 Stefano Brivio <[email protected]> wrote:
misc/ss.c +2
-0+ addrp_width -= netid_width +1 * !!netid_width; + addrp_width -= state_width +1 * !!state_width;Doing !! here is being too bit tricky for code that is not performance sensitive. Just use an if statement or ? :
Sure.
Quoted 8 lines
misc/ss.c int main(int argc, char *argv[]) · line 4378
Quoted 6 lines
misc/ss.c +2
-0@@ -4373,6 +4374,8 @@ int main(int argc, char *argv[]) netid_width++; else if (state_width) state_width++; + else + odd_width_pad=" ";Missing whitespace.
Oops. Thanks. I'll fix both issues in v2.
Signature · 1 line
Stefano