generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

using RAII to manage GIL -- still fails to handle exceptions correctly

Browse Source
This commit is contained in:
Alexander Mordvintsev 2012-03-07 12:46:21 +00:00
parent 58174f6ada
commit 0e27c772aa
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/python/src2/cv2.cpp
View File

@ -105,6 +105,22 @@ static inline int* refcountFromPyObject(const PyObject* obj)
return (int*)((size_t)obj + REFCOUNT_OFFSET);
}
class PyAllowThreads
{
public:
PyAllowThreads() : _state(PyEval_SaveThread())
{
//printf("+GIL\n");
}
~PyAllowThreads()
{
PyEval_RestoreThread(_state);
//printf("-GIL\n");
}
private:
PyThreadState* _state;
};
class NumpyAllocator : public MatAllocator
{
public:

7
modules/python/src2/gen2.py
View File

@ -19,9 +19,10 @@ gen_template_parse_args = Template("""const char* keywords[] = { $kw_list, NULL
gen_template_func_body = Template("""$code_decl
$code_parse
{
Py_BEGIN_ALLOW_THREADS
$code_fcall;
Py_END_ALLOW_THREADS
{
PyAllowThreads allow;
$code_fcall;
}
$code_ret;
}
""")