Merge pull request #312 from iovisor/ast_dev

fix pep8 lint errors in the rest of the tools

tools/funccount

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # funccount Count kernel function calls.
 #           For Linux, uses BCC, eBPF. See .c file.
@@ -96,7 +97,7 @@ while (1):
     try:
         sleep(int(args.interval))
     except KeyboardInterrupt:
-		exiting=1
+        exiting = 1
         # as cleanup can take many seconds, trap Ctrl-C:
         signal.signal(signal.SIGINT, signal_ignore)
 

tools/funclatency

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # funclatency   Time kernel funcitons and print latency as a histogram.
 #               For Linux, uses BCC, eBPF.
@@ -168,7 +169,7 @@ while (1):
     try:
         sleep(int(args.interval))
     except KeyboardInterrupt:
-		exiting=1
+        exiting = 1
         # as cleanup can take many seconds, trap Ctrl-C:
         signal.signal(signal.SIGINT, signal_ignore)
 

tools/hardirqs

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # hardirqs  Summarize hard IRQ (interrupt) event time.
 #           For Linux, uses BCC, eBPF.
@@ -136,7 +137,7 @@ while (1):
     try:
         sleep(int(args.interval))
     except KeyboardInterrupt:
-		exiting=1
+        exiting = 1
 
     print()
     if args.timestamp:

tools/killsnoop

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # killsnoop Trace signals issued by the kill() syscall.
 #           For Linux, uses BCC, eBPF. Embedded C.

tools/opensnoop

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # opensnoop Trace open() syscalls.
 #           For Linux, uses BCC, eBPF. Embedded C.
@@ -97,9 +98,11 @@ while 1:
 
     # split return value into FD and errno columns
     if ret >= 0:
-		fd_s = ret; err = 0
+        fd_s = ret
+        err = 0
     else:
-		fd_s = "-1"; err = - ret
+        fd_s = "-1"
+        err = - ret
 
     # print columns
     if args.timestamp:

tools/opensnoop_example.txt

@@ -79,12 +79,6 @@ PID    COMM               FD ERR PATH
 18384  df        -1   2 /usr/share/locale/en.UTF-8/LC_MESSAGES/coreutils.mo
 18384  df        -1   2 /usr/share/locale/en.utf8/LC_MESSAGES/coreutils.mo
 18384  df        -1   2 /usr/share/locale/en/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en_US.UTF-8/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en_US.utf8/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en_US/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en.UTF-8/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en.utf8/LC_MESSAGES/coreutils.mo
-18384  df                 -1   2 /usr/share/locale-langpack/en/LC_MESSAGES/coreutils.mo
 18385  run       -1   6 /dev/tty
 18386  run       -1   6 /dev/tty
 

tools/pidpersec

 #!/usr/bin/python
-# vim: ts=8 noet sw=8
+# @lint-avoid-python-3-compatibility-imports
 #
 # pidpersec Count new processes (via fork).
 #           For Linux, uses BCC, eBPF. See .c file.
@@ -14,11 +14,11 @@
 # 11-Aug-2015   Brendan Gregg   Created this.
 
 from bcc import BPF
-from ctypes import c_ushort, c_int, c_ulonglong
+from ctypes import c_int
 from time import sleep, strftime
 
 # load BPF program
-b = BPF(src_file = "pidpersec.c")
+b = BPF(src_file="pidpersec.c")
 b.attach_kprobe(event="sched_fork", fn_name="do_count")
 
 # stat indexes

tools/softirqs

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # softirqs  Summarize soft IRQ (interrupt) event time.
 #           For Linux, uses BCC, eBPF.
@@ -126,7 +127,7 @@ while (1):
     try:
         sleep(int(args.interval))
     except KeyboardInterrupt:
-		exiting=1
+        exiting = 1
 
     print()
     if args.timestamp:

tools/syncsnoop

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # syncsnoop Trace sync() syscall.
 #           For Linux, uses BCC, eBPF. Embedded C.
@@ -15,7 +16,7 @@ from __future__ import print_function
 from bcc import BPF
 
 # load BPF program
-b = BPF(text = """
+b = BPF(text="""
 void kprobe__sys_sync(void *ctx) {
     bpf_trace_printk("sync()\\n");
 };

tools/tcpaccept

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # tcpaccept Trace TCP accept()s.
 #           For Linux, uses BCC, eBPF. Embedded C.

tools/tcpconnect

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # tcpconnect    Trace TCP connect()s.
 #               For Linux, uses BCC, eBPF. Embedded C.

tools/vfscount

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # vfscount  Count VFS calls ("vfs_*").
 #           For Linux, uses BCC, eBPF. See .c file.
@@ -15,7 +16,7 @@ from bcc import BPF
 from time import sleep
 
 # load BPF program
-b = BPF(src_file = "vfscount.c")
+b = BPF(src_file="vfscount.c")
 b.attach_kprobe(event_re="^vfs_.*", fn_name="do_count")
 
 # header

tools/vfsstat

 #!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
 #
 # vfsstat   Count some VFS calls.
 #           For Linux, uses BCC, eBPF. See .c file.
@@ -14,7 +15,7 @@
 
 from __future__ import print_function
 from bcc import BPF
-from ctypes import c_ushort, c_int, c_ulonglong
+from ctypes import c_int
 from time import sleep, strftime
 from sys import argv
 
@@ -36,7 +37,7 @@ if len(argv) > 1:
         usage()
 
 # load BPF program
-b = BPF(src_file = "vfsstat.c")
+b = BPF(src_file="vfsstat.c")
 b.attach_kprobe(event="vfs_read", fn_name="do_read")
 b.attach_kprobe(event="vfs_write", fn_name="do_write")
 b.attach_kprobe(event="vfs_fsync", fn_name="do_fsync")
@@ -45,11 +46,11 @@ b.attach_kprobe(event="vfs_create", fn_name="do_create")
 
 # stat column labels and indexes
 stat_types = {
-	"READ" : 1,
-	"WRITE" : 2,
-	"FSYNC" : 3,
-	"OPEN" : 4,
-	"CREATE" : 5
+    "READ": 1,
+    "WRITE": 2,
+    "FSYNC": 3,
+    "OPEN": 4,
+    "CREATE": 5
 }
 
 # header
@@ -69,7 +70,8 @@ while (1):
     try:
         sleep(interval)
     except KeyboardInterrupt:
-		pass; exit()
+        pass
+        exit()
 
     print("%-8s: " % strftime("%H:%M:%S"), end="")
     # print each statistic as a column