tracer: pep8 cleanup

diff --git a/tracer/tracer/analysis_runner.py b/tracer/tracer/analysis_runner.py
index 292b6ab..f2ba8bf 100644 (file)
--- a/tracer/tracer/analysis_runner.py
+++ b/tracer/tracer/analysis_runner.py
@@ -1,6 +1,7 @@
 from tracer.parser import Parser
 from tracer.structure import Structure
 
+
 class AnalysisRunner(object):
     """
     Runs several Analyzers over a log.
@@ -25,8 +26,8 @@ class AnalysisRunner(object):
 
     def is_tracer_class(self, event):
         return (event[Parser.F_FILENAME] == 'gsttracerrecord.c' and
-                    event[Parser.F_CATEGORY] == 'GST_TRACER' and
-                    '.class' in event[Parser.F_MESSAGE])
+                event[Parser.F_CATEGORY] == 'GST_TRACER' and
+                '.class' in event[Parser.F_MESSAGE])
 
     def is_tracer_entry(self, event):
         return (not event[Parser.F_LINE] and not event[Parser.F_FILENAME])

diff --git a/tracer/tracer/analysis_runner_test.py b/tracer/tracer/analysis_runner_test.py
index 88611ab..a86b7ac 100644 (file)
--- a/tracer/tracer/analysis_runner_test.py
+++ b/tracer/tracer/analysis_runner_test.py
@@ -2,9 +2,18 @@ import unittest
 
 from tracer.analysis_runner import AnalysisRunner
 
-TRACER_CLASS = ('0:00:00.036373170', 1788, '0x23bca70', 'TRACE', 'GST_TRACER', 'gsttracerrecord.c', 110, 'gst_tracer_record_build_format', None, r'latency.class, src=(structure)"scope\\,\\ type\\=\\(type\\)gchararray\\,\\ related-to\\=\\(GstTracerValueScope\\)GST_TRACER_VALUE_SCOPE_PAD\\;", sink=(structure)"scope\\,\\ type\\=\\(type\\)gchararray\\,\\ related-to\\=\\(GstTracerValueScope\\)GST_TRACER_VALUE_SCOPE_PAD\\;", time=(structure)"value\\,\\ type\\=\\(type\\)guint64\\,\\ description\\=\\(string\\)\\"time\\\\\\ it\\\\\\ took\\\\\\ for\\\\\\ the\\\\\\ buffer\\\\\\ to\\\\\\ go\\\\\\ from\\\\\\ src\\\\\\ to\\\\\\ sink\\\\\\ ns\\"\\,\\ flags\\=\\(GstTracerValueFlags\\)GST_TRACER_VALUE_FLAGS_AGGREGATED\\,\\ min\\=\\(guint64\\)0\\,\\ max\\=\\(guint64\\)18446744073709551615\\;";')
+TRACER_CLASS = (
+    '0:00:00.036373170', 1788, '0x23bca70', 'TRACE', 'GST_TRACER',
+    'gsttracerrecord.c', 110, 'gst_tracer_record_build_format', None,
+    r'latency.class, src=(structure)"scope\\,\\ type\\=\\(type\\)gchararray\\,\\ related-to\\=\\(GstTracerValueScope\\)GST_TRACER_VALUE_SCOPE_PAD\\;", sink=(structure)"scope\\,\\ type\\=\\(type\\)gchararray\\,\\ related-to\\=\\(GstTracerValueScope\\)GST_TRACER_VALUE_SCOPE_PAD\\;", time=(structure)"value\\,\\ type\\=\\(type\\)guint64\\,\\ description\\=\\(string\\)\\"time\\\\\\ it\\\\\\ took\\\\\\ for\\\\\\ the\\\\\\ buffer\\\\\\ to\\\\\\ go\\\\\\ from\\\\\\ src\\\\\\ to\\\\\\ sink\\\\\\ ns\\"\\,\\ flags\\=\\(GstTracerValueFlags\\)GST_TRACER_VALUE_FLAGS_AGGREGATED\\,\\ min\\=\\(guint64\\)0\\,\\ max\\=\\(guint64\\)18446744073709551615\\;";'
+)
+
+TRACER_ENTRY = (
+    '0:00:00.142391137', 1788, '0x7f8a201056d0', 'TRACE', 'GST_TRACER',
+    '', 0, '', None,
+    r'latency, src=(string)source_src, sink=(string)pulsesink0_sink, time=(guint64)47091349;'
+)
 
-TRACER_ENTRY = ('0:00:00.142391137', 1788, '0x7f8a201056d0', 'TRACE', 'GST_TRACER', '', 0, '', None, r'latency, src=(string)source_src, sink=(string)pulsesink0_sink, time=(guint64)47091349;')
 
 class TestAnalysisRunner(unittest.TestCase):
 
@@ -15,4 +24,3 @@ class TestAnalysisRunner(unittest.TestCase):
     def test_detect_tracer_entry(self):
         a = AnalysisRunner(None)
         self.assertTrue(a.is_tracer_entry(TRACER_ENTRY))
-

diff --git a/tracer/tracer/analyzer.py b/tracer/tracer/analyzer.py
index c4e6c7e..2404132 100644 (file)
--- a/tracer/tracer/analyzer.py
+++ b/tracer/tracer/analyzer.py
@@ -12,4 +12,4 @@ class Analyzer(object):
         pass
 
     def handle_tracer_entry(self, event):
-        pass
\ No newline at end of file
+        pass

diff --git a/tracer/tracer/parser.py b/tracer/tracer/parser.py
index 22847b9..ff05117 100644 (file)
--- a/tracer/tracer/parser.py
+++ b/tracer/tracer/parser.py
@@ -2,14 +2,7 @@ import os
 import re
 import sys
 
-# new tracer class
-# 0:00:00.041536066  1788      0x14b2150 TRACE             GST_TRACER gsttracerrecord.c:110:gst_tracer_record_build_format: latency.class, src=(structure)"scope\,\ type\=\(GType\)NULL\,\ related-to\=\(GstTracerValueScope\)GST_TRACER_VALUE_SCOPE_PAD\;", sink=(structure)"scope\,\ type\=\(GType\)NULL\,\ related-to\=\(GstTracerValueScope\)GST_TRACER_VALUE_SCOPE_PAD\;", time=(structure)"value\,\ type\=\(GType\)NULL\,\ description\=\(string\)\"time\\\ it\\\ took\\\ for\\\ the\\\ buffer\\\ to\\\ go\\\ from\\\ src\\\ to\\\ sink\\\ ns\"\,\ flags\=\(GstTracerValueFlags\)GST_TRACER_VALUE_FLAGS_AGGREGATED\,\ min\=\(guint64\)0\,\ max\=\(guint64\)18446744073709551615\;";
 
-# tracer log entry
-# 0:00:00.079422574  7664      0x238ac70 TRACE             GST_TRACER :0:: thread-rusage, thread-id=(guint64)37268592, ts=(guint64)79416000, average-cpuload=(uint)1000, current-cpuload=(uint)1000, time=(guint64)79418045;
-
-# from log tracer
-# 0:00:00.460486001 18356      0x21de780 TRACE       GST_ELEMENT_PADS :0:do_element_add_pad:<GstBaseSink@0x429e880> 0:00:00.460483603, key=val, ...
 def _log_line_regex():
 
     # "0:00:00.777913000  "

diff --git a/tracer/tracer/parser_test.py b/tracer/tracer/parser_test.py
index dc0f3c7..27a41de 100644 (file)
--- a/tracer/tracer/parser_test.py
+++ b/tracer/tracer/parser_test.py
@@ -14,6 +14,7 @@ TRACER_CLASS_LOG_DATA = [
     '0:00:00.041536066  1788      0x14b2150 TRACE             GST_TRACER gsttracerrecord.c:110:gst_tracer_record_build_format: latency.class, src=(structure)"scope\,\ type\=\(type\)gchararray\,\ related-to\=\(GstTracerValueScope\)GST_TRACER_VALUE_SCOPE_PAD\;", sink=(structure)"scope\,\ type\=\(type\)gchararray\,\ related-to\=\(GstTracerValueScope\)GST_TRACER_VALUE_SCOPE_PAD\;", time=(structure)"value\,\ type\=\(type\)guint64\,\ description\=\(string\)\"time\\\ it\\\ took\\\ for\\\ the\\\ buffer\\\ to\\\ go\\\ from\\\ src\\\ to\\\ sink\\\ ns\"\,\ flags\=\(GstTracerValueFlags\)GST_TRACER_VALUE_FLAGS_AGGREGATED\,\ min\=\(guint64\)0\,\ max\=\(guint64\)18446744073709551615\;";'
 ]
 
+
 class TestParser(unittest.TestCase):
 
     def test___init__(self):

diff --git a/tracer/tracer/structure.py b/tracer/tracer/structure.py
index 0927b6b..b28fb26 100644 (file)
--- a/tracer/tracer/structure.py
+++ b/tracer/tracer/structure.py
@@ -9,6 +9,7 @@ INT_TYPES = "".join(
     ("int", "uint", "int8", "uint8", "int16", "uint16", "int32", "uint32", "int64", "uint64")
 )
 
+
 class Structure(object):
     """
     Gst Structure parser.
