Changeset 34 for trunk/ext/_syckmodule.c

Timestamp:

12/27/05 15:52:07 (7 years ago)

Author:

xi

Message:

Release the GIL before doing blocking calls (fix #35).
Note that this fix makes _syck incompatible with Python 2.2 and earlier.

File:

• trunk/ext/_syckmodule.c (modified) (25 diffs)

trunk/ext/_syckmodule.c

@@ -1030 +1030 @@
 PySyckParser_node_handler(SyckParser *parser, SyckNode *node)
 {
+    PyGILState_STATE gs;
+
     PySyckParserObject *self = (PySyckParserObject *)parser->bonus;
 
@@ -1040 +1042 @@
     if (self->halt)
         return -1;
+
+    gs = PyGILState_Ensure();
 
     switch (node->kind) {
@@ -1099 +1103 @@
 
     index = PyList_GET_SIZE(self->symbols);
+    PyGILState_Release(gs);
     return index;
 
 error:
     Py_XDECREF(object);
+    PyGILState_Release(gs);
     self->halt = 1;
     return -1;
@@ -1110 +1116 @@
 PySyckParser_error_handler(SyckParser *parser, char *str)
 {
+    PyGILState_STATE gs;
+
     PySyckParserObject *self = (PySyckParserObject *)parser->bonus;
     PyObject *value;
 
     if (self->halt) return;
+
+    gs = PyGILState_Ensure();
 
     self->halt = 1;
@@ -1122 +1132 @@
         PyErr_SetObject(PySyck_Error, value);
     }
+
+    PyGILState_Release(gs);
 }
 
@@ -1127 +1139 @@
 PySyckParser_bad_anchor_handler(SyckParser *parser, char *anchor)
 {
+    PyGILState_STATE gs;
+
     PySyckParserObject *self = (PySyckParserObject *)parser->bonus;
 
     if (!self->halt) {
+        gs = PyGILState_Ensure();
+
         self->halt = 1;
         PyErr_SetString(PyExc_TypeError, "recursive anchors are not implemented");
+
+        PyGILState_Release(gs);
     }
 
@@ -1140 +1158 @@
 PySyckParser_read_handler(char *buf, SyckIoFile *file, long max_size, long skip)
 {
+    PyGILState_STATE gs;
+
     PySyckParserObject *self = (PySyckParserObject *)file->ptr;
 
@@ -1154 +1174 @@
     
     max_size -= skip;
+
+    gs = PyGILState_Ensure();
 
     value = PyObject_CallMethod(self->source, "read", "(i)", max_size);
     if (!value) {
         self->halt = 1;
+
+        PyGILState_Release(gs);
+
         return skip;
     }
@@ -1166 +1191 @@
         self->halt = 1;
         
+        PyGILState_Release(gs);
+
         return skip;
     }
@@ -1173 +1200 @@
     if (!length) {
         Py_DECREF(value);
+
+        PyGILState_Release(gs);
+
         return skip;
     }
@@ -1180 +1210 @@
         PyErr_SetString(PyExc_ValueError, "read returns an overly long string");
         self->halt = 1;
+
+        PyGILState_Release(gs);
+
         return skip;
     }
@@ -1188 +1221 @@
 
     Py_DECREF(value);
+
+    PyGILState_Release(gs);
 
     return length;
@@ -1269 +1304 @@
 
     self->parsing = 1;
+    Py_BEGIN_ALLOW_THREADS
     index = syck_parse(self->parser)-1;
+    Py_END_ALLOW_THREADS
     self->parsing = 0;
 
@@ -1550 +1587 @@
 PySyckEmitter_node_handler(SyckEmitter *emitter, st_data_t id)
 {
+    PyGILState_STATE gs;
+
     PySyckEmitterObject *self = (PySyckEmitterObject *)emitter->bonus;
 
@@ -1563 +1602 @@
     if (self->halt) return;
 
+    gs = PyGILState_Ensure();
+
     node = (PySyckNodeObject *)PyList_GetItem(self->symbols, id);
     if (!node) {
         PyErr_SetString(PyExc_RuntimeError, "unknown data id");
         self->halt = 1;
+        PyGILState_Release(gs);
         return;
     }
@@ -1574 +1616 @@
         if (!tag) {
             self->halt = 1;
+            PyGILState_Release(gs);
             return;
         }
@@ -1585 +1628 @@
             PyErr_SetString(PyExc_TypeError, "value of _syck.Seq must be a list");
             self->halt = 1;
+            PyGILState_Release(gs);
             return;
         }
@@ -1592 +1636 @@
             if ((index = PyDict_GetItem(self->nodes, item))) {
                 syck_emit_item(emitter, PyInt_AS_LONG(index));
-                if (self->halt) return;
+                if (self->halt) {
+                    PyGILState_Release(gs);
+                    return;
+                }
             }
             else {
                 PyErr_SetString(PyExc_RuntimeError, "sequence item is not marked");
                 self->halt = 1;
+                PyGILState_Release(gs);
                 return;
             }
@@ -1615 +1663 @@
                             "value of _syck.Map must be a list of pairs or a dictionary");
                     self->halt = 1;
+                    PyGILState_Release(gs);
                     return;
                 }
@@ -1621 +1670 @@
                     if ((index = PyDict_GetItem(self->nodes, item))) {
                         syck_emit_item(emitter, PyInt_AS_LONG(index));
-                        if (self->halt) return;
+                        if (self->halt) {
+                            PyGILState_Release(gs);
+                            return;
+                        }
                     }
                     else {
                         PyErr_SetString(PyExc_RuntimeError, "mapping item is not marked");
                         self->halt = 1;
+                        PyGILState_Release(gs);
                         return;
                     }
@@ -1638 +1691 @@
                     if ((index = PyDict_GetItem(self->nodes, item))) {
                         syck_emit_item(emitter, PyInt_AS_LONG(index));
-                        if (self->halt) return;
+                        if (self->halt) {
+                            PyGILState_Release(gs);
+                            return;
+                        }
                     }
                     else {
                         PyErr_SetString(PyExc_RuntimeError, "mapping item is not marked");
                         self->halt = 1;
+                        PyGILState_Release(gs);
                         return;
                     }
@@ -1652 +1709 @@
                     "value of _syck.Map must be a list of pairs or a dictionary");
             self->halt = 1;
+            PyGILState_Release(gs);
             return;
         }
@@ -1661 +1719 @@
         if (PyString_AsStringAndSize(node->value, &str, &len) < 0) {
             self->halt = 1;
+            PyGILState_Release(gs);
             return;
         }
@@ -1672 +1731 @@
         PyErr_SetString(PyExc_TypeError, "Node instance is required");
         self->halt = 1;
+        PyGILState_Release(gs);
         return;
     }   
-}
+    PyGILState_Release(gs);
+}
+
 static void
 PySyckEmitter_write_handler(SyckEmitter *emitter, char *buf, long len)
 {
+    PyGILState_STATE gs;
+
     PySyckEmitterObject *self = (PySyckEmitterObject *)emitter->bonus;
+
+    gs = PyGILState_Ensure();
 
     if (!PyObject_CallMethod(self->output, "write", "(s#)", buf, len))
         self->halt = 1;
+
+    PyGILState_Release(gs);
 }
 
@@ -1941 +2009 @@
     }
 
+    Py_BEGIN_ALLOW_THREADS
     syck_emit(self->emitter, 0);
     syck_emitter_flush(self->emitter, 0);
+    Py_END_ALLOW_THREADS
 
     syck_free_emitter(self->emitter);