refactor the main probe loop

docs/man.md

@@ -79,18 +79,17 @@ is not specified.
 
 The following options are less commonly used.
 
-**-T**, **--timestamp**
-:   Print the timestamp for each stack. This is useful for generating "flame
-    chart" profiles. Generally regular flame graphs are encouraged, since the
-    timestamp flame charts are harder to use.
-
 **--abi**=*VERSION*
 :   Force a particular Python ABI. This option should only be needed in edge
     cases when profiling embedded Python builds (e.g. uWSGI), and only if
     pyflame doesn't automatically detect the correct ABI. *VERSION* should be a
     two digit integer consisting of the Python major and minor version, e.g. 27
     for Python 2.7 or 36 for Python 3.6.
 
+**--flamechart**
+:   Print the timestamp for each stack. This is useful for generating "flame
+    chart" profiles. Generally regular flame graphs are encouraged, since the
+    timestamp flame charts are harder to use.
 
 # ONLINE DOCUMENTATION
 

docs/pyflame.man

@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 1.19.1
 .\"
-.TH "PYFLAME" "1" "July 2017" "" ""
+.TH "PYFLAME" "1" "August 2017" "" ""
 .hy
 .SH NAME
 .PP
@@ -106,14 +106,6 @@ Enable profiling multi\-threaded Python apps.
 .PP
 The following options are less commonly used.
 .TP
-.B \f[B]\-T\f[], \f[B]\-\-timestamp\f[]
-Print the timestamp for each stack.
-This is useful for generating "flame chart" profiles.
-Generally regular flame graphs are encouraged, since the timestamp flame
-charts are harder to use.
-.RS
-.RE
-.TP
 .B \f[B]\-\-abi\f[]=\f[I]VERSION\f[]
 Force a particular Python ABI.
 This option should only be needed in edge cases when profiling embedded
@@ -125,6 +117,14 @@ major and minor version, e.g.
 27 for Python 2.7 or 36 for Python 3.6.
 .RS
 .RE
+.TP
+.B \f[B]\-\-flamechart\f[]
+Print the timestamp for each stack.
+This is useful for generating "flame chart" profiles.
+Generally regular flame graphs are encouraged, since the timestamp flame
+charts are harder to use.
+.RS
+.RE
 .SH ONLINE DOCUMENTATION
 .PP
 You can find the complete documentation online at:

docs/usage.rst

@@ -109,14 +109,14 @@ stamp output format, useful for generating `"flame charts"
 inverted flame graph) that are viewable in Chrome. In some cases, the flame
 chart format is easier to understand.
 
-To generate a flame chart, use ``pyflame -T``, and then pass the output to
-``utils/flame-chart-json`` to convert the output into the JSON format required
-by the Chrome CPU profiler:
+To generate a flame chart, use ``pyflame --flamechart``, and then pass the
+output to ``utils/flame-chart-json`` to convert the output into the JSON format
+required by the Chrome CPU profiler:
 
 .. code:: bash
 
     # Generate flame chart data viewable in Chrome.
-    pyflame -T [other pyflame options] | flame-chart-json > foo.cpuprofile
+    pyflame --flamechart [other pyflame options] | flame-chart-json > foo.cpuprofile
 
 Read the following `Chrome DevTools article
 <https://developers.google.com/web/updates/2016/12/devtools-javascript-cpu-profile-migration>`__

src/Makefile.am

@@ -9,7 +9,7 @@
 # flags, and frob3{4,6}.cc are compiled with python3.4/3.6 flags.
 
 bin_PROGRAMS = pyflame
-pyflame_SOURCES = aslr.cc frame.cc thread.cc namespace.cc posix.cc ptrace.cc pyflame.cc pyfrob.cc symbol.cc
+pyflame_SOURCES = aslr.cc frame.cc thread.cc namespace.cc posix.cc prober.cc ptrace.cc pyflame.cc pyfrob.cc symbol.cc
 pyflame_LDADD =
 
 noinst_LTLIBRARIES =