@@ -83,7 +84,7 @@ class Structure(object):
                 if p == -1:
                     p = s.index(';')
                     scan = False
-                v= s[:p]
+                v = s[:p]
 
             if t == 'structure':
                 v = Structure(v)

diff --git a/tracer/tracer/structure_perf.py b/tracer/tracer/structure_perf.py
index 3af5a29..e925a4a 100644 (file)
--- a/tracer/tracer/structure_perf.py
+++ b/tracer/tracer/structure_perf.py
@@ -10,38 +10,50 @@ NESTED_STRUCTURE = r'latency.class, src=(structure)"scope\,\ type\=\(type\)gchar
 NAT_STRUCTURE = Structure(PLAIN_STRUCTURE)
 GI_STRUCTURE = Gst.Structure.from_string(PLAIN_STRUCTURE)[0]
 
+
 # native python impl
 
 def nat_parse_plain():
     s = Structure(PLAIN_STRUCTURE)
 
+
 def nat_parse_nested():
     s = Structure(NESTED_STRUCTURE)
 
+
 def nat_get_name():
     return NAT_STRUCTURE.name
 
+
 def nat_get_value():
     return NAT_STRUCTURE.values['thread-id']
 
+
 # gstreamer impl via gi
 
 def gi_parse_plain():
     s = Gst.Structure.from_string(PLAIN_STRUCTURE)[0]
 
