Mercurial > cpython-lru_cache-weakref
diff Modules/_threadmodule.c @ 56428:5458c20aa0cf
rollback the merge of r74524 because it causes failures in test_multiprocessing
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Fri, 09 Oct 2009 20:36:25 +0000 |
| parents | c219f7261d98 |
| children | 29908f2bc93f |
line wrap: on
line diff
--- a/Modules/_threadmodule.c Thu Oct 08 20:05:48 2009 +0000 +++ b/Modules/_threadmodule.c Fri Oct 09 20:36:25 2009 +0000 @@ -3,7 +3,6 @@ /* Interface to Sjoerd's portable C thread library */ #include "Python.h" -#include "structmember.h" /* offsetof */ #ifndef WITH_THREAD #error "Error! The rest of Python is not compiled with thread support." @@ -21,15 +20,12 @@ typedef struct { PyObject_HEAD PyThread_type_lock lock_lock; - PyObject *in_weakreflist; } lockobject; static void lock_dealloc(lockobject *self) { assert(self->lock_lock); - if (self->in_weakreflist != NULL) - PyObject_ClearWeakRefs((PyObject *) self); /* Unlock the lock so it's safe to free it */ PyThread_acquire_lock(self->lock_lock, 0); PyThread_release_lock(self->lock_lock); @@ -144,12 +140,12 @@ 0, /*tp_getattro*/ 0, /*tp_setattro*/ 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT, /*tp_flags*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ 0, /*tp_doc*/ 0, /*tp_traverse*/ 0, /*tp_clear*/ 0, /*tp_richcompare*/ - offsetof(lockobject, in_weakreflist), /*tp_weaklistoffset*/ + 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ lock_methods, /*tp_methods*/ @@ -163,7 +159,6 @@ if (self == NULL) return NULL; self->lock_lock = PyThread_allocate_lock(); - self->in_weakreflist = NULL; if (self->lock_lock == NULL) { PyObject_Del(self); self = NULL;
