Skip to content

Console GIL fixes #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2018
Merged

Console GIL fixes #51

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
448f87a
Fix console calls in scintilla callbacks
bruderstein Feb 26, 2015
e21a057
More GIL fixes for the console
bruderstein Feb 27, 2015
4c3a445
Revert version change (back to 1.0.9)
bruderstein Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions PythonScript/src/PythonConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ void PythonConsole::initPython(PythonHandler *pythonHandler)
void PythonConsole::pythonShowDialog()
{
assert(mp_consoleDlg);
GILRelease release;
if (mp_consoleDlg)
{
// Post the message to ourselves (on the right thread) to create the window
Expand All @@ -144,6 +145,7 @@ void PythonConsole::showDialog()
assert(mp_consoleDlg);
if (mp_consoleDlg)
{
GILRelease release;
mp_consoleDlg->doDialog();
}
}
Expand All @@ -153,6 +155,7 @@ void PythonConsole::hideDialog()
assert(mp_consoleDlg);
if (mp_consoleDlg)
{
GILRelease release;
mp_consoleDlg->hide();
}
}
Expand All @@ -162,6 +165,7 @@ void PythonConsole::message(const char *msg)
assert(mp_consoleDlg);
if (mp_consoleDlg)
{
GILRelease release;
mp_consoleDlg->writeText(strlen(msg), msg);
}
}
Expand All @@ -171,6 +175,7 @@ void PythonConsole::clear()
assert(mp_consoleDlg);
if (mp_consoleDlg)
{
GILRelease release;
mp_consoleDlg->clearText();
}
}
Expand Down Expand Up @@ -272,23 +277,26 @@ void PythonConsole::queueComplete()

void PythonConsole::consume(std::shared_ptr<std::string> statement)
{
GILLock gilLock;

bool continuePrompt = false;
try
{
boost::python::object oldStdout = m_sys.attr("stdout");
m_sys.attr("stdout") = boost::python::ptr(this);
PyObject* unicodeCommand = PyUnicode_FromEncodedObject(boost::python::str(statement->c_str()).ptr(), "utf-8", NULL);
boost::python::object result = m_pushFunc(boost::python::handle<PyObject>(unicodeCommand));
//Py_DECREF(unicodeCommand);
m_sys.attr("stdout") = oldStdout;

continuePrompt = boost::python::extract<bool>(result);
}
catch(...)
{
PyErr_Print();
GILLock gilLock;

try
{
boost::python::object oldStdout = m_sys.attr("stdout");
m_sys.attr("stdout") = boost::python::ptr(this);
PyObject* unicodeCommand = PyUnicode_FromEncodedObject(boost::python::str(statement->c_str()).ptr(), "utf-8", NULL);
boost::python::object result = m_pushFunc(boost::python::handle<PyObject>(unicodeCommand));
//Py_DECREF(unicodeCommand);
m_sys.attr("stdout") = oldStdout;

continuePrompt = boost::python::extract<bool>(result);
}
catch(...)
{
PyErr_Print();
}

}

assert(mp_consoleDlg);
Expand Down