Merge pull request iovisor#312 from iovisor/ast_dev

fix pep8 lint errors in the rest of the tools

tools/biolatency_example.txt

@@ -5,7 +5,7 @@ biolatency traces block device I/O (disk I/O), and records the distribution
 of I/O latency (time), printing this as a histogram when Ctrl-C is hit.
 For example:
 
-# ./biolatency 
+# ./biolatency
 Tracing block device I/O... Hit Ctrl-C to end.
 ^C
  usecs : count distribution

tools/funccount

@@ -1,7 +1,8 @@
 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
-# funccount Count kernel function calls.
-# For Linux, uses BCC, eBPF. See .c file.
+# funccount Count kernel function calls.
+# For Linux, uses BCC, eBPF. See .c file.
 #
 # USAGE: funccount [-h] [-p PID] [-i INTERVAL] [-T] [-r] pattern
 #
@@ -11,7 +12,7 @@
 # Copyright (c) 2015 Brendan Gregg.
 # Licensed under the Apache License, Version 2.0 (the "License")
 #
-# 09-Sep-2015 Brendan Gregg Created this.
+# 09-Sep-2015 Brendan Gregg Created this.
 
 from __future__ import print_function
 from bcc import BPF
@@ -28,63 +29,63 @@ examples = """examples:
  ./funccount -p 185 'vfs_*' # count vfs calls for PID 181 only
 """
 parser = argparse.ArgumentParser(
- description="Count kernel function calls",
- formatter_class=argparse.RawDescriptionHelpFormatter,
- epilog=examples)
+ description="Count kernel function calls",
+ formatter_class=argparse.RawDescriptionHelpFormatter,
+ epilog=examples)
 parser.add_argument("-p", "--pid",
- help="trace this PID only")
+ help="trace this PID only")
 parser.add_argument("-i", "--interval", default=99999999,
- help="summary interval, seconds")
+ help="summary interval, seconds")
 parser.add_argument("-T", "--timestamp", action="store_true",
- help="include timestamp on output")
+ help="include timestamp on output")
 parser.add_argument("-r", "--regexp", action="store_true",
- help="use regular expressions. Default is \"*\" wildcards only.")
+ help="use regular expressions. Default is \"*\" wildcards only.")
 parser.add_argument("pattern",
- help="search expression for kernel functions")
+ help="search expression for kernel functions")
 args = parser.parse_args()
 pattern = args.pattern
 if not args.regexp:
- pattern = pattern.replace('*', '.*')
- pattern = '^' + pattern + '$'
+ pattern = pattern.replace('*', '.*')
+ pattern = '^' + pattern + '$'
 debug = 0
 
 # signal handler
 def signal_ignore(signal, frame):
- print()
+ print()
 
 # load BPF program
 bpf_text = """
 #include <uapi/linux/ptrace.h>
 
 struct key_t {
- u64 ip;
+ u64 ip;
 };
 BPF_HASH(counts, struct key_t);
 
 int trace_count(struct pt_regs *ctx) {
- FILTER
- struct key_t key = {};
- u64 zero = 0, *val;
- key.ip = ctx->ip;
- val = counts.lookup_or_init(&key, &zero);
- (*val)++;
- return 0;
+ FILTER
+ struct key_t key = {};
+ u64 zero = 0, *val;
+ key.ip = ctx->ip;
+ val = counts.lookup_or_init(&key, &zero);
+ (*val)++;
+ return 0;
 }
 """
 if args.pid:
- bpf_text = bpf_text.replace('FILTER',
-  ('u32 pid; pid = bpf_get_current_pid_tgid(); ' +
-  'if (pid != %s) { return 0; }') % (args.pid))
+ bpf_text = bpf_text.replace('FILTER',
+  ('u32 pid; pid = bpf_get_current_pid_tgid(); ' +
+  'if (pid != %s) { return 0; }') % (args.pid))
 else:
- bpf_text = bpf_text.replace('FILTER', '')
+ bpf_text = bpf_text.replace('FILTER', '')
 if debug:
- print(bpf_text)
+ print(bpf_text)
 b = BPF(text=bpf_text)
 b.attach_kprobe(event_re=pattern, fn_name="trace_count")
 matched = b.num_open_kprobes()
 if matched == 0:
- print("0 functions matched by \"%s\". Exiting." % args.pattern)
- exit()
+ print("0 functions matched by \"%s\". Exiting." % args.pattern)
+ exit()
 
 # header
 print("Tracing %d functions for \"%s\"... Hit Ctrl-C to end." %
@@ -93,23 +94,23 @@ print("Tracing %d functions for \"%s\"... Hit Ctrl-C to end." %
 # output
 exiting = 0 if args.interval else 1
 while (1):
- try:
- sleep(int(args.interval))
- except KeyboardInterrupt:
- exiting=1
- # as cleanup can take many seconds, trap Ctrl-C:
- signal.signal(signal.SIGINT, signal_ignore)
+ try:
+ sleep(int(args.interval))
+ except KeyboardInterrupt:
+ exiting = 1
+ # as cleanup can take many seconds, trap Ctrl-C:
+ signal.signal(signal.SIGINT, signal_ignore)
 
- print()
- if args.timestamp:
- print("%-8s\n" % strftime("%H:%M:%S"), end="")
+ print()
+ if args.timestamp:
+ print("%-8s\n" % strftime("%H:%M:%S"), end="")
 
- print("%-16s %-26s %8s" % ("ADDR", "FUNC", "COUNT"))
- counts = b.get_table("counts")
- for k, v in sorted(counts.items(), key=lambda counts: counts[1].value):
- print("%-16x %-26s %8d" % (k.ip, b.ksym(k.ip), v.value))
- counts.clear()
+ print("%-16s %-26s %8s" % ("ADDR", "FUNC", "COUNT"))
+ counts = b.get_table("counts")
+ for k, v in sorted(counts.items(), key=lambda counts: counts[1].value):
+ print("%-16x %-26s %8d" % (k.ip, b.ksym(k.ip), v.value))
+ counts.clear()
 
- if exiting:
- print("Detaching...")
- exit()
+ if exiting:
+ print("Detaching...")
+ exit()