ss: introduce switch to print exact value of data rates

Message ID 20180311162621.26387-2-tomasz.torcz@nordea.com
State Changes Requested
Delegated to: David Ahern
Headers show
Series
  • ss: introduce switch to print exact value of data rates
Related show

Commit Message

Tomasz Torcz March 11, 2018, 4:26 p.m.
Introduce -X/--exact switch to disable human-friendly printing
 of datarates. With the switch, data is not presented as MBps/Kbps.

  Signed-off-by: Tomasz Torcz <tomasz.torcz@nordea.com>
---
 misc/ss.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

David Ahern March 16, 2018, 3:40 p.m. | #1
On 3/11/18 9:26 AM, Tomasz Torcz wrote:
>   Introduce -X/--exact switch to disable human-friendly printing
>  of datarates. With the switch, data is not presented as MBps/Kbps.
> 
>   Signed-off-by: Tomasz Torcz <tomasz.torcz@nordea.com>
> ---
>  misc/ss.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 


still not a fan of --exact for the long name, but I can't think of
anything better at the moment. Please update the man page as well.

Patch

diff --git a/misc/ss.c b/misc/ss.c
index e087bef7..61c917e4 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -95,6 +95,7 @@  int resolve_services = 1;
 int preferred_family = AF_UNSPEC;
 int show_options;
 int show_details;
+int show_human_readable = 1;
 int show_users;
 int show_mem;
 int show_tcpinfo;
@@ -2276,7 +2277,9 @@  static int proc_inet_split_line(char *line, char **loc, char **rem, char **data)
 
 static char *sprint_bw(char *buf, double bw)
 {
-	if (bw > 1000000.)
+	if (!show_human_readable)
+		sprintf(buf, "%.0f", bw);
+	else if (bw > 1000000.)
 		sprintf(buf, "%.1fM", bw / 1000000.);
 	else if (bw > 1000.)
 		sprintf(buf, "%.1fK", bw / 1000.);
@@ -4502,6 +4505,7 @@  static void _usage(FILE *dest)
 "   -s, --summary       show socket usage summary\n"
 "   -b, --bpf           show bpf filter socket information\n"
 "   -E, --events        continually display sockets as they are destroyed\n"
+"   -X, --exact         show exact values, instead of human-readable\n"
 "   -Z, --context       display process SELinux security contexts\n"
 "   -z, --contexts      display process and socket SELinux security contexts\n"
 "   -N, --net           switch to the specified network namespace name\n"
@@ -4634,6 +4638,7 @@  static const struct option long_opts[] = {
 	{ "net", 1, 0, 'N' },
 	{ "kill", 0, 0, 'K' },
 	{ "no-header", 0, 0, 'H' },
+	{ "exact", 0, 0, 'X' },
 	{ 0 }
 
 };
@@ -4650,7 +4655,7 @@  int main(int argc, char *argv[])
 	int screen_width = 80;
 
 	while ((ch = getopt_long(argc, argv,
-				 "dhaletuwxnro460spbEf:miA:D:F:vVzZN:KHS",
+				 "dhaletuwxXnro460spbEf:miA:D:F:vVzZN:KHS",
 				 long_opts, NULL)) != EOF) {
 		switch (ch) {
 		case 'n':
@@ -4701,6 +4706,9 @@  int main(int argc, char *argv[])
 		case 'x':
 			filter_af_set(&current_filter, AF_UNIX);
 			break;
+		case 'X':
+			show_human_readable = 0;
+			break;
 		case OPT_VSOCK:
 			filter_af_set(&current_filter, AF_VSOCK);
 			break;