cpython-lru_cache-weakref: Objects/weakrefobject.c annotate

annotate Objects/weakrefobject.c @ 40382:d75b0caa67db

The rest of patch 1549670 by Jiwon, making the compiler test pass. This removes some bogus debug stuff Jiwon accidentally left in last time.

author	Guido van Rossum <guido@python.org>
date	Wed, 22 Nov 2006 04:55:53 +0000
parents	13d5e5f0e993
children	88133417dfd0

rev	line source
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	1 #include "Python.h"
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	2 #include "structmember.h"
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	3
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	4
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	5 #define GET_WEAKREFS_LISTPTR(o) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	6 ((PyWeakReference **) PyObject_GET_WEAKREFS_LISTPTR(o))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	7
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	8
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	9 Py_ssize_t
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	10 _PyWeakref_GetWeakrefCount(PyWeakReference *head)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	11 {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	12 Py_ssize_t count = 0;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	13
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	14 while (head != NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	15 ++count;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	16 head = head->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	17 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	18 return count;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	19 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	20
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	21
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	22 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	23 init_weakref(PyWeakReference self, PyObject ob, PyObject *callback)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	24 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	25 self->hash = -1;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	26 self->wr_object = ob;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	27 Py_XINCREF(callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	28 self->wr_callback = callback;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	29 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	30
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	31 static PyWeakReference *
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	32 new_weakref(PyObject ob, PyObject callback)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	33 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	34 PyWeakReference *result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	35
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	36 result = PyObject_GC_New(PyWeakReference, &_PyWeakref_RefType);
ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	37 if (result) {
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	38 init_weakref(result, ob, callback);
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	39 PyObject_GC_Track(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	40 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	41 return result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	42 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	43
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	44
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	45 /* This function clears the passed-in reference and removes it from the
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	46 * list of weak references for the referent. This is the only code that
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	47 * removes an item from the doubly-linked list of weak references for an
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	48 * object; it is also responsible for clearing the callback slot.
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	49 */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	50 static void
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	51 clear_weakref(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	52 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	53 PyObject *callback = self->wr_callback;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	54
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	55 if (PyWeakref_GET_OBJECT(self) != Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	56 PyWeakReference **list = GET_WEAKREFS_LISTPTR(
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	57 PyWeakref_GET_OBJECT(self));
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	58
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	59 if (*list == self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	60 *list = self->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	61 self->wr_object = Py_None;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	62 if (self->wr_prev != NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	63 self->wr_prev->wr_next = self->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	64 if (self->wr_next != NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	65 self->wr_next->wr_prev = self->wr_prev;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	66 self->wr_prev = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	67 self->wr_next = NULL;
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	68 }
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	69 if (callback != NULL) {
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	70 Py_DECREF(callback);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	71 self->wr_callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	72 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	73 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	74
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	75 /* Cyclic gc uses this to just clear the passed-in reference, leaving
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	76 * the callback intact and uncalled. It must be possible to call self's
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	77 * tp_dealloc() after calling this, so self has to be left in a sane enough
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	78 * state for that to work. We expect tp_dealloc to decref the callback
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	79 * then. The reason for not letting clear_weakref() decref the callback
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	80 * right now is that if the callback goes away, that may in turn trigger
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	81 * another callback (if a weak reference to the callback exists) -- running
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	82 * arbitrary Python code in the middle of gc is a disaster. The convolution
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	83 * here allows gc to delay triggering such callbacks until the world is in
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	84 * a sane state again.
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	85 */
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	86 void
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	87 _PyWeakref_ClearRef(PyWeakReference *self)
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	88 {
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	89 PyObject *callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	90
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	91 assert(self != NULL);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	92 assert(PyWeakref_Check(self));
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	93 /* Preserve and restore the callback around clear_weakref. */
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	94 callback = self->wr_callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	95 self->wr_callback = NULL;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	96 clear_weakref(self);
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	97 self->wr_callback = callback;
14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	98 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	99
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	100 static void
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	101 weakref_dealloc(PyObject *self)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	102 {
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	103 PyObject_GC_UnTrack(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	104 clear_weakref((PyWeakReference *) self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	105 self->ob_type->tp_free(self);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	106 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	107
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	108
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	109 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	110 gc_traverse(PyWeakReference self, visitproc visit, void arg)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	111 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	112 Py_VISIT(self->wr_callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	113 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	114 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	115
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	116
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	117 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	118 gc_clear(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	119 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	120 clear_weakref(self);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	121 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	122 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	123
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	124
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	125 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	126 weakref_call(PyWeakReference self, PyObject args, PyObject *kw)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	127 {
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	128 static char *kwlist[] = {NULL};
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	129
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	130 if (PyArg_ParseTupleAndKeywords(args, kw, ":__call__", kwlist)) {
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	131 PyObject *object = PyWeakref_GET_OBJECT(self);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	132 Py_INCREF(object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	133 return (object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	134 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	135 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	136 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	137
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	138
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	139 static long
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	140 weakref_hash(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	141 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	142 if (self->hash != -1)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	143 return self->hash;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	144 if (PyWeakref_GET_OBJECT(self) == Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	145 PyErr_SetString(PyExc_TypeError, "weak object has gone away");
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	146 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	147 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	148 self->hash = PyObject_Hash(PyWeakref_GET_OBJECT(self));
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	149 return self->hash;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	150 }
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	151
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	152
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	153 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	154 weakref_repr(PyWeakReference *self)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	155 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	156 char buffer[256];
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	157 if (PyWeakref_GET_OBJECT(self) == Py_None) {
28644 8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	158 PyOS_snprintf(buffer, sizeof(buffer), "<weakref at %p; dead>", self);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	159 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	160 else {
28644 8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	161 char *name = NULL;
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	162 PyObject *nameobj = PyObject_GetAttrString(PyWeakref_GET_OBJECT(self),
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	163 "__name__");
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	164 if (nameobj == NULL)
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	165 PyErr_Clear();
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	166 else if (PyString_Check(nameobj))
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	167 name = PyString_AS_STRING(nameobj);
21083 d3b6401ca273 weakref_repr(), proxy_repr(): Conversion of sprintf() to Barry Warsaw <barry@python.org> parents: 21066 diff changeset	168 PyOS_snprintf(buffer, sizeof(buffer),
28644 8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	169 name ? "<weakref at %p; to '%.50s' at %p (%s)>"
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	170 : "<weakref at %p; to '%.50s' at %p>",
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	171 self,
21083 d3b6401ca273 weakref_repr(), proxy_repr(): Conversion of sprintf() to Barry Warsaw <barry@python.org> parents: 21066 diff changeset	172 PyWeakref_GET_OBJECT(self)->ob_type->tp_name,
28644 8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	173 PyWeakref_GET_OBJECT(self),
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	174 name);
8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	175 Py_XDECREF(nameobj);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	176 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	177 return PyString_FromString(buffer);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	178 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	179
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	180 /* Weak references only support equality, not ordering. Two weak references
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	181 are equal if the underlying objects are equal. If the underlying object has
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	182 gone away, they are equal if they are identical. */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	183
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	184 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	185 weakref_richcompare(PyWeakReference* self, PyWeakReference* other, int op)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	186 {
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	187 if ((op != Py_EQ && op != Py_NE) \|\|
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	188 !PyWeakref_Check(self) \|\|
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	189 !PyWeakref_Check(other)) {
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	190 Py_INCREF(Py_NotImplemented);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	191 return Py_NotImplemented;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	192 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	193 if (PyWeakref_GET_OBJECT(self) == Py_None
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	194 \|\| PyWeakref_GET_OBJECT(other) == Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	195 PyObject *res = self==other ? Py_True : Py_False;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	196 Py_INCREF(res);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	197 return res;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	198 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	199 return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	200 PyWeakref_GET_OBJECT(other), op);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	201 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	202
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	203 /* Given the head of an object's list of weak references, extract the
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	204 * two callback-less refs (ref and proxy). Used to determine if the
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	205 * shared references exist and to determine the back link for newly
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	206 * inserted references.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	207 */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	208 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	209 get_basic_refs(PyWeakReference *head,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	210 PyWeakReference refp, PyWeakReference proxyp)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	211 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	212 *refp = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	213 *proxyp = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	214
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	215 if (head != NULL && head->wr_callback == NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	216 /* We need to be careful that the "basic refs" aren't
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	217 subclasses of the main types. That complicates this a
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	218 little. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	219 if (PyWeakref_CheckRefExact(head)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	220 *refp = head;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	221 head = head->wr_next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	222 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	223 if (head != NULL
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	224 && head->wr_callback == NULL
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	225 && PyWeakref_CheckProxy(head)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	226 *proxyp = head;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	227 /* head = head->wr_next; */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	228 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	229 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	230 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	231
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	232 /* Insert 'newref' in the list after 'prev'. Both must be non-NULL. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	233 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	234 insert_after(PyWeakReference newref, PyWeakReference prev)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	235 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	236 newref->wr_prev = prev;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	237 newref->wr_next = prev->wr_next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	238 if (prev->wr_next != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	239 prev->wr_next->wr_prev = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	240 prev->wr_next = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	241 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	242
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	243 /* Insert 'newref' at the head of the list; 'list' points to the variable
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	244 * that stores the head.
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	245 */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	246 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	247 insert_head(PyWeakReference newref, PyWeakReference *list)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	248 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	249 PyWeakReference next = list;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	250
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	251 newref->wr_prev = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	252 newref->wr_next = next;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	253 if (next != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	254 next->wr_prev = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	255 *list = newref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	256 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	257
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	258 static int
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	259 parse_weakref_init_args(char funcname, PyObject args, PyObject *kwargs,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	260 PyObject obp, PyObject callbackp)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	261 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	262 /* XXX Should check that kwargs == NULL or is empty. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	263 return PyArg_UnpackTuple(args, funcname, 1, 2, obp, callbackp);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	264 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	265
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	266 static PyObject *
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	267 weakref___new__(PyTypeObject type, PyObject args, PyObject *kwargs)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	268 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	269 PyWeakReference *self = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	270 PyObject ob, callback = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	271
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	272 if (parse_weakref_init_args("__new__", args, kwargs, &ob, &callback)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	273 PyWeakReference ref, proxy;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	274 PyWeakReference **list;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	275
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	276 if (!PyType_SUPPORTS_WEAKREFS(ob->ob_type)) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	277 PyErr_Format(PyExc_TypeError,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	278 "cannot create weak reference to '%s' object",
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	279 ob->ob_type->tp_name);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	280 return NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	281 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	282 if (callback == Py_None)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	283 callback = NULL;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	284 list = GET_WEAKREFS_LISTPTR(ob);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	285 get_basic_refs(*list, &ref, &proxy);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	286 if (callback == NULL && type == &_PyWeakref_RefType) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	287 if (ref != NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	288 /* We can re-use an existing reference. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	289 Py_INCREF(ref);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	290 return (PyObject *)ref;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	291 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	292 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	293 /* We have to create a new reference. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	294 /* Note: the tp_alloc() can trigger cyclic GC, so the weakref
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	295 list on ob can be mutated. This means that the ref and
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	296 proxy pointers we got back earlier may have been collected,
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	297 so we need to compute these values again before we use
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	298 them. */
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	299 self = (PyWeakReference *) (type->tp_alloc(type, 0));
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	300 if (self != NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	301 init_weakref(self, ob, callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	302 if (callback == NULL && type == &_PyWeakref_RefType) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	303 insert_head(self, list);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	304 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	305 else {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	306 PyWeakReference *prev;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	307
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	308 get_basic_refs(*list, &ref, &proxy);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	309 prev = (proxy == NULL) ? ref : proxy;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	310 if (prev == NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	311 insert_head(self, list);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	312 else
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	313 insert_after(self, prev);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	314 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	315 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	316 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	317 return (PyObject *)self;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	318 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	319
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	320 static int
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	321 weakref___init__(PyObject self, PyObject args, PyObject *kwargs)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	322 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	323 PyObject *tmp;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	324
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	325 if (parse_weakref_init_args("__init__", args, kwargs, &tmp, &tmp))
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	326 return 0;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	327 else
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	328 return 1;
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	329 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	330
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	331
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	332 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	333 _PyWeakref_RefType = {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	334 PyObject_HEAD_INIT(&PyType_Type)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	335 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	336 "weakref",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	337 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	338 0,
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	339 weakref_dealloc, /tp_dealloc/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	340 0, /tp_print/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	341 0, /tp_getattr/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	342 0, /tp_setattr/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	343 0, /tp_compare/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	344 (reprfunc)weakref_repr, /tp_repr/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	345 0, /tp_as_number/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	346 0, /tp_as_sequence/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	347 0, /tp_as_mapping/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	348 (hashfunc)weakref_hash, /tp_hash/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	349 (ternaryfunc)weakref_call, /tp_call/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	350 0, /tp_str/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	351 0, /tp_getattro/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	352 0, /tp_setattro/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	353 0, /tp_as_buffer/
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	354 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	355 \| Py_TPFLAGS_BASETYPE, /tp_flags/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	356 0, /tp_doc/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	357 (traverseproc)gc_traverse, /tp_traverse/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	358 (inquiry)gc_clear, /tp_clear/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	359 (richcmpfunc)weakref_richcompare, /tp_richcompare/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	360 0, /tp_weaklistoffset/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	361 0, /tp_iter/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	362 0, /tp_iternext/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	363 0, /tp_methods/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	364 0, /tp_members/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	365 0, /tp_getset/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	366 0, /tp_base/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	367 0, /tp_dict/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	368 0, /tp_descr_get/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	369 0, /tp_descr_set/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	370 0, /tp_dictoffset/
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	371 weakref___init__, /tp_init/
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	372 PyType_GenericAlloc, /tp_alloc/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	373 weakref___new__, /tp_new/
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	374 PyObject_GC_Del, /tp_free/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	375 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	376
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	377
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	378 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	379 proxy_checkref(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	380 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	381 if (PyWeakref_GET_OBJECT(proxy) == Py_None) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	382 PyErr_SetString(PyExc_ReferenceError,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	383 "weakly-referenced object no longer exists");
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	384 return 0;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	385 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	386 return 1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	387 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	388
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	389
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	390 /* If a parameter is a proxy, check that it is still "live" and wrap it,
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	391 * replacing the original value with the raw object. Raises ReferenceError
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	392 * if the param is a dead proxy.
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	393 */
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	394 #define UNWRAP(o) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	395 if (PyWeakref_CheckProxy(o)) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	396 if (!proxy_checkref((PyWeakReference *)o)) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	397 return NULL; \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	398 o = PyWeakref_GET_OBJECT(o); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	399 }
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	400
21483 873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	401 #define UNWRAP_I(o) \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	402 if (PyWeakref_CheckProxy(o)) { \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	403 if (!proxy_checkref((PyWeakReference *)o)) \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	404 return -1; \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	405 o = PyWeakref_GET_OBJECT(o); \
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	406 }
873291a4889e proxy_compare(): Make sure that we unwrap both objects being compared if Fred Drake <fdrake@acm.org> parents: 21339 diff changeset	407
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	408 #define WRAP_UNARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	409 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	410 method(PyObject *proxy) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	411 UNWRAP(proxy); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	412 return generic(proxy); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	413 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	414
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	415 #define WRAP_BINARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	416 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	417 method(PyObject x, PyObject y) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	418 UNWRAP(x); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	419 UNWRAP(y); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	420 return generic(x, y); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	421 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	422
20532 bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	423 /* Note that the third arg needs to be checked for NULL since the tp_call
bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	424 * slot can receive NULL for this arg.
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	425 */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	426 #define WRAP_TERNARY(method, generic) \
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	427 static PyObject * \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	428 method(PyObject proxy, PyObject v, PyObject *w) { \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	429 UNWRAP(proxy); \
20532 bc138bc73cdd Remove an unnecessary check for NULL. Fred Drake <fdrake@acm.org> parents: 20521 diff changeset	430 UNWRAP(v); \
20521 cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	431 if (w != NULL) \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	432 UNWRAP(w); \
cb87bd97f740 When weakref proxies are involved in binary & ternary slot operations, Fred Drake <fdrake@acm.org> parents: 20280 diff changeset	433 return generic(proxy, v, w); \
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	434 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	435
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	436
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	437 /* direct slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	438
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	439 WRAP_BINARY(proxy_getattr, PyObject_GetAttr)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	440 WRAP_UNARY(proxy_str, PyObject_Str)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	441 WRAP_TERNARY(proxy_call, PyEval_CallObjectWithKeywords)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	442
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	443 static PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	444 proxy_repr(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	445 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	446 char buf[160];
21083 d3b6401ca273 weakref_repr(), proxy_repr(): Conversion of sprintf() to Barry Warsaw <barry@python.org> parents: 21066 diff changeset	447 PyOS_snprintf(buf, sizeof(buf),
28644 8e541b078edb - The repr() of a weakref object now shows the __name__ attribute of Guido van Rossum <guido@python.org> parents: 24717 diff changeset	448 "<weakproxy at %p to %.100s at %p>", proxy,
21083 d3b6401ca273 weakref_repr(), proxy_repr(): Conversion of sprintf() to Barry Warsaw <barry@python.org> parents: 21066 diff changeset	449 PyWeakref_GET_OBJECT(proxy)->ob_type->tp_name,
d3b6401ca273 weakref_repr(), proxy_repr(): Conversion of sprintf() to Barry Warsaw <barry@python.org> parents: 21066 diff changeset	450 PyWeakref_GET_OBJECT(proxy));
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	451 return PyString_FromString(buf);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	452 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	453
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	454
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	455 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	456 proxy_setattr(PyWeakReference proxy, PyObject name, PyObject *value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	457 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	458 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	459 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	460 return PyObject_SetAttr(PyWeakref_GET_OBJECT(proxy), name, value);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	461 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	462
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	463 static PyObject *
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	464 proxy_richcompare(PyObject proxy, PyObject v, int op)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	465 {
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	466 UNWRAP(proxy);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	467 UNWRAP(v);
13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	468 return PyObject_RichCompare(proxy, v, op);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	469 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	470
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	471 /* number slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	472 WRAP_BINARY(proxy_add, PyNumber_Add)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	473 WRAP_BINARY(proxy_sub, PyNumber_Subtract)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	474 WRAP_BINARY(proxy_mul, PyNumber_Multiply)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	475 WRAP_BINARY(proxy_mod, PyNumber_Remainder)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	476 WRAP_BINARY(proxy_divmod, PyNumber_Divmod)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	477 WRAP_TERNARY(proxy_pow, PyNumber_Power)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	478 WRAP_UNARY(proxy_neg, PyNumber_Negative)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	479 WRAP_UNARY(proxy_pos, PyNumber_Positive)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	480 WRAP_UNARY(proxy_abs, PyNumber_Absolute)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	481 WRAP_UNARY(proxy_invert, PyNumber_Invert)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	482 WRAP_BINARY(proxy_lshift, PyNumber_Lshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	483 WRAP_BINARY(proxy_rshift, PyNumber_Rshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	484 WRAP_BINARY(proxy_and, PyNumber_And)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	485 WRAP_BINARY(proxy_xor, PyNumber_Xor)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	486 WRAP_BINARY(proxy_or, PyNumber_Or)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	487 WRAP_UNARY(proxy_int, PyNumber_Int)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	488 WRAP_UNARY(proxy_long, PyNumber_Long)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	489 WRAP_UNARY(proxy_float, PyNumber_Float)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	490 WRAP_BINARY(proxy_iadd, PyNumber_InPlaceAdd)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	491 WRAP_BINARY(proxy_isub, PyNumber_InPlaceSubtract)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	492 WRAP_BINARY(proxy_imul, PyNumber_InPlaceMultiply)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	493 WRAP_BINARY(proxy_imod, PyNumber_InPlaceRemainder)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	494 WRAP_TERNARY(proxy_ipow, PyNumber_InPlacePower)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	495 WRAP_BINARY(proxy_ilshift, PyNumber_InPlaceLshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	496 WRAP_BINARY(proxy_irshift, PyNumber_InPlaceRshift)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	497 WRAP_BINARY(proxy_iand, PyNumber_InPlaceAnd)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	498 WRAP_BINARY(proxy_ixor, PyNumber_InPlaceXor)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	499 WRAP_BINARY(proxy_ior, PyNumber_InPlaceOr)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	500
30991 14d321466a06 SF bug 839548: Bug in type's GC handling causes segfaults. Tim Peters <tim.peters@gmail.com> parents: 29863 diff changeset	501 static int
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	502 proxy_nonzero(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	503 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	504 PyObject *o = PyWeakref_GET_OBJECT(proxy);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	505 if (!proxy_checkref(proxy))
32530 2451c9572edf SF bug #978308, Spurious errors taking bool of dead pro Neal Norwitz <nnorwitz@gmail.com> parents: 32472 diff changeset	506 return -1;
34847 51ba8ce8d92a SF bug #1770766: weakref proxy has incorrect __nonzero__ behavior. Raymond Hettinger <python@rcn.com> parents: 33862 diff changeset	507 return PyObject_IsTrue(o);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	508 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	509
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	510 static void
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	511 proxy_dealloc(PyWeakReference *self)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	512 {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	513 if (self->wr_callback != NULL)
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	514 PyObject_GC_UnTrack((PyObject *)self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	515 clear_weakref(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	516 PyObject_GC_Del(self);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	517 }
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	518
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	519 /* sequence slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	520
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	521 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	522 proxy_slice(PyWeakReference *proxy, Py_ssize_t i, Py_ssize_t j)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	523 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	524 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	525 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	526 return PySequence_GetSlice(PyWeakref_GET_OBJECT(proxy), i, j);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	527 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	528
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	529 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	530 proxy_ass_slice(PyWeakReference proxy, Py_ssize_t i, Py_ssize_t j, PyObject value)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	531 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	532 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	533 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	534 return PySequence_SetSlice(PyWeakref_GET_OBJECT(proxy), i, j, value);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	535 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	536
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	537 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	538 proxy_contains(PyWeakReference proxy, PyObject value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	539 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	540 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	541 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	542 return PySequence_Contains(PyWeakref_GET_OBJECT(proxy), value);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	543 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	544
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	545
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	546 /* mapping slots */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	547
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	548 static Py_ssize_t
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	549 proxy_length(PyWeakReference *proxy)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	550 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	551 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	552 return -1;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	553 return PyObject_Length(PyWeakref_GET_OBJECT(proxy));
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	554 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	555
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	556 WRAP_BINARY(proxy_getitem, PyObject_GetItem)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	557
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	558 static int
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	559 proxy_setitem(PyWeakReference proxy, PyObject key, PyObject *value)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	560 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	561 if (!proxy_checkref(proxy))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	562 return -1;
29697 1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	563
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	564 if (value == NULL)
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	565 return PyObject_DelItem(PyWeakref_GET_OBJECT(proxy), key);
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	566 else
1d763862d1a1 Fix SF 762891: "del p[key]" on proxy object raises SystemError() Raymond Hettinger <python@rcn.com> parents: 28644 diff changeset	567 return PyObject_SetItem(PyWeakref_GET_OBJECT(proxy), key, value);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	568 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	569
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	570 /* iterator slots */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	571
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	572 static PyObject *
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	573 proxy_iter(PyWeakReference *proxy)
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	574 {
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	575 if (!proxy_checkref(proxy))
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	576 return NULL;
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	577 return PyObject_GetIter(PyWeakref_GET_OBJECT(proxy));
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	578 }
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	579
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	580 static PyObject *
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	581 proxy_iternext(PyWeakReference *proxy)
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	582 {
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	583 if (!proxy_checkref(proxy))
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	584 return NULL;
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	585 return PyIter_Next(PyWeakref_GET_OBJECT(proxy));
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	586 }
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	587
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	588
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	589 static PyNumberMethods proxy_as_number = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	590 proxy_add, /nb_add/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	591 proxy_sub, /nb_subtract/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	592 proxy_mul, /nb_multiply/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	593 proxy_mod, /nb_remainder/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	594 proxy_divmod, /nb_divmod/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	595 proxy_pow, /nb_power/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	596 proxy_neg, /nb_negative/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	597 proxy_pos, /nb_positive/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	598 proxy_abs, /nb_absolute/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	599 (inquiry)proxy_nonzero, /nb_nonzero/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	600 proxy_invert, /nb_invert/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	601 proxy_lshift, /nb_lshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	602 proxy_rshift, /nb_rshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	603 proxy_and, /nb_and/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	604 proxy_xor, /nb_xor/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	605 proxy_or, /nb_or/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	606 0, /nb_coerce/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	607 proxy_int, /nb_int/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	608 proxy_long, /nb_long/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	609 proxy_float, /nb_float/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	610 0, /nb_oct/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	611 0, /nb_hex/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	612 proxy_iadd, /nb_inplace_add/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	613 proxy_isub, /nb_inplace_subtract/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	614 proxy_imul, /nb_inplace_multiply/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	615 proxy_imod, /nb_inplace_remainder/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	616 proxy_ipow, /nb_inplace_power/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	617 proxy_ilshift, /nb_inplace_lshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	618 proxy_irshift, /nb_inplace_rshift/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	619 proxy_iand, /nb_inplace_and/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	620 proxy_ixor, /nb_inplace_xor/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	621 proxy_ior, /nb_inplace_or/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	622 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	623
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	624 static PySequenceMethods proxy_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	625 (lenfunc)proxy_length, /sq_length/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	626 0, /sq_concat/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	627 0, /sq_repeat/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	628 0, /sq_item/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	629 (ssizessizeargfunc)proxy_slice, /sq_slice/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	630 0, /sq_ass_item/
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	631 (ssizessizeobjargproc)proxy_ass_slice, /sq_ass_slice/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	632 (objobjproc)proxy_contains, /* sq_contains */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	633 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	634
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	635 static PyMappingMethods proxy_as_mapping = {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	636 (lenfunc)proxy_length, /mp_length/
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	637 proxy_getitem, /mp_subscript/
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	638 (objobjargproc)proxy_setitem, /mp_ass_subscript/
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	639 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	640
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	641
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	642 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	643 _PyWeakref_ProxyType = {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	644 PyObject_HEAD_INIT(&PyType_Type)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	645 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	646 "weakproxy",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	647 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	648 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	649 /* methods */
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	650 (destructor)proxy_dealloc, /* tp_dealloc */
29863 98c59bbdd8ec Remove proxy_print(), since that caused an inconsistency between Fred Drake <fdrake@acm.org> parents: 29697 diff changeset	651 0, /* tp_print */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	652 0, /* tp_getattr */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	653 0, /* tp_setattr */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	654 0, /* tp_compare */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	655 (reprfunc)proxy_repr, /* tp_repr */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	656 &proxy_as_number, /* tp_as_number */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	657 &proxy_as_sequence, /* tp_as_sequence */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	658 &proxy_as_mapping, /* tp_as_mapping */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	659 0, /* tp_hash */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	660 0, /* tp_call */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	661 proxy_str, /* tp_str */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	662 proxy_getattr, /* tp_getattro */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	663 (setattrofunc)proxy_setattr, /* tp_setattro */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	664 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	665 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	666 0, /* tp_doc */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	667 (traverseproc)gc_traverse, /* tp_traverse */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	668 (inquiry)gc_clear, /* tp_clear */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	669 proxy_richcompare, /* tp_richcompare */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	670 0, /* tp_weaklistoffset */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	671 (getiterfunc)proxy_iter, /* tp_iter */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	672 (iternextfunc)proxy_iternext, /* tp_iternext */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	673 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	674
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	675
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	676 PyTypeObject
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	677 _PyWeakref_CallableProxyType = {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	678 PyObject_HEAD_INIT(&PyType_Type)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	679 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	680 "weakcallableproxy",
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	681 sizeof(PyWeakReference),
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	682 0,
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	683 /* methods */
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	684 (destructor)proxy_dealloc, /* tp_dealloc */
29863 98c59bbdd8ec Remove proxy_print(), since that caused an inconsistency between Fred Drake <fdrake@acm.org> parents: 29697 diff changeset	685 0, /* tp_print */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	686 0, /* tp_getattr */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	687 0, /* tp_setattr */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	688 0, /* tp_compare */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	689 (unaryfunc)proxy_repr, /* tp_repr */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	690 &proxy_as_number, /* tp_as_number */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	691 &proxy_as_sequence, /* tp_as_sequence */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	692 &proxy_as_mapping, /* tp_as_mapping */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	693 0, /* tp_hash */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	694 proxy_call, /* tp_call */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	695 proxy_str, /* tp_str */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37191 diff changeset	696 proxy_getattr, /* tp_getattro */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	697 (setattrofunc)proxy_setattr, /* tp_setattro */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	698 0, /* tp_as_buffer */
39222 b0cdcbcc5f45 Get rid of most of the flags (in tp_flags) that keep track of various Guido van Rossum <guido@python.org> parents: 38453 diff changeset	699 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	700 0, /* tp_doc */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	701 (traverseproc)gc_traverse, /* tp_traverse */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	702 (inquiry)gc_clear, /* tp_clear */
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39442 diff changeset	703 proxy_richcompare, /* tp_richcompare */
24717 1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	704 0, /* tp_weaklistoffset */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	705 (getiterfunc)proxy_iter, /* tp_iter */
1d3d980a3186 Add support for the iterator protocol to weakref proxy objects. Fred Drake <fdrake@acm.org> parents: 22607 diff changeset	706 (iternextfunc)proxy_iternext, /* tp_iternext */
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	707 };
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	708
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	709
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	710
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	711 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	712 PyWeakref_NewRef(PyObject ob, PyObject callback)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	713 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	714 PyWeakReference *result = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	715 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	716 PyWeakReference ref, proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	717
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	718 if (!PyType_SUPPORTS_WEAKREFS(ob->ob_type)) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	719 PyErr_Format(PyExc_TypeError,
20613 bf4b37518c14 Referencable is not a word, so don't use it in an error message <wink>. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20532 diff changeset	720 "cannot create weak reference to '%s' object",
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	721 ob->ob_type->tp_name);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	722 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	723 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	724 list = GET_WEAKREFS_LISTPTR(ob);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	725 get_basic_refs(*list, &ref, &proxy);
31449 b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	726 if (callback == Py_None)
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	727 callback = NULL;
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	728 if (callback == NULL)
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	729 /* return existing weak reference if it exists */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	730 result = ref;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	731 if (result != NULL)
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	732 Py_INCREF(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	733 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	734 /* Note: new_weakref() can trigger cyclic GC, so the weakref
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	735 list on ob can be mutated. This means that the ref and
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	736 proxy pointers we got back earlier may have been collected,
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	737 so we need to compute these values again before we use
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	738 them. */
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	739 result = new_weakref(ob, callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	740 if (result != NULL) {
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	741 get_basic_refs(*list, &ref, &proxy);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	742 if (callback == NULL) {
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	743 if (ref == NULL)
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	744 insert_head(result, list);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	745 else {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	746 /* Someone else added a ref without a callback
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	747 during GC. Return that one instead of this one
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	748 to avoid violating the invariants of the list
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	749 of weakrefs for ob. */
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	750 Py_DECREF(result);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	751 Py_INCREF(ref);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	752 result = ref;
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	753 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	754 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	755 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	756 PyWeakReference *prev;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	757
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	758 prev = (proxy == NULL) ? ref : proxy;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	759 if (prev == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	760 insert_head(result, list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	761 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	762 insert_after(result, prev);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	763 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	764 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	765 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	766 return (PyObject *) result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	767 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	768
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	769
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	770 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	771 PyWeakref_NewProxy(PyObject ob, PyObject callback)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	772 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	773 PyWeakReference *result = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	774 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	775 PyWeakReference ref, proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	776
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	777 if (!PyType_SUPPORTS_WEAKREFS(ob->ob_type)) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	778 PyErr_Format(PyExc_TypeError,
20613 bf4b37518c14 Referencable is not a word, so don't use it in an error message <wink>. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20532 diff changeset	779 "cannot create weak reference to '%s' object",
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	780 ob->ob_type->tp_name);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	781 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	782 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	783 list = GET_WEAKREFS_LISTPTR(ob);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	784 get_basic_refs(*list, &ref, &proxy);
31449 b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	785 if (callback == Py_None)
b4bc83f2fd04 Fix bug in interpretation of the "callback" argument in the constructors for Fred Drake <fdrake@acm.org> parents: 30991 diff changeset	786 callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	787 if (callback == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	788 /* attempt to return an existing weak reference if it exists */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	789 result = proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	790 if (result != NULL)
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	791 Py_INCREF(result);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	792 else {
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	793 /* Note: new_weakref() can trigger cyclic GC, so the weakref
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	794 list on ob can be mutated. This means that the ref and
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	795 proxy pointers we got back earlier may have been collected,
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	796 so we need to compute these values again before we use
d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	797 them. */
22607 ac24c2c9bcaf Remove weakref free list. This has the side effect of fixing a memory Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21483 diff changeset	798 result = new_weakref(ob, callback);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	799 if (result != NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	800 PyWeakReference *prev;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	801
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	802 if (PyCallable_Check(ob))
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	803 result->ob_type = &_PyWeakref_CallableProxyType;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	804 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	805 result->ob_type = &_PyWeakref_ProxyType;
31454 d4165d12f73c Allocating a new weakref object can cause existing weakref objects for Fred Drake <fdrake@acm.org> parents: 31449 diff changeset	806 get_basic_refs(*list, &ref, &proxy);
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	807 if (callback == NULL) {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	808 if (proxy != NULL) {
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	809 /* Someone else added a proxy without a callback
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	810 during GC. Return that one instead of this one
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	811 to avoid violating the invariants of the list
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	812 of weakrefs for ob. */
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	813 Py_DECREF(result);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	814 Py_INCREF(result = proxy);
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	815 goto skip_insert;
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	816 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	817 prev = ref;
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	818 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	819 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	820 prev = (proxy == NULL) ? ref : proxy;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	821
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	822 if (prev == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	823 insert_head(result, list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	824 else
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	825 insert_after(result, prev);
32932 bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	826 skip_insert:
bd3dd6b3ff97 Be more careful about maintaining the invariants; it was actually Fred Drake <fdrake@acm.org> parents: 32530 diff changeset	827 ;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	828 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	829 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	830 return (PyObject *) result;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	831 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	832
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	833
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	834 PyObject *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	835 PyWeakref_GetObject(PyObject *ref)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	836 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	837 if (ref == NULL \|\| !PyWeakref_Check(ref)) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	838 PyErr_BadInternalCall();
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	839 return NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	840 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	841 return PyWeakref_GET_OBJECT(ref);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	842 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	843
33862 facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	844 /* Note that there's an inlined copy-paste of handle_callback() in gcmodule.c's
facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	845 * handle_weakrefs().
facb5a2f4b53 SF 1055820: weakref callback vs gc vs threads Tim Peters <tim.peters@gmail.com> parents: 32932 diff changeset	846 */
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	847 static void
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	848 handle_callback(PyWeakReference ref, PyObject callback)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	849 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	850 PyObject *cbresult = PyObject_CallFunctionObjArgs(callback, ref, NULL);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	851
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	852 if (cbresult == NULL)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	853 PyErr_WriteUnraisable(callback);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	854 else
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	855 Py_DECREF(cbresult);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	856 }
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	857
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	858 /* This function is called by the tp_dealloc handler to clear weak references.
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	859 *
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	860 * This iterates through the weak references for 'object' and calls callbacks
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	861 * for those references which have one. It returns when all callbacks have
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	862 * been attempted.
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	863 */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	864 void
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	865 PyObject_ClearWeakRefs(PyObject *object)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	866 {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	867 PyWeakReference **list;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	868
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	869 if (object == NULL
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	870 \|\| !PyType_SUPPORTS_WEAKREFS(object->ob_type)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	871 \|\| object->ob_refcnt != 0) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	872 PyErr_BadInternalCall();
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	873 return;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	874 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	875 list = GET_WEAKREFS_LISTPTR(object);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	876 /* Remove the callback-less basic and proxy references */
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	877 if (list != NULL && (list)->wr_callback == NULL) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	878 clear_weakref(*list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	879 if (list != NULL && (list)->wr_callback == NULL)
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	880 clear_weakref(*list);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	881 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	882 if (*list != NULL) {
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	883 PyWeakReference current = list;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	884 Py_ssize_t count = _PyWeakref_GetWeakrefCount(current);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	885 int restore_error = PyErr_Occurred() ? 1 : 0;
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	886 PyObject err_type, err_value, *err_tb;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	887
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	888 if (restore_error)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	889 PyErr_Fetch(&err_type, &err_value, &err_tb);
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	890 if (count == 1) {
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	891 PyObject *callback = current->wr_callback;
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	892
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	893 current->wr_callback = NULL;
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	894 clear_weakref(current);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	895 if (callback != NULL) {
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	896 handle_callback(current, callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	897 Py_DECREF(callback);
4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	898 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	899 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	900 else {
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	901 PyObject *tuple;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36244 diff changeset	902 Py_ssize_t i = 0;
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	903
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	904 tuple = PyTuple_New(count * 2);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	905 if (tuple == NULL) {
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	906 if (restore_error)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	907 PyErr_Fetch(&err_type, &err_value, &err_tb);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	908 return;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36675 diff changeset	909 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	910
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	911 for (i = 0; i < count; ++i) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	912 PyWeakReference *next = current->wr_next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	913
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	914 Py_INCREF(current);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	915 PyTuple_SET_ITEM(tuple, i * 2, (PyObject *) current);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	916 PyTuple_SET_ITEM(tuple, i * 2 + 1, current->wr_callback);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	917 current->wr_callback = NULL;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	918 clear_weakref(current);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	919 current = next;
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	920 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	921 for (i = 0; i < count; ++i) {
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	922 PyObject callback = PyTuple_GET_ITEM(tuple, i 2 + 1);
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	923
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	924 if (callback != NULL) {
36244 e7880f4f53a4 Remove some shadowed variables Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	925 PyObject item = PyTuple_GET_ITEM(tuple, i 2);
e7880f4f53a4 Remove some shadowed variables Neal Norwitz <nnorwitz@gmail.com> parents: 35999 diff changeset	926 handle_callback((PyWeakReference *)item, callback);
32472 4383db77b19a Make weak references subclassable: Fred Drake <fdrake@acm.org> parents: 31454 diff changeset	927 }
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	928 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	929 Py_DECREF(tuple);
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	930 }
21339 525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	931 if (restore_error)
525c77368cd0 Make sure that when we invoke callback functions associated with weak Fred Drake <fdrake@acm.org> parents: 21083 diff changeset	932 PyErr_Restore(err_type, err_value, err_tb);
20280 97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	933 }
97cfa461d793 The weak reference implementation, separated from the weakref module. Fred Drake <fdrake@acm.org> parents: diff changeset	934 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/weakrefobject.c @ 40382:d75b0caa67db