summaryrefslogtreecommitdiff
path: root/src/pyinterp.cc
diff options
context:
space:
mode:
authorAndy Clayton <q3aiml@gmail.com>2020-03-25 19:46:23 -0500
committerMartin Michlmayr <tbm@cyrius.com>2020-03-26 11:07:46 +0800
commit6d20807d1ac95feef1dc24712e16f63007311c94 (patch)
treeeed96045b6c6aa4704c9ab6377852499fad8328f /src/pyinterp.cc
parent2c77b8292329f00fd22e9542848c1a32888ca8f5 (diff)
downloadfork-ledger-6d20807d1ac95feef1dc24712e16f63007311c94.tar.gz
fork-ledger-6d20807d1ac95feef1dc24712e16f63007311c94.tar.bz2
fork-ledger-6d20807d1ac95feef1dc24712e16f63007311c94.zip
py3: ensure python output is not lost
Unbuffer python's stdio to avoid output getting stuck in buffer when stdout is not a TTY. Normally buffers are flushed by `Py_Finalize` but Boost has a long-standing issue preventing the proper shutdown of the interpreter with `Py_Finalize` when embedded [1]. This applies the same fix as 139beba but to any ledger usage rather than only the test suite. I removed `PYTHONUNBUFFERED=1` from tests as there is no expectation that users should need to have this set for ledger to function. For example without this fix piping ledger into cat usually loses any output (unless the output is large enough to cause the buffer to flush): $ ./ledger -f "test/baseline/feat-value_py3.test" reg <class 'bool'> True [...] $ ./ledger -f "test/baseline/feat-value_py3.test" reg | cat $ Interestingly `--verify` causes `python_interpreter_t` to be destroyed -- it doesn't appear to be otherwise -- which does call `Py_Finalize`. As expected this fixes the issue but can also crash due to the boost issue mentioned above: $ ./ledger -f "test/baseline/feat-value_py3.test" --verify reg <class 'bool'> True [...] Segmentation fault (core dumped) $ ./ledger -f "test/baseline/feat-value_py3.test" --verify reg | cat <class 'bool'> True [...] $ 1. https://www.boost.org/doc/libs/1_62_0/libs/python/doc/html/tutorial/tutorial/embedding.html
Diffstat (limited to 'src/pyinterp.cc')
-rw-r--r--src/pyinterp.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/pyinterp.cc b/src/pyinterp.cc
index 5381758e..72995eb6 100644
--- a/src/pyinterp.cc
+++ b/src/pyinterp.cc
@@ -151,6 +151,11 @@ void python_interpreter_t::initialize()
DEBUG("python.interp", "Initializing Python");
#if PY_MAJOR_VERSION >= 3
+ // Unbuffer stdio to avoid python output getting stuck in buffer when
+ // stdout is not a TTY. Normally buffers are flushed by Py_Finalize but
+ // Boost has a long-standing issue preventing proper shutdown of the
+ // interpreter with Py_Finalize when embedded.
+ Py_UnbufferedStdioFlag = 1;
// PyImport_AppendInittab docs: "This should be called before Py_Initialize()".
PyImport_AppendInittab((char*)"ledger", PyInit_ledger);
#endif