lin-epics-modules/pyDevSup
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid deadlock between GIL and scan locks

Browse Source
This commit is contained in:
Michael Davidsaver
2019-06-05 12:04:00 +02:00
parent c4a1c7deea
commit e2ca483507
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devsupApp/src/dbrec.c
View File

@ -272,7 +272,9 @@ static PyObject *pyRecord_asyncFinish(pyRecord *self, PyObject *args, PyObject *
static PyObject *pyRecord_enter(pyRecord *self) static PyObject *pyRecord_enter(pyRecord *self)
{ {
Py_BEGIN_ALLOW_THREADS {
dbScanLock(self->entry.precnode->precord); dbScanLock(self->entry.precnode->precord);
} Py_END_ALLOW_THREADS
Py_INCREF(self); Py_INCREF(self);
return (PyObject*)self; return (PyObject*)self;
@ -282,8 +284,10 @@ static PyObject *pyRecord_exit(pyRecord *self, PyObject *args)
{ {
PyObject *t, *v, *tb; PyObject *t, *v, *tb;
Py_BEGIN_ALLOW_THREADS {
/* always unlock, regardless of arguments */ /* always unlock, regardless of arguments */
dbScanUnlock(self->entry.precnode->precord); dbScanUnlock(self->entry.precnode->precord);
} Py_END_ALLOW_THREADS
if(!PyArg_ParseTuple(args, "OOO", &t, &v, &tb)) if(!PyArg_ParseTuple(args, "OOO", &t, &v, &tb))
return NULL; return NULL;