Ticket #67: _syckmodule.diff

_syckmodule.c

@@ -1029 +1029 @@
 static SYMID
 PySyckParser_node_handler(SyckParser *parser, SyckNode *node)
 {
-    PyGILState_STATE gs;
-
     PySyckParserObject *self = (PySyckParserObject *)parser->bonus;
 
     SYMID index;
@@ -1042 +1040 @@
     if (self->halt)
         return -1;
 
-    gs = PyGILState_Ensure();
-
     switch (node->kind) {
 
         case syck_str_kind:
@@ -1104 +1100 @@
     Py_DECREF(object);
 
     index = PyList_GET_SIZE(self->symbols);
-    PyGILState_Release(gs);
     return index;
 
 error:
     Py_XDECREF(object);
-    PyGILState_Release(gs);
     self->halt = 1;
     return -1;
 }
@@ -1117 +1111 @@
 static void
 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;
 
     value = Py_BuildValue("(sii)", str,
@@ -1134 +1124 @@
         PyErr_SetObject(PySyck_Error, value);
     }
 
-    PyGILState_Release(gs);
 }
 
 SyckNode *
 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);
     }
 
     return syck_alloc_str();
@@ -1159 +1142 @@
 static long
 PySyckParser_read_handler(char *buf, SyckIoFile *file, long max_size, long skip)
 {
-    PyGILState_STATE gs;
-
     PySyckParserObject *self = (PySyckParserObject *)file->ptr;
 
     PyObject *value;
@@ -1176 +1157 @@
     
     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;
     }
 
@@ -1192 +1169 @@
         PyErr_SetString(PyExc_TypeError, "file-like object should return a string");
         self->halt = 1;
         
-        PyGILState_Release(gs);
-
         return skip;
     }
 
@@ -1202 +1177 @@
     if (!length) {
         Py_DECREF(value);
 
-        PyGILState_Release(gs);
-
         return skip;
     }
 
@@ -1212 +1185 @@
         PyErr_SetString(PyExc_ValueError, "read returns an overly long string");
         self->halt = 1;
 
-        PyGILState_Release(gs);
-
         return skip;
     }
 
@@ -1223 +1194 @@
 
     Py_DECREF(value);
 
-    PyGILState_Release(gs);
-
     return length;
 }
 
@@ -1305 +1274 @@
     }
 
     self->parsing = 1;
-    Py_BEGIN_ALLOW_THREADS
     index = syck_parse(self->parser)-1;
-    Py_END_ALLOW_THREADS
     self->parsing = 0;
 
     if (self->halt || self->parser->eof) {
@@ -1589 +1556 @@
 static void
 PySyckEmitter_node_handler(SyckEmitter *emitter, st_data_t id)
 {
-    PyGILState_STATE gs;
-
     PySyckEmitterObject *self = (PySyckEmitterObject *)emitter->bonus;
 
     PySyckNodeObject *node;
@@ -1604 +1569 @@
 
     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;
     }
 
@@ -1618 +1580 @@
         tag = PyString_AsString(node->tag);
         if (!tag) {
             self->halt = 1;
-            PyGILState_Release(gs);
             return;
         }
     }
@@ -1630 +1591 @@
         if (!PyList_Check(node->value)) {
             PyErr_SetString(PyExc_TypeError, "value of _syck.Seq must be a list");
             self->halt = 1;
-            PyGILState_Release(gs);
             return;
         }
         l = PyList_GET_SIZE(node->value);
@@ -1639 +1599 @@
             if ((index = PyDict_GetItem(self->nodes, item))) {
                 syck_emit_item(emitter, PyInt_AS_LONG(index));
                 if (self->halt) {
-                    PyGILState_Release(gs);
                     return;
                 }
             }
             else {
                 PyErr_SetString(PyExc_RuntimeError, "sequence item is not marked");
                 self->halt = 1;
-                PyGILState_Release(gs);
                 return;
             }
         }
@@ -1665 +1623 @@
                     PyErr_SetString(PyExc_TypeError,
                             "value of _syck.Map must be a list of pairs or a dictionary");
                     self->halt = 1;
-                    PyGILState_Release(gs);
                     return;
                 }
                 for (j = 0; j < 2; j++) {
@@ -1673 +1630 @@
                     if ((index = PyDict_GetItem(self->nodes, item))) {
                         syck_emit_item(emitter, PyInt_AS_LONG(index));
                         if (self->halt) {
-                            PyGILState_Release(gs);
                             return;
                         }
                     }
                     else {
                         PyErr_SetString(PyExc_RuntimeError, "mapping item is not marked");
                         self->halt = 1;
-                        PyGILState_Release(gs);
                         return;
                     }
                 }
@@ -1694 +1649 @@
                     if ((index = PyDict_GetItem(self->nodes, item))) {
                         syck_emit_item(emitter, PyInt_AS_LONG(index));
                         if (self->halt) {
-                            PyGILState_Release(gs);
                             return;
                         }
                     }
                     else {
                         PyErr_SetString(PyExc_RuntimeError, "mapping item is not marked");
                         self->halt = 1;
-                        PyGILState_Release(gs);
                         return;
                     }
                 }
@@ -1711 +1664 @@
             PyErr_SetString(PyExc_TypeError,
                     "value of _syck.Map must be a list of pairs or a dictionary");
             self->halt = 1;
-            PyGILState_Release(gs);
             return;
         }
 
@@ -1721 +1673 @@
     else if (PyObject_TypeCheck((PyObject *)node, &PySyckScalar_Type)) {
         if (PyString_AsStringAndSize(node->value, &str, &len) < 0) {
             self->halt = 1;
-            PyGILState_Release(gs);
             return;
         }
         syck_emit_scalar(emitter, tag, ((PySyckScalarObject *)node)->style,
@@ -1733 +1684 @@
     else {
         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);
 }
 
 static int
@@ -2011 +1954 @@
         return NULL;
     }
 
-    Py_BEGIN_ALLOW_THREADS
     syck_emit(self->emitter, 0);
     syck_emitter_flush(self->emitter, 0);
-    Py_END_ALLOW_THREADS
 
     syck_free_emitter(self->emitter);
     self->emitter = NULL;
@@ -2138 +2079 @@
 {
     PyObject *m;
 
-    PyEval_InitThreads();   /* Fix segfault for Python 2.3 */
-
     if (PyType_Ready(&PySyckNode_Type) < 0)
         return;
     if (PyType_Ready(&PySyckScalar_Type) < 0)