Drop -e option to python scripts, use hidden --ebpf only.

As discussed in iovisor#1531 review comments. Signed-off-by: Nathan Scott <[email protected]>
nanshuaibo · Jan 16, 2018 · f5fb9af · f5fb9af
1 parent ca4ba55
commit f5fb9af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/tools/biolatency.py b/tools/biolatency.py
@@ -4,7 +4,7 @@
 # biolatency Summarize block device I/O latency as a histogram.
 # For Linux, uses BCC, eBPF.
 #
-# USAGE: biolatency [-h] [-T] [-Q] [-m] [-D] [-e] [interval] [count]
+# USAGE: biolatency [-h] [-T] [-Q] [-m] [-D] [interval] [count]
 #
 # Copyright (c) 2015 Brendan Gregg.
 # Licensed under the Apache License, Version 2.0 (the "License")
@@ -27,7 +27,7 @@
 parser = argparse.ArgumentParser(
  description="Summarize block device I/O latency as a histogram",
  formatter_class=argparse.RawDescriptionHelpFormatter,
- epilog=examples)
+ epilog=examples, allow_abbrev=False)
 parser.add_argument("-T", "--timestamp", action="store_true",
  help="include timestamp on output")
 parser.add_argument("-Q", "--queued", action="store_true",
@@ -36,12 +36,12 @@
  help="millisecond histogram")
 parser.add_argument("-D", "--disks", action="store_true",
  help="print a histogram per disk device")
-parser.add_argument("-e", "--ebpf", action="store_true",
- help="report the eBPF program and exit")
 parser.add_argument("interval", nargs="?", default=99999999,
  help="output interval, in seconds")
 parser.add_argument("count", nargs="?", default=99999999,
  help="number of outputs")
+parser.add_argument("--ebpf", action="store_true",
+ help=argparse.SUPPRESS)
 args = parser.parse_args()
 countdown = int(args.count)
 debug = 0

diff --git a/tools/biotop.py b/tools/biotop.py
@@ -4,7 +4,7 @@
 # biotop block device (disk) I/O by process.
 # For Linux, uses BCC, eBPF.
 #
-# USAGE: biotop.py [-h] [-C] [-r MAXROWS] [-e] [interval] [count]
+# USAGE: biotop.py [-h] [-C] [-r MAXROWS] [interval] [count]
 #
 # This uses in-kernel eBPF maps to cache process details (PID and comm) by I/O
 # request, as well as a starting timestamp for calculating I/O latency.
@@ -31,17 +31,17 @@
 parser = argparse.ArgumentParser(
  description="Block device (disk) I/O by process",
  formatter_class=argparse.RawDescriptionHelpFormatter,
- epilog=examples)
+ epilog=examples, allow_abbrev=False)
 parser.add_argument("-C", "--noclear", action="store_true",
  help="don't clear the screen")
 parser.add_argument("-r", "--maxrows", default=20,
  help="maximum rows to print, default 20")
-parser.add_argument("-e", "--ebpf", action="store_true",
- help="report the eBPF program and exit")
 parser.add_argument("interval", nargs="?", default=1,
  help="output interval, in seconds")
 parser.add_argument("count", nargs="?", default=99999999,
  help="number of outputs")
+parser.add_argument("--ebpf", action="store_true",
+ help=argparse.SUPPRESS)
 args = parser.parse_args()
 interval = int(args.interval)
 countdown = int(args.count)

diff --git a/tools/tcplife.py b/tools/tcplife.py
@@ -43,7 +43,7 @@
 parser = argparse.ArgumentParser(
  description="Trace the lifespan of TCP sessions and summarize",
  formatter_class=argparse.RawDescriptionHelpFormatter,
- epilog=examples)
+ epilog=examples, allow_abbrev=False)
 parser.add_argument("-T", "--time", action="store_true",
  help="include time column on output (HH:MM:SS)")
 parser.add_argument("-t", "--timestamp", action="store_true",
@@ -58,8 +58,8 @@
  help="comma-separated list of local ports to trace.")
 parser.add_argument("-D", "--remoteport",
  help="comma-separated list of remote ports to trace.")
-parser.add_argument("-e", "--ebpf", action="store_true",
- help="report the eBPF program and exit")
+parser.add_argument("--ebpf", action="store_true",
+ help=argparse.SUPPRESS)
 args = parser.parse_args()
 debug = 0