[Python-checkins] cpython (merge 3.6 -> default): merge 3.6 (#28472)

Wed Oct 19 02:33:30 EDT 2016

https://hg.python.org/cpython/rev/dc10bd89473b
changeset: 104548:dc10bd89473b
parent: 104546:651922ea92b0
parent: 104547:5c21df505684
user: Benjamin Peterson <benjamin at python.org>
date: Tue Oct 18 23:33:24 2016 -0700
summary:
 merge 3.6 (#28472)
files:
 Doc/howto/instrumentation.rst | 10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst
--- a/Doc/howto/instrumentation.rst
+++ b/Doc/howto/instrumentation.rst
@@ -210,7 +210,7 @@
 
 .. code-block:: c
 
- probe process('python').mark("function__entry") {
+ probe process("python").mark("function__entry") {
 filename = user_string($arg1);
 funcname = user_string($arg2);
 lineno = $arg3;
@@ -219,7 +219,7 @@
 thread_indent(1), funcname, filename, lineno);
 }
 
- probe process('python').mark("function__return") {
+ probe process("python").mark("function__return") {
 filename = user_string($arg1);
 funcname = user_string($arg2);
 lineno = $arg3;
@@ -234,7 +234,7 @@
 
 $ stap \
 show-call-hierarchy.stp \
- -c ./python test.py
+ -c "./python test.py"
 
 The output looks like this::
 
@@ -259,11 +259,11 @@
 libpython shared library, and the probe's dotted path needs to reflect this. For
 example, this line from the above example::
 
- probe process('python').mark("function__entry") {
+ probe process("python").mark("function__entry") {
 
 should instead read::
 
- probe process('python').library("libpython3.6dm.so.1.0").mark("function__entry") {
+ probe process("python").library("libpython3.6dm.so.1.0").mark("function__entry") {
 
 (assuming a debug build of CPython 3.6)
 
-- 
Repository URL: https://hg.python.org/cpython
