use PyBUF_LOCK instead of PyBUF_SIMPLE for bsddb data access as it'll often

gpshead · gpshead · commit c55485bc6d4a · 2008-03-17T20:16:47.000Z
be using the data buffer provided without the GIL held.
diff --git a/Modules/_bsddb.c b/Modules/_bsddb.c
@@ -312,10 +312,9 @@ static Py_buffer * _malloc_view(PyObject *obj)
                         "Py_buffer malloc failed");
         return NULL;
     }
-    /* XXX(gps): PyBUF_LOCKDATA is desired to prevent other theads from
-       trashing the data buffer while we release the GIL during the db
-       operation.  see http://bugs.python.org/issue1035 */
-    if (PyObject_GetBuffer(obj, view, PyBUF_SIMPLE) == -1) {
+    /* We use PyBUF_LOCK to prevent other threads from trashing the data
+       buffer while we release the GIL.  http://bugs.python.org/issue1035 */
+    if (PyObject_GetBuffer(obj, view, PyBUF_LOCK) == -1) {
         PyMem_Free(view);
         return NULL;
     }

Original file line number	Diff line number	Diff line change
`@@ -312,10 +312,9 @@ static Py_buffer * _malloc_view(PyObject *obj)`
`312`	`312`	`"Py_buffer malloc failed");`
`313`	`313`	`return NULL;`
`314`	`314`	`}`
`315`		`- /* XXX(gps): PyBUF_LOCKDATA is desired to prevent other theads from`
`316`		`- trashing the data buffer while we release the GIL during the db`
`317`		`- operation. see http://bugs.python.org/issue1035 */`
`318`		`- if (PyObject_GetBuffer(obj, view, PyBUF_SIMPLE) == -1) {`
	`315`	`+ /* We use PyBUF_LOCK to prevent other threads from trashing the data`
	`316`	`+ buffer while we release the GIL. http://bugs.python.org/issue1035 */`
	`317`	`+ if (PyObject_GetBuffer(obj, view, PyBUF_LOCK) == -1) {`
`319`	`318`	`PyMem_Free(view);`
`320`	`319`	`return NULL;`
`321`	`320`	`}`