Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r72052:6203aeedc273
Date: 2014-06-15 12:16 +0200
http://bitbucket.org/pypy/pypy/changeset/6203aeedc273/
Log: merge heads
diff --git a/pypy/doc/config/translation.log.txt
b/pypy/doc/config/translation.log.txt
--- a/pypy/doc/config/translation.log.txt
+++ b/pypy/doc/config/translation.log.txt
@@ -2,4 +2,4 @@
These must be enabled by setting the PYPYLOG environment variable.
The exact set of features supported by PYPYLOG is described in
-pypy/translation/c/src/debug_print.h.
+rpython/translator/c/src/debug_print.h.
diff --git a/pypy/doc/man/pypy.1.rst b/pypy/doc/man/pypy.1.rst
--- a/pypy/doc/man/pypy.1.rst
+++ b/pypy/doc/man/pypy.1.rst
@@ -95,13 +95,12 @@
``PYPYLOG``
If set to a non-empty value, enable logging, the format is:
- *fname*
+ *fname* or *+fname*
logging for profiling: includes all
``debug_start``/``debug_stop`` but not any nested
``debug_print``.
*fname* can be ``-`` to log to *stderr*.
- Note that using a : in fname is a bad idea, Windows
- users, beware.
+ The *+fname* form can be used if there is a *:* in fname
``:``\ *fname*
Full logging, including ``debug_print``.
diff --git a/rpython/translator/c/src/debug_print.h
b/rpython/translator/c/src/debug_print.h
--- a/rpython/translator/c/src/debug_print.h
+++ b/rpython/translator/c/src/debug_print.h
@@ -6,12 +6,13 @@
/* values of the PYPYLOG environment variable:
("top-level" debug_prints means not between debug_start and debug_stop)
- (empty) logging is turned off, apart from top-level debug_prints
+ (empty) logging is turned off, apart from top-level debug_prints
that go to stderr
- fname logging for profiling: includes all debug_start/debug_stop
- but not any nested debug_print
- :fname full logging
- prefix:fname conditional logging
+ fname or +fname logging for profiling: includes all debug_start/debug_stop
+ but not any nested debug_print, use +fname if there is a
+ colon : in fname
+ :fname full logging
+ prefix:fname conditional logging
prefix1,prefix2:fname conditional logging with multiple selections
Conditional logging means that it only includes the debug_start/debug_stop
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
