mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rollback the merge of r74524 because it causes failures in test_multiprocessing

This commit is contained in:
Benjamin Peterson 2009-10-09 20:36:25 +00:00
parent c70614fdce
commit fe51a1f204
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/weakref.rst
View File

@ -61,9 +61,6 @@ instances, functions written in Python (but not in C), instance methods, sets,
frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays, frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays,
deques, and regular expression pattern objects. deques, and regular expression pattern objects.
.. versionchanged:: 2.7
Added support for thread.lock and threading.Lock.
Several built-in types such as :class:`list` and :class:`dict` do not directly Several built-in types such as :class:`list` and :class:`dict` do not directly
support weak references but can add support through subclassing:: support weak references but can add support through subclassing::

9
Modules/_threadmodule.c
View File

@ -3,7 +3,6 @@
/* Interface to Sjoerd's portable C thread library */ /* Interface to Sjoerd's portable C thread library */
#include "Python.h" #include "Python.h"
#include "structmember.h" /* offsetof */
#ifndef WITH_THREAD #ifndef WITH_THREAD
#error "Error! The rest of Python is not compiled with thread support." #error "Error! The rest of Python is not compiled with thread support."
@ -21,15 +20,12 @@ static PyObject *ThreadError;
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
PyThread_type_lock lock_lock; PyThread_type_lock lock_lock;
PyObject *in_weakreflist;
} lockobject; } lockobject;
static void static void
lock_dealloc(lockobject *self) lock_dealloc(lockobject *self)
{ {
assert(self->lock_lock); assert(self->lock_lock);
if (self->in_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self);
/* Unlock the lock so it's safe to free it */ /* Unlock the lock so it's safe to free it */
PyThread_acquire_lock(self->lock_lock, 0); PyThread_acquire_lock(self->lock_lock, 0);
PyThread_release_lock(self->lock_lock); PyThread_release_lock(self->lock_lock);
@ -144,12 +140,12 @@ static PyTypeObject Locktype = {
0, /*tp_getattro*/ 0, /*tp_getattro*/
0, /*tp_setattro*/ 0, /*tp_setattro*/
0, /*tp_as_buffer*/ 0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT, /*tp_flags*/ Py_TPFLAGS_DEFAULT, /*tp_flags*/
0, /*tp_doc*/ 0, /*tp_doc*/
0, /*tp_traverse*/ 0, /*tp_traverse*/
0, /*tp_clear*/ 0, /*tp_clear*/
0, /*tp_richcompare*/ 0, /*tp_richcompare*/
offsetof(lockobject, in_weakreflist), /*tp_weaklistoffset*/ 0, /*tp_weaklistoffset*/
0, /*tp_iter*/ 0, /*tp_iter*/
0, /*tp_iternext*/ 0, /*tp_iternext*/
lock_methods, /*tp_methods*/ lock_methods, /*tp_methods*/
@ -163,7 +159,6 @@ newlockobject(void)
if (self == NULL) if (self == NULL)
return NULL; return NULL;
self->lock_lock = PyThread_allocate_lock(); self->lock_lock = PyThread_allocate_lock();
self->in_weakreflist = NULL;
if (self->lock_lock == NULL) { if (self->lock_lock == NULL) {
PyObject_Del(self); PyObject_Del(self);
self = NULL; self = NULL;