Merge pull request #183 from iovisor/bblanco_dev

Shorten trace_readline_fields to trace_fields

examples/disksnoop.py

@@ -25,7 +25,7 @@ print("%-18s %-2s %-7s %8s" % ("TIME(s)", "T", "BYTES", "LAT(ms)"))
 
 # format output
 while 1:
-	(task, pid, cpu, flags, ts, msg) = b.trace_readline_fields()
+	(task, pid, cpu, flags, ts, msg) = b.trace_fields()
 	(bytes_s, bflags_s, us_s) = msg.split()
 
 	if int(bflags_s, 16) & REQ_WRITE:

src/python/bcc/__init__.py

@@ -492,8 +492,8 @@ class BPF(object):
         return tracefile
 
     @staticmethod
-    def trace_readline_fields(nonblocking=False):
-        """trace_readline_fields(nonblocking=False)
+    def trace_fields(nonblocking=False):
+        """trace_fields(nonblocking=False)
 
         Read from the kernel debug trace pipe and return a tuple of the
         fields (task, pid, cpu, flags, timestamp, msg) or None if no
@@ -537,13 +537,13 @@ class BPF(object):
 
         Read from the kernel debug trace pipe and print on stdout.
         If fmt is specified, apply as a format string to the output. See
-        trace_readline_fields for the members of the tuple
+        trace_fields for the members of the tuple
         example: trace_print(fmt="pid {1}, msg = {5}")
         """
 
         while True:
             if fmt:
-                fields = BPF.trace_readline_fields(nonblocking=False)
+                fields = BPF.trace_fields(nonblocking=False)
                 if not fields: continue
                 line = fmt.format(*fields)
             else:

tools/syncsnoop

@@ -28,5 +28,5 @@ print("%-18s %s" % ("TIME(s)", "CALL"))
 
 # format output
 while 1:
-	(task, pid, cpu, flags, ts, msg) = b.trace_readline_fields()
+	(task, pid, cpu, flags, ts, msg) = b.trace_fields()
 	print("%-18.9f %s" % (ts, msg))