1991-02-19 12:39:46 +00:00
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
/* Tuple object implementation */
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
#include "Python.h"
|
1990-10-14 12:07:46 +00:00
|
|
|
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
/* Speed optimization to avoid frequent malloc/free of small tuples */
|
1993-10-15 16:18:48 +00:00
|
|
|
#ifndef MAXSAVESIZE
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
#define MAXSAVESIZE 20 /* Largest tuple to save on free list */
|
|
|
|
#endif
|
|
|
|
#ifndef MAXSAVEDTUPLES
|
|
|
|
#define MAXSAVEDTUPLES 2000 /* Maximum number of tuples of each size to save */
|
1993-10-15 16:18:48 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MAXSAVESIZE > 0
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
/* Entries 1 up to MAXSAVESIZE are free lists, entry 0 is the empty
|
1993-10-15 16:18:48 +00:00
|
|
|
tuple () of which at most one instance will be allocated.
|
|
|
|
*/
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyTupleObject *free_tuples[MAXSAVESIZE];
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
static int num_free_tuples[MAXSAVESIZE];
|
1993-10-15 16:18:48 +00:00
|
|
|
#endif
|
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
int fast_tuple_allocs;
|
|
|
|
int tuple_zero_allocs;
|
|
|
|
#endif
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_New(register int size)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
register PyTupleObject *op;
|
1990-10-14 12:07:46 +00:00
|
|
|
if (size < 0) {
|
1997-05-02 03:12:38 +00:00
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1993-10-15 16:18:48 +00:00
|
|
|
#if MAXSAVESIZE > 0
|
1993-11-01 13:46:50 +00:00
|
|
|
if (size == 0 && free_tuples[0]) {
|
|
|
|
op = free_tuples[0];
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_INCREF(op);
|
1993-10-15 16:18:48 +00:00
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
tuple_zero_allocs++;
|
|
|
|
#endif
|
1997-05-02 03:12:38 +00:00
|
|
|
return (PyObject *) op;
|
1993-10-15 16:18:48 +00:00
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
if (0 < size && size < MAXSAVESIZE &&
|
|
|
|
(op = free_tuples[size]) != NULL)
|
|
|
|
{
|
|
|
|
free_tuples[size] = (PyTupleObject *) op->ob_item[0];
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
num_free_tuples[size]--;
|
1993-10-15 16:18:48 +00:00
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
fast_tuple_allocs++;
|
1998-12-11 14:56:38 +00:00
|
|
|
#endif
|
2002-08-19 19:26:42 +00:00
|
|
|
/* Inline PyObject_InitVar */
|
1998-12-11 14:56:38 +00:00
|
|
|
#ifdef Py_TRACE_REFS
|
|
|
|
op->ob_size = size;
|
2000-05-03 23:44:39 +00:00
|
|
|
op->ob_type = &PyTuple_Type;
|
1993-10-15 16:18:48 +00:00
|
|
|
#endif
|
2000-05-03 23:44:39 +00:00
|
|
|
_Py_NewReference((PyObject *)op);
|
1997-08-05 02:16:08 +00:00
|
|
|
}
|
|
|
|
else
|
1993-10-15 16:18:48 +00:00
|
|
|
#endif
|
|
|
|
{
|
1999-07-12 23:06:58 +00:00
|
|
|
int nbytes = size * sizeof(PyObject *);
|
|
|
|
/* Check for overflow */
|
|
|
|
if (nbytes / sizeof(PyObject *) != (size_t)size ||
|
2001-08-29 23:54:21 +00:00
|
|
|
(nbytes += sizeof(PyTupleObject) - sizeof(PyObject *))
|
1999-07-12 23:06:58 +00:00
|
|
|
<= 0)
|
|
|
|
{
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
2001-08-29 23:54:21 +00:00
|
|
|
op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
|
1993-10-15 16:18:48 +00:00
|
|
|
if (op == NULL)
|
2001-08-29 23:54:21 +00:00
|
|
|
return NULL;
|
1993-10-15 16:18:48 +00:00
|
|
|
}
|
2002-06-13 21:11:11 +00:00
|
|
|
memset(op->ob_item, 0, sizeof(*op->ob_item) * size);
|
1993-10-15 16:18:48 +00:00
|
|
|
#if MAXSAVESIZE > 0
|
|
|
|
if (size == 0) {
|
1993-11-01 13:46:50 +00:00
|
|
|
free_tuples[0] = op;
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
++num_free_tuples[0];
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_INCREF(op); /* extra INCREF so that this is never freed */
|
1993-10-15 16:18:48 +00:00
|
|
|
}
|
|
|
|
#endif
|
2001-08-29 23:54:21 +00:00
|
|
|
_PyObject_GC_TRACK(op);
|
1997-05-02 03:12:38 +00:00
|
|
|
return (PyObject *) op;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_Size(register PyObject *op)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 12:07:46 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
1997-05-02 03:12:38 +00:00
|
|
|
return ((PyTupleObject *)op)->ob_size;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_GetItem(register PyObject *op, register int i)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
if (i < 0 || i >= ((PyTupleObject *)op) -> ob_size) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
return ((PyTupleObject *)op) -> ob_item[i];
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_SetItem(register PyObject *op, register int i, PyObject *newitem)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
register PyObject *olditem;
|
|
|
|
register PyObject **p;
|
1997-08-17 16:25:45 +00:00
|
|
|
if (!PyTuple_Check(op) || op->ob_refcnt != 1) {
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_XDECREF(newitem);
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-21 22:15:08 +00:00
|
|
|
return -1;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
if (i < 0 || i >= ((PyTupleObject *)op) -> ob_size) {
|
|
|
|
Py_XDECREF(newitem);
|
|
|
|
PyErr_SetString(PyExc_IndexError,
|
|
|
|
"tuple assignment index out of range");
|
1990-10-21 22:15:08 +00:00
|
|
|
return -1;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
p = ((PyTupleObject *)op) -> ob_item + i;
|
1995-03-09 12:12:50 +00:00
|
|
|
olditem = *p;
|
|
|
|
*p = newitem;
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_XDECREF(olditem);
|
1990-10-14 12:07:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Methods */
|
|
|
|
|
|
|
|
static void
|
2000-07-09 07:04:36 +00:00
|
|
|
tupledealloc(register PyTupleObject *op)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
|
|
|
register int i;
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
register int len = op->ob_size;
|
2002-03-28 20:34:59 +00:00
|
|
|
PyObject_GC_UnTrack(op);
|
2000-03-13 16:01:29 +00:00
|
|
|
Py_TRASHCAN_SAFE_BEGIN(op)
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
if (len > 0) {
|
|
|
|
i = len;
|
1998-06-26 15:53:50 +00:00
|
|
|
while (--i >= 0)
|
|
|
|
Py_XDECREF(op->ob_item[i]);
|
1993-10-15 16:18:48 +00:00
|
|
|
#if MAXSAVESIZE > 0
|
2001-08-30 18:31:30 +00:00
|
|
|
if (len < MAXSAVESIZE &&
|
|
|
|
num_free_tuples[len] < MAXSAVEDTUPLES &&
|
|
|
|
op->ob_type == &PyTuple_Type)
|
|
|
|
{
|
Patch by Charles G Waldman to avoid a sneaky memory leak in
_PyTuple_Resize(). In addition, a change suggested by Jeremy Hylton
to limit the size of the free lists is also merged into this patch.
Charles wrote initially:
"""
Test Case: run the following code:
class Nothing:
def __len__(self):
return 5
def __getitem__(self, i):
if i < 3:
return i
else:
raise IndexError, i
def g(a,*b,**c):
return
for x in xrange(1000000):
g(*Nothing())
and watch Python's memory use go up and up.
Diagnosis:
The analysis begins with the call to PySequence_Tuple at line 1641 in
ceval.c - the argument to g is seen to be a sequence but not a tuple,
so it needs to be converted from an abstract sequence to a concrete
tuple. PySequence_Tuple starts off by creating a new tuple of length
5 (line 1122 in abstract.c). Then at line 1149, since only 3 elements
were assigned, _PyTuple_Resize is called to make the 5-tuple into a
3-tuple. When we're all done the 3-tuple is decrefed, but rather than
being freed it is placed on the free_tuples cache.
The basic problem is that the 3-tuples are being added to the cache
but never picked up again, since _PyTuple_Resize doesn't make use of
the free_tuples cache. If you are resizing a 5-tuple to a 3-tuple and
there is already a 3-tuple in free_tuples[3], instead of using this
tuple, _PyTuple_Resize will realloc the 5-tuple to a 3-tuple. It
would more efficient to use the existing 3-tuple and cache the
5-tuple.
By making _PyTuple_Resize aware of the free_tuples (just as
PyTuple_New), we not only save a few calls to realloc, but also
prevent this misbehavior whereby tuples are being added to the
free_tuples list but never properly "recycled".
"""
And later:
"""
This patch replaces my submission of Sun, 16 Apr and addresses Jeremy
Hylton's suggestions that we also limit the size of the free tuple
list. I chose 2000 as the maximum number of tuples of any particular
size to save.
There was also a problem with the previous version of this patch
causing a core dump if Python was built with Py_TRACE_REFS. This is
fixed in the below version of the patch, which uses tupledealloc
instead of _Py_Dealloc.
"""
2000-04-21 21:15:05 +00:00
|
|
|
op->ob_item[0] = (PyObject *) free_tuples[len];
|
|
|
|
num_free_tuples[len]++;
|
|
|
|
free_tuples[len] = op;
|
2000-03-13 16:01:29 +00:00
|
|
|
goto done; /* return */
|
1998-06-26 15:53:50 +00:00
|
|
|
}
|
1993-10-15 16:18:48 +00:00
|
|
|
#endif
|
1998-06-26 15:53:50 +00:00
|
|
|
}
|
2001-10-05 20:51:39 +00:00
|
|
|
op->ob_type->tp_free((PyObject *)op);
|
2000-03-13 16:01:29 +00:00
|
|
|
done:
|
|
|
|
Py_TRASHCAN_SAFE_END(op)
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1991-06-07 22:59:30 +00:00
|
|
|
static int
|
2000-07-09 07:04:36 +00:00
|
|
|
tupleprint(PyTupleObject *op, FILE *fp, int flags)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
fprintf(fp, "(");
|
1991-06-07 22:59:30 +00:00
|
|
|
for (i = 0; i < op->ob_size; i++) {
|
|
|
|
if (i > 0)
|
1990-10-14 12:07:46 +00:00
|
|
|
fprintf(fp, ", ");
|
1997-05-02 03:12:38 +00:00
|
|
|
if (PyObject_Print(op->ob_item[i], fp, 0) != 0)
|
1991-06-07 22:59:30 +00:00
|
|
|
return -1;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
if (op->ob_size == 1)
|
|
|
|
fprintf(fp, ",");
|
|
|
|
fprintf(fp, ")");
|
1991-06-07 22:59:30 +00:00
|
|
|
return 0;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
tuplerepr(PyTupleObject *v)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
2001-06-16 05:11:17 +00:00
|
|
|
int i, n;
|
|
|
|
PyObject *s, *temp;
|
|
|
|
PyObject *pieces, *result = NULL;
|
|
|
|
|
|
|
|
n = v->ob_size;
|
|
|
|
if (n == 0)
|
|
|
|
return PyString_FromString("()");
|
|
|
|
|
|
|
|
pieces = PyTuple_New(n);
|
|
|
|
if (pieces == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Do repr() on each element. */
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
s = PyObject_Repr(v->ob_item[i]);
|
|
|
|
if (s == NULL)
|
|
|
|
goto Done;
|
|
|
|
PyTuple_SET_ITEM(pieces, i, s);
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
2001-06-16 05:11:17 +00:00
|
|
|
|
|
|
|
/* Add "()" decorations to the first and last items. */
|
|
|
|
assert(n > 0);
|
|
|
|
s = PyString_FromString("(");
|
|
|
|
if (s == NULL)
|
|
|
|
goto Done;
|
|
|
|
temp = PyTuple_GET_ITEM(pieces, 0);
|
|
|
|
PyString_ConcatAndDel(&s, temp);
|
|
|
|
PyTuple_SET_ITEM(pieces, 0, s);
|
|
|
|
if (s == NULL)
|
|
|
|
goto Done;
|
|
|
|
|
|
|
|
s = PyString_FromString(n == 1 ? ",)" : ")");
|
|
|
|
if (s == NULL)
|
|
|
|
goto Done;
|
|
|
|
temp = PyTuple_GET_ITEM(pieces, n-1);
|
|
|
|
PyString_ConcatAndDel(&temp, s);
|
|
|
|
PyTuple_SET_ITEM(pieces, n-1, temp);
|
|
|
|
if (temp == NULL)
|
|
|
|
goto Done;
|
|
|
|
|
|
|
|
/* Paste them all together with ", " between. */
|
|
|
|
s = PyString_FromString(", ");
|
|
|
|
if (s == NULL)
|
|
|
|
goto Done;
|
|
|
|
result = _PyString_Join(s, pieces);
|
|
|
|
Py_DECREF(s);
|
|
|
|
|
|
|
|
Done:
|
|
|
|
Py_DECREF(pieces);
|
|
|
|
return result;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1993-03-29 10:43:31 +00:00
|
|
|
static long
|
2000-07-09 07:04:36 +00:00
|
|
|
tuplehash(PyTupleObject *v)
|
1993-03-29 10:43:31 +00:00
|
|
|
{
|
|
|
|
register long x, y;
|
|
|
|
register int len = v->ob_size;
|
1997-05-02 03:12:38 +00:00
|
|
|
register PyObject **p;
|
1993-03-29 10:43:31 +00:00
|
|
|
x = 0x345678L;
|
|
|
|
p = v->ob_item;
|
|
|
|
while (--len >= 0) {
|
1997-05-02 03:12:38 +00:00
|
|
|
y = PyObject_Hash(*p++);
|
1993-03-29 10:43:31 +00:00
|
|
|
if (y == -1)
|
|
|
|
return -1;
|
1996-12-16 17:55:46 +00:00
|
|
|
x = (1000003*x) ^ y;
|
1993-03-29 10:43:31 +00:00
|
|
|
}
|
|
|
|
x ^= v->ob_size;
|
|
|
|
if (x == -1)
|
|
|
|
x = -2;
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
1990-10-14 12:07:46 +00:00
|
|
|
static int
|
2000-07-09 07:04:36 +00:00
|
|
|
tuplelength(PyTupleObject *a)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
|
|
|
return a->ob_size;
|
|
|
|
}
|
|
|
|
|
2000-04-27 21:41:03 +00:00
|
|
|
static int
|
2000-07-09 07:04:36 +00:00
|
|
|
tuplecontains(PyTupleObject *a, PyObject *el)
|
2000-04-27 21:41:03 +00:00
|
|
|
{
|
|
|
|
int i, cmp;
|
|
|
|
|
2002-09-05 20:18:08 +00:00
|
|
|
for (i = 0, cmp = 0 ; cmp == 0 && i < a->ob_size; ++i)
|
2001-01-18 00:00:53 +00:00
|
|
|
cmp = PyObject_RichCompareBool(el, PyTuple_GET_ITEM(a, i),
|
2002-09-05 20:18:08 +00:00
|
|
|
Py_EQ);
|
2002-09-05 21:32:55 +00:00
|
|
|
return cmp;
|
2000-04-27 21:41:03 +00:00
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
tupleitem(register PyTupleObject *a, register int i)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
|
|
|
if (i < 0 || i >= a->ob_size) {
|
1997-05-02 03:12:38 +00:00
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_INCREF(a->ob_item[i]);
|
1990-10-14 12:07:46 +00:00
|
|
|
return a->ob_item[i];
|
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
tupleslice(register PyTupleObject *a, register int ilow, register int ihigh)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
register PyTupleObject *np;
|
1990-10-14 12:07:46 +00:00
|
|
|
register int i;
|
|
|
|
if (ilow < 0)
|
|
|
|
ilow = 0;
|
|
|
|
if (ihigh > a->ob_size)
|
|
|
|
ihigh = a->ob_size;
|
|
|
|
if (ihigh < ilow)
|
|
|
|
ihigh = ilow;
|
2001-09-11 19:48:03 +00:00
|
|
|
if (ilow == 0 && ihigh == a->ob_size && PyTuple_CheckExact(a)) {
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
np = (PyTupleObject *)PyTuple_New(ihigh - ilow);
|
1990-10-14 12:07:46 +00:00
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
|
|
|
for (i = ilow; i < ihigh; i++) {
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *v = a->ob_item[i];
|
|
|
|
Py_INCREF(v);
|
1990-10-14 12:07:46 +00:00
|
|
|
np->ob_item[i - ilow] = v;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
return (PyObject *)np;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_GetSlice(PyObject *op, int i, int j)
|
1992-01-14 18:45:33 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
if (op == NULL || !PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1992-01-14 18:45:33 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
return tupleslice((PyTupleObject *)op, i, j);
|
1992-01-14 18:45:33 +00:00
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
tupleconcat(register PyTupleObject *a, register PyObject *bb)
|
1990-10-14 12:07:46 +00:00
|
|
|
{
|
|
|
|
register int size;
|
|
|
|
register int i;
|
1997-05-02 03:12:38 +00:00
|
|
|
PyTupleObject *np;
|
|
|
|
if (!PyTuple_Check(bb)) {
|
2000-06-01 03:12:13 +00:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2000-06-16 17:05:57 +00:00
|
|
|
"can only concatenate tuple (not \"%.200s\") to tuple",
|
2000-06-01 03:12:13 +00:00
|
|
|
bb->ob_type->tp_name);
|
1990-10-14 12:07:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
#define b ((PyTupleObject *)bb)
|
1990-10-14 12:07:46 +00:00
|
|
|
size = a->ob_size + b->ob_size;
|
1997-05-02 03:12:38 +00:00
|
|
|
np = (PyTupleObject *) PyTuple_New(size);
|
1990-10-14 12:07:46 +00:00
|
|
|
if (np == NULL) {
|
1991-06-07 22:59:30 +00:00
|
|
|
return NULL;
|
1990-10-14 12:07:46 +00:00
|
|
|
}
|
|
|
|
for (i = 0; i < a->ob_size; i++) {
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *v = a->ob_item[i];
|
|
|
|
Py_INCREF(v);
|
1990-10-14 12:07:46 +00:00
|
|
|
np->ob_item[i] = v;
|
|
|
|
}
|
|
|
|
for (i = 0; i < b->ob_size; i++) {
|
1997-05-02 03:12:38 +00:00
|
|
|
PyObject *v = b->ob_item[i];
|
|
|
|
Py_INCREF(v);
|
1990-10-14 12:07:46 +00:00
|
|
|
np->ob_item[i + a->ob_size] = v;
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
return (PyObject *)np;
|
1990-10-14 12:07:46 +00:00
|
|
|
#undef b
|
|
|
|
}
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PyObject *
|
2000-07-09 07:04:36 +00:00
|
|
|
tuplerepeat(PyTupleObject *a, int n)
|
1991-06-04 19:35:24 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int size;
|
1997-05-02 03:12:38 +00:00
|
|
|
PyTupleObject *np;
|
|
|
|
PyObject **p;
|
1991-06-04 19:35:24 +00:00
|
|
|
if (n < 0)
|
|
|
|
n = 0;
|
1999-07-12 23:06:58 +00:00
|
|
|
if (a->ob_size == 0 || n == 1) {
|
2001-09-11 19:48:03 +00:00
|
|
|
if (PyTuple_CheckExact(a)) {
|
|
|
|
/* Since tuples are immutable, we can return a shared
|
|
|
|
copy in this case */
|
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
|
|
|
}
|
|
|
|
if (a->ob_size == 0)
|
|
|
|
return PyTuple_New(0);
|
1991-06-04 19:35:24 +00:00
|
|
|
}
|
|
|
|
size = a->ob_size * n;
|
1999-07-13 05:41:12 +00:00
|
|
|
if (size/a->ob_size != n)
|
1999-07-12 23:06:58 +00:00
|
|
|
return PyErr_NoMemory();
|
1997-05-02 03:12:38 +00:00
|
|
|
np = (PyTupleObject *) PyTuple_New(size);
|
1991-06-04 19:35:24 +00:00
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
|
|
|
p = np->ob_item;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
for (j = 0; j < a->ob_size; j++) {
|
|
|
|
*p = a->ob_item[j];
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_INCREF(*p);
|
1991-06-04 19:35:24 +00:00
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
1997-05-02 03:12:38 +00:00
|
|
|
return (PyObject *) np;
|
1991-06-04 19:35:24 +00:00
|
|
|
}
|
|
|
|
|
2000-06-23 14:18:11 +00:00
|
|
|
static int
|
|
|
|
tupletraverse(PyTupleObject *o, visitproc visit, void *arg)
|
|
|
|
{
|
|
|
|
int i, err;
|
|
|
|
PyObject *x;
|
|
|
|
|
|
|
|
for (i = o->ob_size; --i >= 0; ) {
|
|
|
|
x = o->ob_item[i];
|
|
|
|
if (x != NULL) {
|
|
|
|
err = visit(x, arg);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-01-18 00:00:53 +00:00
|
|
|
static PyObject *
|
|
|
|
tuplerichcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
|
|
|
PyTupleObject *vt, *wt;
|
|
|
|
int i;
|
2001-05-15 20:12:59 +00:00
|
|
|
int vlen, wlen;
|
2001-01-18 00:00:53 +00:00
|
|
|
|
|
|
|
if (!PyTuple_Check(v) || !PyTuple_Check(w)) {
|
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
return Py_NotImplemented;
|
|
|
|
}
|
|
|
|
|
|
|
|
vt = (PyTupleObject *)v;
|
|
|
|
wt = (PyTupleObject *)w;
|
|
|
|
|
2001-05-15 20:12:59 +00:00
|
|
|
vlen = vt->ob_size;
|
|
|
|
wlen = wt->ob_size;
|
|
|
|
|
|
|
|
/* Note: the corresponding code for lists has an "early out" test
|
|
|
|
* here when op is EQ or NE and the lengths differ. That pays there,
|
|
|
|
* but Tim was unable to find any real code where EQ/NE tuple
|
|
|
|
* compares don't have the same length, so testing for it here would
|
|
|
|
* have cost without benefit.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Search for the first index where items are different.
|
|
|
|
* Note that because tuples are immutable, it's safe to reuse
|
|
|
|
* vlen and wlen across the comparison calls.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < vlen && i < wlen; i++) {
|
2001-01-18 00:00:53 +00:00
|
|
|
int k = PyObject_RichCompareBool(vt->ob_item[i],
|
|
|
|
wt->ob_item[i], Py_EQ);
|
|
|
|
if (k < 0)
|
|
|
|
return NULL;
|
|
|
|
if (!k)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-05-15 20:12:59 +00:00
|
|
|
if (i >= vlen || i >= wlen) {
|
2001-01-18 00:00:53 +00:00
|
|
|
/* No more items to compare -- compare sizes */
|
|
|
|
int cmp;
|
|
|
|
PyObject *res;
|
|
|
|
switch (op) {
|
2001-05-15 20:12:59 +00:00
|
|
|
case Py_LT: cmp = vlen < wlen; break;
|
|
|
|
case Py_LE: cmp = vlen <= wlen; break;
|
|
|
|
case Py_EQ: cmp = vlen == wlen; break;
|
|
|
|
case Py_NE: cmp = vlen != wlen; break;
|
|
|
|
case Py_GT: cmp = vlen > wlen; break;
|
|
|
|
case Py_GE: cmp = vlen >= wlen; break;
|
2001-01-18 00:00:53 +00:00
|
|
|
default: return NULL; /* cannot happen */
|
|
|
|
}
|
|
|
|
if (cmp)
|
|
|
|
res = Py_True;
|
|
|
|
else
|
|
|
|
res = Py_False;
|
|
|
|
Py_INCREF(res);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We have an item that differs -- shortcuts for EQ/NE */
|
|
|
|
if (op == Py_EQ) {
|
|
|
|
Py_INCREF(Py_False);
|
|
|
|
return Py_False;
|
|
|
|
}
|
|
|
|
if (op == Py_NE) {
|
|
|
|
Py_INCREF(Py_True);
|
|
|
|
return Py_True;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare the final item again using the proper operator */
|
|
|
|
return PyObject_RichCompare(vt->ob_item[i], wt->ob_item[i], op);
|
|
|
|
}
|
|
|
|
|
2002-07-17 16:30:39 +00:00
|
|
|
static PyObject *
|
2001-08-30 03:11:59 +00:00
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
|
2001-08-02 04:15:00 +00:00
|
|
|
static PyObject *
|
|
|
|
tuple_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyObject *arg = NULL;
|
|
|
|
static char *kwlist[] = {"sequence", 0};
|
|
|
|
|
2001-08-30 03:11:59 +00:00
|
|
|
if (type != &PyTuple_Type)
|
|
|
|
return tuple_subtype_new(type, args, kwds);
|
2001-08-02 04:15:00 +00:00
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:tuple", kwlist, &arg))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (arg == NULL)
|
|
|
|
return PyTuple_New(0);
|
|
|
|
else
|
|
|
|
return PySequence_Tuple(arg);
|
|
|
|
}
|
|
|
|
|
2001-08-30 03:11:59 +00:00
|
|
|
static PyObject *
|
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyObject *tmp, *new, *item;
|
|
|
|
int i, n;
|
|
|
|
|
|
|
|
assert(PyType_IsSubtype(type, &PyTuple_Type));
|
|
|
|
tmp = tuple_new(&PyTuple_Type, args, kwds);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyTuple_Check(tmp));
|
|
|
|
new = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
|
|
|
|
if (new == NULL)
|
|
|
|
return NULL;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
item = PyTuple_GET_ITEM(tmp, i);
|
|
|
|
Py_INCREF(item);
|
|
|
|
PyTuple_SET_ITEM(new, i, item);
|
|
|
|
}
|
|
|
|
Py_DECREF(tmp);
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2002-06-13 20:33:02 +00:00
|
|
|
PyDoc_STRVAR(tuple_doc,
|
2001-09-02 06:42:25 +00:00
|
|
|
"tuple() -> an empty tuple\n"
|
|
|
|
"tuple(sequence) -> tuple initialized from sequence's items\n"
|
|
|
|
"\n"
|
2002-06-13 20:33:02 +00:00
|
|
|
"If the argument is a tuple, the return value is the same object.");
|
2001-08-02 04:15:00 +00:00
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
static PySequenceMethods tuple_as_sequence = {
|
2001-01-18 00:00:53 +00:00
|
|
|
(inquiry)tuplelength, /* sq_length */
|
|
|
|
(binaryfunc)tupleconcat, /* sq_concat */
|
|
|
|
(intargfunc)tuplerepeat, /* sq_repeat */
|
|
|
|
(intargfunc)tupleitem, /* sq_item */
|
|
|
|
(intintargfunc)tupleslice, /* sq_slice */
|
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
|
|
|
(objobjproc)tuplecontains, /* sq_contains */
|
1990-10-14 12:07:46 +00:00
|
|
|
};
|
|
|
|
|
2002-06-11 10:55:12 +00:00
|
|
|
static PyObject*
|
|
|
|
tuplesubscript(PyTupleObject* self, PyObject* item)
|
|
|
|
{
|
|
|
|
if (PyInt_Check(item)) {
|
|
|
|
long i = PyInt_AS_LONG(item);
|
|
|
|
if (i < 0)
|
|
|
|
i += PyTuple_GET_SIZE(self);
|
|
|
|
return tupleitem(self, i);
|
|
|
|
}
|
|
|
|
else if (PyLong_Check(item)) {
|
|
|
|
long i = PyLong_AsLong(item);
|
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
if (i < 0)
|
|
|
|
i += PyTuple_GET_SIZE(self);
|
|
|
|
return tupleitem(self, i);
|
|
|
|
}
|
|
|
|
else if (PySlice_Check(item)) {
|
|
|
|
int start, stop, step, slicelength, cur, i;
|
|
|
|
PyObject* result;
|
|
|
|
PyObject* it;
|
|
|
|
|
|
|
|
if (PySlice_GetIndicesEx((PySliceObject*)item,
|
|
|
|
PyTuple_GET_SIZE(self),
|
|
|
|
&start, &stop, &step, &slicelength) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (slicelength <= 0) {
|
|
|
|
return PyTuple_New(0);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
result = PyTuple_New(slicelength);
|
|
|
|
|
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
|
|
cur += step, i++) {
|
|
|
|
it = PyTuple_GET_ITEM(self, cur);
|
|
|
|
Py_INCREF(it);
|
|
|
|
PyTuple_SET_ITEM(result, i, it);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"tuple indices must be integers");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMappingMethods tuple_as_mapping = {
|
|
|
|
(inquiry)tuplelength,
|
|
|
|
(binaryfunc)tuplesubscript,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
2002-08-09 01:30:17 +00:00
|
|
|
static PyObject *tuple_iter(PyObject *seq);
|
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
PyTypeObject PyTuple_Type = {
|
|
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
1990-10-14 12:07:46 +00:00
|
|
|
0,
|
|
|
|
"tuple",
|
2001-08-29 23:54:21 +00:00
|
|
|
sizeof(PyTupleObject) - sizeof(PyObject *),
|
1997-05-02 03:12:38 +00:00
|
|
|
sizeof(PyObject *),
|
2001-01-18 00:00:53 +00:00
|
|
|
(destructor)tupledealloc, /* tp_dealloc */
|
|
|
|
(printfunc)tupleprint, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
(reprfunc)tuplerepr, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
&tuple_as_sequence, /* tp_as_sequence */
|
2002-06-11 10:55:12 +00:00
|
|
|
&tuple_as_mapping, /* tp_as_mapping */
|
2001-01-18 00:00:53 +00:00
|
|
|
(hashfunc)tuplehash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
2001-08-02 04:15:00 +00:00
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
2001-01-18 00:00:53 +00:00
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2001-08-30 03:11:59 +00:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_BASETYPE, /* tp_flags */
|
2001-08-02 04:15:00 +00:00
|
|
|
tuple_doc, /* tp_doc */
|
2001-01-18 00:00:53 +00:00
|
|
|
(traverseproc)tupletraverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
tuplerichcompare, /* tp_richcompare */
|
2001-08-02 04:15:00 +00:00
|
|
|
0, /* tp_weaklistoffset */
|
2002-08-09 01:30:17 +00:00
|
|
|
tuple_iter, /* tp_iter */
|
2001-08-02 04:15:00 +00:00
|
|
|
0, /* tp_iternext */
|
|
|
|
0, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
0, /* tp_getset */
|
|
|
|
0, /* tp_base */
|
|
|
|
0, /* tp_dict */
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
0, /* tp_init */
|
|
|
|
0, /* tp_alloc */
|
|
|
|
tuple_new, /* tp_new */
|
2002-04-12 03:05:52 +00:00
|
|
|
PyObject_GC_Del, /* tp_free */
|
1990-10-14 12:07:46 +00:00
|
|
|
};
|
1993-10-26 17:58:25 +00:00
|
|
|
|
|
|
|
/* The following function breaks the notion that tuples are immutable:
|
|
|
|
it changes the size of a tuple. We get away with this only if there
|
|
|
|
is only one module referencing the object. You can also think of it
|
2000-10-05 19:36:49 +00:00
|
|
|
as creating a new tuple object and destroying the old one, only more
|
|
|
|
efficiently. In any case, don't use this if the tuple may already be
|
2001-05-28 22:30:08 +00:00
|
|
|
known to some other part of the code. */
|
1993-10-26 17:58:25 +00:00
|
|
|
|
|
|
|
int
|
2001-05-28 22:30:08 +00:00
|
|
|
_PyTuple_Resize(PyObject **pv, int newsize)
|
1993-10-26 17:58:25 +00:00
|
|
|
{
|
1997-05-02 03:12:38 +00:00
|
|
|
register PyTupleObject *v;
|
|
|
|
register PyTupleObject *sv;
|
1993-11-01 13:46:50 +00:00
|
|
|
int i;
|
2001-12-07 20:00:04 +00:00
|
|
|
int oldsize;
|
1993-11-01 13:46:50 +00:00
|
|
|
|
1997-05-02 03:12:38 +00:00
|
|
|
v = (PyTupleObject *) *pv;
|
2001-08-30 18:31:30 +00:00
|
|
|
if (v == NULL || v->ob_type != &PyTuple_Type ||
|
2001-05-28 13:11:02 +00:00
|
|
|
(v->ob_size != 0 && v->ob_refcnt != 1)) {
|
1993-10-26 17:58:25 +00:00
|
|
|
*pv = 0;
|
2000-10-05 19:36:49 +00:00
|
|
|
Py_XDECREF(v);
|
1997-05-02 03:12:38 +00:00
|
|
|
PyErr_BadInternalCall();
|
1993-10-26 17:58:25 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2001-12-07 20:00:04 +00:00
|
|
|
oldsize = v->ob_size;
|
|
|
|
if (oldsize == newsize)
|
1993-11-01 13:46:50 +00:00
|
|
|
return 0;
|
2000-10-05 19:36:49 +00:00
|
|
|
|
2001-12-07 20:00:04 +00:00
|
|
|
if (oldsize == 0) {
|
2001-05-28 13:11:02 +00:00
|
|
|
/* Empty tuples are often shared, so we should never
|
|
|
|
resize them in-place even if we do own the only
|
|
|
|
(current) reference */
|
|
|
|
Py_DECREF(v);
|
|
|
|
*pv = PyTuple_New(newsize);
|
2001-05-29 07:58:45 +00:00
|
|
|
return *pv == NULL ? -1 : 0;
|
2001-05-28 13:11:02 +00:00
|
|
|
}
|
|
|
|
|
1993-10-26 17:58:25 +00:00
|
|
|
/* XXX UNREF/NEWREF interface should be more symmetrical */
|
object.h special-build macro minefield: renamed all the new lexical
helper macros to something saner, and used them appropriately in other
files too, to reduce #ifdef blocks.
classobject.c, instance_dealloc(): One of my worst Python Memories is
trying to fix this routine a few years ago when COUNT_ALLOCS was defined
but Py_TRACE_REFS wasn't. The special-build code here is way too
complicated. Now it's much simpler. Difference: in a Py_TRACE_REFS
build, the instance is no longer in the doubly-linked list of live
objects while its __del__ method is executing, and that may be visible
via sys.getobjects() called from a __del__ method. Tough -- the object
is presumed dead while its __del__ is executing anyway, and not calling
_Py_NewReference() at the start allows enormous code simplification.
typeobject.c, call_finalizer(): The special-build instance_dealloc()
pain apparently spread to here too via cut-'n-paste, and this is much
simpler now too. In addition, I didn't understand why this routine
was calling _PyObject_GC_TRACK() after a resurrection, since there's no
plausible way _PyObject_GC_UNTRACK() could have been called on the
object by this point. I suspect it was left over from pasting the
instance_delloc() code. Instead asserted that the object is still
tracked. Caution: I suspect we don't have a test that actually
exercises the subtype_dealloc() __del__-resurrected-me code.
2002-07-11 06:23:50 +00:00
|
|
|
_Py_DEC_REFTOTAL;
|
2001-08-29 23:54:21 +00:00
|
|
|
_PyObject_GC_UNTRACK(v);
|
2000-10-05 19:36:49 +00:00
|
|
|
_Py_ForgetReference((PyObject *) v);
|
2001-12-07 20:00:04 +00:00
|
|
|
/* DECREF items deleted by shrinkage */
|
|
|
|
for (i = newsize; i < oldsize; i++) {
|
1997-05-02 03:12:38 +00:00
|
|
|
Py_XDECREF(v->ob_item[i]);
|
1993-11-01 13:46:50 +00:00
|
|
|
v->ob_item[i] = NULL;
|
|
|
|
}
|
2001-08-29 23:54:21 +00:00
|
|
|
sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
|
2000-10-05 19:36:49 +00:00
|
|
|
if (sv == NULL) {
|
|
|
|
*pv = NULL;
|
2001-08-29 23:54:21 +00:00
|
|
|
PyObject_GC_Del(v);
|
2000-10-05 19:36:49 +00:00
|
|
|
return -1;
|
1993-10-26 17:58:25 +00:00
|
|
|
}
|
2000-10-05 19:36:49 +00:00
|
|
|
_Py_NewReference((PyObject *) sv);
|
2001-12-07 20:00:04 +00:00
|
|
|
/* Zero out items added by growing */
|
2002-06-13 21:11:11 +00:00
|
|
|
if (newsize > oldsize)
|
2002-06-20 23:13:17 +00:00
|
|
|
memset(&sv->ob_item[oldsize], 0,
|
|
|
|
sizeof(*sv->ob_item) * (newsize - oldsize));
|
2000-10-05 19:36:49 +00:00
|
|
|
*pv = (PyObject *) sv;
|
2001-08-29 23:54:21 +00:00
|
|
|
_PyObject_GC_TRACK(sv);
|
1993-10-26 17:58:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1997-08-05 02:16:08 +00:00
|
|
|
|
|
|
|
void
|
2000-07-09 07:04:36 +00:00
|
|
|
PyTuple_Fini(void)
|
1997-08-05 02:16:08 +00:00
|
|
|
{
|
|
|
|
#if MAXSAVESIZE > 0
|
|
|
|
int i;
|
|
|
|
|
|
|
|
Py_XDECREF(free_tuples[0]);
|
|
|
|
free_tuples[0] = NULL;
|
|
|
|
|
|
|
|
for (i = 1; i < MAXSAVESIZE; i++) {
|
|
|
|
PyTupleObject *p, *q;
|
|
|
|
p = free_tuples[i];
|
|
|
|
free_tuples[i] = NULL;
|
|
|
|
while (p) {
|
|
|
|
q = p;
|
|
|
|
p = (PyTupleObject *)(p->ob_item[0]);
|
2001-08-29 23:54:21 +00:00
|
|
|
PyObject_GC_Del(q);
|
1997-08-05 02:16:08 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2002-08-09 01:30:17 +00:00
|
|
|
|
|
|
|
/*********************** Tuple Iterator **************************/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
long it_index;
|
|
|
|
PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
|
|
|
|
} tupleiterobject;
|
|
|
|
|
|
|
|
PyTypeObject PyTupleIter_Type;
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tuple_iter(PyObject *seq)
|
|
|
|
{
|
|
|
|
tupleiterobject *it;
|
|
|
|
|
|
|
|
if (!PyTuple_Check(seq)) {
|
|
|
|
PyErr_BadInternalCall();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
|
|
|
|
if (it == NULL)
|
|
|
|
return NULL;
|
|
|
|
it->it_index = 0;
|
|
|
|
Py_INCREF(seq);
|
|
|
|
it->it_seq = (PyTupleObject *)seq;
|
|
|
|
_PyObject_GC_TRACK(it);
|
|
|
|
return (PyObject *)it;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
tupleiter_dealloc(tupleiterobject *it)
|
|
|
|
{
|
|
|
|
_PyObject_GC_UNTRACK(it);
|
|
|
|
Py_XDECREF(it->it_seq);
|
|
|
|
PyObject_GC_Del(it);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
tupleiter_traverse(tupleiterobject *it, visitproc visit, void *arg)
|
|
|
|
{
|
|
|
|
if (it->it_seq == NULL)
|
|
|
|
return 0;
|
|
|
|
return visit((PyObject *)it->it_seq, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tupleiter_getiter(PyObject *it)
|
|
|
|
{
|
|
|
|
Py_INCREF(it);
|
|
|
|
return it;
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyObject *
|
|
|
|
tupleiter_next(tupleiterobject *it)
|
|
|
|
{
|
|
|
|
PyTupleObject *seq;
|
|
|
|
PyObject *item;
|
|
|
|
|
|
|
|
assert(it != NULL);
|
|
|
|
seq = it->it_seq;
|
|
|
|
if (seq == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyTuple_Check(seq));
|
|
|
|
|
|
|
|
if (it->it_index < PyTuple_GET_SIZE(seq)) {
|
|
|
|
item = PyTuple_GET_ITEM(seq, it->it_index);
|
|
|
|
++it->it_index;
|
|
|
|
Py_INCREF(item);
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_DECREF(seq);
|
|
|
|
it->it_seq = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
PyTypeObject PyTupleIter_Type = {
|
|
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
|
|
|
0, /* ob_size */
|
|
|
|
"tupleiterator", /* tp_name */
|
|
|
|
sizeof(tupleiterobject), /* tp_basicsize */
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
/* methods */
|
|
|
|
(destructor)tupleiter_dealloc, /* tp_dealloc */
|
|
|
|
0, /* tp_print */
|
|
|
|
0, /* tp_getattr */
|
|
|
|
0, /* tp_setattr */
|
|
|
|
0, /* tp_compare */
|
|
|
|
0, /* tp_repr */
|
|
|
|
0, /* tp_as_number */
|
|
|
|
0, /* tp_as_sequence */
|
|
|
|
0, /* tp_as_mapping */
|
|
|
|
0, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */
|
|
|
|
0, /* tp_doc */
|
|
|
|
(traverseproc)tupleiter_traverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
(getiterfunc)tupleiter_getiter, /* tp_iter */
|
|
|
|
(iternextfunc)tupleiter_next, /* tp_iternext */
|
|
|
|
};
|