+
 def gi_parse_nested():
     s = Gst.Structure.from_string(NESTED_STRUCTURE)[0]
 
+
 def gi_get_name():
     return GI_STRUCTURE.get_name()
 
+
 def gi_get_value():
     return GI_STRUCTURE.get_value('thread-id')
 
+
+# perf test
+
 def perf(method, n, flavor):
     t = timeit.timeit(method + '()', 'from __main__ import ' + method, number=n)
     print("%6s: %lf s, (%lf calls/s)" % (flavor, t, (n/t)))
 
+
 if __name__ == '__main__':
     import argparse
     parser = argparse.ArgumentParser()

diff --git a/tracer/tracer/structure_test.py b/tracer/tracer/structure_test.py
index ece7ec3..0ed730d 100644 (file)
--- a/tracer/tracer/structure_test.py
+++ b/tracer/tracer/structure_test.py
@@ -22,6 +22,7 @@ REGRESSIONS = [
     r'message, thread-id=(guint64)139838900680560, ts=(guint64)1000451258, element-ix=(uint)2, name=(string)tag, structure=(structure)"GstMessageTag\,\ taglist\=\(taglist\)\"taglist\\\,\\\ datetime\\\=\\\(datetime\\\)2009-03-05T12:57:08Z\\\,\\\ private-qt-tag\\\=\\\(sample\\\)\\\{\\\ 00000019677373740000001164617461000000010000000030:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3NzdC10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\,\\\ 0000001e6773746400000016646174610000000100000000313335353130:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3N0ZC10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\,\\\ 0000003867737364000000306461746100000001000000004244354241453530354d4d313239353033343539373733353435370000000000:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3NzZC10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\,\\\ 0000009867737075000000906461746100000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3NwdS10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\,\\\ 000000986773706d000000906461746100000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3NwbS10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\,\\\ 0000011867736868000001106461746100000001000000007631302e6c736361636865332e632e796f75747562652e636f6d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000:None:R3N0U2VnbWVudCwgZmxhZ3M9KEdzdFNlZ21lbnRGbGFncylHU1RfU0VHTUVOVF9GTEFHX05PTkUsIHJhdGU9KGRvdWJsZSkxLCBhcHBsaWVkLXJhdGU9KGRvdWJsZSkxLCBmb3JtYXQ9KEdzdEZvcm1hdClHU1RfRk9STUFUX1RJTUUsIGJhc2U9KGd1aW50NjQpMCwgb2Zmc2V0PShndWludDY0KTAsIHN0YXJ0PShndWludDY0KTAsIHN0b3A9KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTUsIHRpbWU9KGd1aW50NjQpMCwgcG9zaXRpb249KGd1aW50NjQpMCwgZHVyYXRpb249KGd1aW50NjQpMTg0NDY3NDQwNzM3MDk1NTE2MTU7AA__:YXBwbGljYXRpb24veC1nc3QtcXQtZ3NoaC10YWcsIHN0eWxlPShzdHJpbmcpaXR1bmVzOwA_\\\ \\\}\\\,\\\ container-format\\\=\\\(string\\\)\\\"ISO\\\\\\\ MP4/M4A\\\"\\\;\"\;";',
 ]
 
+
 class TestStructure(unittest.TestCase):
 
     def test_handles_bad_name(self):