lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set general global handle for extension registration work

Browse Source 
* When calling the register() function there is no frame or globals, so we need
  to set an internal handle external to that.
* This means functions that get wrapped know that there's a global handler for
  exceptions, which just prints to the log. Otherwise they think they're running
  synchronously and write to an invalid exception handling object.
This commit is contained in:
baldurk
2018-10-23 15:36:35 +01:00
parent 8447e43e78
commit 1720d321e5
3 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/pyrenderdoc/PythonContext.cpp
+40
View File
@@ -129,6 +129,8 @@ static PyMethodDef OutputRedirector_methods[] = {
PyObject *PythonContext::main_dict = NULL;
QMap<rdcstr, PyObject *> PythonContext::extensions;
static PyObject *current_global_handle = NULL;
void FetchException(QString &typeStr, QString &valueStr, int &finalLine, QList<QString> &frames)
{
PyObject *exObj = NULL, *valueObj = NULL, *tracebackObj = NULL;
@@ -498,6 +500,8 @@ bool PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extension)
PyObject *ext = NULL;
current_global_handle = PyObject_GetAttrString(sysobj, "stdout");
if(extensions[extension] == NULL)
{
qInfo() << "First load of " << QString(extension);
@@ -640,6 +644,8 @@ bool PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extension)
Py_DecRef(syspath);
current_global_handle = NULL;
return ext != NULL;
}
@@ -1157,6 +1163,11 @@ extern "C" PyThreadState *GetExecutingThreadState(PyObject *global_handle)
return NULL;
}
extern "C" PyObject *GetCurrentGlobalHandle()
{
return current_global_handle;
}
extern "C" void HandleException(PyObject *global_handle)
{
QString typeStr;
@@ -1168,7 +1179,36 @@ extern "C" void HandleException(PyObject *global_handle)
OutputRedirector *redirector = (OutputRedirector *)global_handle;
if(redirector && redirector->context)
{
emit redirector->context->exception(typeStr, valueStr, finalLine, frames);
}
else if(redirector && !redirector->context)
{
// if still NULL we're running in the extension context
std::string exString;
if(!frames.isEmpty())
{
exString += "Traceback (most recent call last):\n";
for(const QString &f : frames)
exString += " " + f.toUtf8().toStdString() + "\n";
}
exString += typeStr.toUtf8().toStdString() + ": " + valueStr.toUtf8().toStdString() + "\n";
_frame *frame = PyEval_GetFrame();
QString filename = lit("unknown");
int linenum = 0;
if(frame)
{
filename = ToQStr(frame->f_code->co_filename);
linenum = PyFrame_GetLineNumber(frame);
}
RENDERDOC_LogMessage(LogType::Error, "EXTN", filename.toUtf8().data(), linenum, exString.c_str());
}
}
extern "C" bool IsThreadBlocking(PyObject *global_handle)