1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Tuple object implementation */
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
#include "Python.h"
|
1990-10-14 09:07:46 -03: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 18:15:05 -03:00
|
|
|
/* Speed optimization to avoid frequent malloc/free of small tuples */
|
1993-10-15 13:18:48 -03: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 18:15:05 -03: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 13:18:48 -03: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 18:15:05 -03:00
|
|
|
/* Entries 1 up to MAXSAVESIZE are free lists, entry 0 is the empty
|
1993-10-15 13:18:48 -03:00
|
|
|
tuple () of which at most one instance will be allocated.
|
|
|
|
*/
|
1997-05-02 00:12:38 -03: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 18:15:05 -03:00
|
|
|
static int num_free_tuples[MAXSAVESIZE];
|
1993-10-15 13:18:48 -03:00
|
|
|
#endif
|
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
int fast_tuple_allocs;
|
|
|
|
int tuple_zero_allocs;
|
|
|
|
#endif
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
PyTuple_New(register Py_ssize_t size)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
register PyTupleObject *op;
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
1990-10-14 09:07:46 -03:00
|
|
|
if (size < 0) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1993-10-15 13:18:48 -03:00
|
|
|
#if MAXSAVESIZE > 0
|
1993-11-01 09:46:50 -04:00
|
|
|
if (size == 0 && free_tuples[0]) {
|
|
|
|
op = free_tuples[0];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(op);
|
1993-10-15 13:18:48 -03:00
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
tuple_zero_allocs++;
|
|
|
|
#endif
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *) op;
|
1993-10-15 13:18:48 -03:00
|
|
|
}
|
2004-03-14 20:16:34 -04:00
|
|
|
if (size < MAXSAVESIZE && (op = free_tuples[size]) != NULL) {
|
1997-05-02 00:12:38 -03:00
|
|
|
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 18:15:05 -03:00
|
|
|
num_free_tuples[size]--;
|
1993-10-15 13:18:48 -03:00
|
|
|
#ifdef COUNT_ALLOCS
|
|
|
|
fast_tuple_allocs++;
|
1998-12-11 10:56:38 -04:00
|
|
|
#endif
|
2002-08-19 16:26:42 -03:00
|
|
|
/* Inline PyObject_InitVar */
|
1998-12-11 10:56:38 -04:00
|
|
|
#ifdef Py_TRACE_REFS
|
|
|
|
op->ob_size = size;
|
2000-05-03 20:44:39 -03:00
|
|
|
op->ob_type = &PyTuple_Type;
|
1993-10-15 13:18:48 -03:00
|
|
|
#endif
|
2000-05-03 20:44:39 -03:00
|
|
|
_Py_NewReference((PyObject *)op);
|
1997-08-04 23:16:08 -03:00
|
|
|
}
|
|
|
|
else
|
1993-10-15 13:18:48 -03:00
|
|
|
#endif
|
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t nbytes = size * sizeof(PyObject *);
|
1999-07-12 20:06:58 -03:00
|
|
|
/* Check for overflow */
|
|
|
|
if (nbytes / sizeof(PyObject *) != (size_t)size ||
|
2001-08-29 20:54:21 -03:00
|
|
|
(nbytes += sizeof(PyTupleObject) - sizeof(PyObject *))
|
1999-07-12 20:06:58 -03:00
|
|
|
<= 0)
|
|
|
|
{
|
|
|
|
return PyErr_NoMemory();
|
|
|
|
}
|
2001-08-29 20:54:21 -03:00
|
|
|
op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
|
1993-10-15 13:18:48 -03:00
|
|
|
if (op == NULL)
|
2001-08-29 20:54:21 -03:00
|
|
|
return NULL;
|
1993-10-15 13:18:48 -03:00
|
|
|
}
|
2004-03-21 18:29:05 -04:00
|
|
|
for (i=0; i < size; i++)
|
|
|
|
op->ob_item[i] = NULL;
|
1993-10-15 13:18:48 -03:00
|
|
|
#if MAXSAVESIZE > 0
|
|
|
|
if (size == 0) {
|
1993-11-01 09:46:50 -04: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 18:15:05 -03:00
|
|
|
++num_free_tuples[0];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(op); /* extra INCREF so that this is never freed */
|
1993-10-15 13:18:48 -03:00
|
|
|
}
|
|
|
|
#endif
|
2001-08-29 20:54:21 -03:00
|
|
|
_PyObject_GC_TRACK(op);
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *) op;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t
|
2000-07-09 04:04:36 -03:00
|
|
|
PyTuple_Size(register PyObject *op)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 09:07:46 -03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
1997-05-02 00:12:38 -03:00
|
|
|
return ((PyTupleObject *)op)->ob_size;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
PyTuple_GetItem(register PyObject *op, register Py_ssize_t i)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
if (!PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
if (i < 0 || i >= ((PyTupleObject *)op) -> ob_size) {
|
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return ((PyTupleObject *)op) -> ob_item[i];
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2006-02-15 13:27:45 -04:00
|
|
|
PyTuple_SetItem(register PyObject *op, register Py_ssize_t i, PyObject *newitem)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
register PyObject *olditem;
|
|
|
|
register PyObject **p;
|
1997-08-17 13:25:45 -03:00
|
|
|
if (!PyTuple_Check(op) || op->ob_refcnt != 1) {
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_XDECREF(newitem);
|
|
|
|
PyErr_BadInternalCall();
|
1990-10-21 19:15:08 -03:00
|
|
|
return -1;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1997-05-02 00:12:38 -03: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 19:15:08 -03:00
|
|
|
return -1;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
p = ((PyTupleObject *)op) -> ob_item + i;
|
1995-03-09 08:12:50 -04:00
|
|
|
olditem = *p;
|
|
|
|
*p = newitem;
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_XDECREF(olditem);
|
1990-10-14 09:07:46 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-12 15:24:34 -03:00
|
|
|
PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
PyTuple_Pack(Py_ssize_t n, ...)
|
2003-10-12 15:24:34 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
2003-10-12 15:24:34 -03:00
|
|
|
PyObject *o;
|
|
|
|
PyObject *result;
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject **items;
|
2003-10-12 15:24:34 -03:00
|
|
|
va_list vargs;
|
|
|
|
|
|
|
|
va_start(vargs, n);
|
|
|
|
result = PyTuple_New(n);
|
|
|
|
if (result == NULL)
|
|
|
|
return NULL;
|
2004-03-09 09:05:22 -04:00
|
|
|
items = ((PyTupleObject *)result)->ob_item;
|
2003-10-12 15:24:34 -03:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
o = va_arg(vargs, PyObject *);
|
|
|
|
Py_INCREF(o);
|
2004-03-09 09:05:22 -04:00
|
|
|
items[i] = o;
|
2003-10-12 15:24:34 -03:00
|
|
|
}
|
|
|
|
va_end(vargs);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Methods */
|
|
|
|
|
|
|
|
static void
|
2000-07-09 04:04:36 -03:00
|
|
|
tupledealloc(register PyTupleObject *op)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
register Py_ssize_t i;
|
|
|
|
register Py_ssize_t len = op->ob_size;
|
2002-03-28 16:34:59 -04:00
|
|
|
PyObject_GC_UnTrack(op);
|
2000-03-13 12:01:29 -04: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 18:15:05 -03:00
|
|
|
if (len > 0) {
|
|
|
|
i = len;
|
2004-03-21 18:29:05 -04:00
|
|
|
while (--i >= 0)
|
|
|
|
Py_XDECREF(op->ob_item[i]);
|
1993-10-15 13:18:48 -03:00
|
|
|
#if MAXSAVESIZE > 0
|
2001-08-30 15:31:30 -03: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 18:15:05 -03:00
|
|
|
op->ob_item[0] = (PyObject *) free_tuples[len];
|
|
|
|
num_free_tuples[len]++;
|
|
|
|
free_tuples[len] = op;
|
2000-03-13 12:01:29 -04:00
|
|
|
goto done; /* return */
|
1998-06-26 12:53:50 -03:00
|
|
|
}
|
1993-10-15 13:18:48 -03:00
|
|
|
#endif
|
1998-06-26 12:53:50 -03:00
|
|
|
}
|
2001-10-05 17:51:39 -03:00
|
|
|
op->ob_type->tp_free((PyObject *)op);
|
2000-03-13 12:01:29 -04:00
|
|
|
done:
|
|
|
|
Py_TRASHCAN_SAFE_END(op)
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1991-06-07 19:59:30 -03:00
|
|
|
static int
|
2000-07-09 04:04:36 -03:00
|
|
|
tupleprint(PyTupleObject *op, FILE *fp, int flags)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
1990-10-14 09:07:46 -03:00
|
|
|
fprintf(fp, "(");
|
1991-06-07 19:59:30 -03:00
|
|
|
for (i = 0; i < op->ob_size; i++) {
|
|
|
|
if (i > 0)
|
1990-10-14 09:07:46 -03:00
|
|
|
fprintf(fp, ", ");
|
1997-05-02 00:12:38 -03:00
|
|
|
if (PyObject_Print(op->ob_item[i], fp, 0) != 0)
|
1991-06-07 19:59:30 -03:00
|
|
|
return -1;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
if (op->ob_size == 1)
|
|
|
|
fprintf(fp, ",");
|
|
|
|
fprintf(fp, ")");
|
1991-06-07 19:59:30 -03:00
|
|
|
return 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 04:04:36 -03:00
|
|
|
tuplerepr(PyTupleObject *v)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i, n;
|
2001-06-16 02:11:17 -03:00
|
|
|
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 09:07:46 -03:00
|
|
|
}
|
2001-06-16 02:11:17 -03: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 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2004-06-04 03:35:20 -03:00
|
|
|
/* The addend 82520, was selected from the range(0, 1000000) for
|
|
|
|
generating the greatest number of prime multipliers for tuples
|
|
|
|
upto length eight:
|
|
|
|
|
|
|
|
1082527, 1165049, 1082531, 1165057, 1247581, 1330103, 1082533,
|
|
|
|
1330111, 1412633, 1165069, 1247599, 1495177, 1577699
|
|
|
|
*/
|
|
|
|
|
1993-03-29 06:43:31 -04:00
|
|
|
static long
|
2000-07-09 04:04:36 -03:00
|
|
|
tuplehash(PyTupleObject *v)
|
1993-03-29 06:43:31 -04:00
|
|
|
{
|
|
|
|
register long x, y;
|
2006-02-15 13:27:45 -04:00
|
|
|
register Py_ssize_t len = v->ob_size;
|
1997-05-02 00:12:38 -03:00
|
|
|
register PyObject **p;
|
2004-06-01 03:36:24 -03:00
|
|
|
long mult = 1000003L;
|
1993-03-29 06:43:31 -04:00
|
|
|
x = 0x345678L;
|
|
|
|
p = v->ob_item;
|
|
|
|
while (--len >= 0) {
|
1997-05-02 00:12:38 -03:00
|
|
|
y = PyObject_Hash(*p++);
|
1993-03-29 06:43:31 -04:00
|
|
|
if (y == -1)
|
|
|
|
return -1;
|
2004-06-01 03:36:24 -03:00
|
|
|
x = (x ^ y) * mult;
|
2006-02-16 10:32:27 -04:00
|
|
|
/* the cast might truncate len; that doesn't change hash stability */
|
|
|
|
mult += (long)(82520L + len + len);
|
1993-03-29 06:43:31 -04:00
|
|
|
}
|
2004-06-10 15:42:15 -03:00
|
|
|
x += 97531L;
|
1993-03-29 06:43:31 -04:00
|
|
|
if (x == -1)
|
|
|
|
x = -2;
|
|
|
|
return x;
|
|
|
|
}
|
|
|
|
|
2006-02-15 13:27:45 -04:00
|
|
|
static Py_ssize_t
|
2000-07-09 04:04:36 -03:00
|
|
|
tuplelength(PyTupleObject *a)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
return a->ob_size;
|
|
|
|
}
|
|
|
|
|
2000-04-27 18:41:03 -03:00
|
|
|
static int
|
2000-07-09 04:04:36 -03:00
|
|
|
tuplecontains(PyTupleObject *a, PyObject *el)
|
2000-04-27 18:41:03 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
|
|
|
int cmp;
|
2000-04-27 18:41:03 -03:00
|
|
|
|
2002-09-05 17:18:08 -03:00
|
|
|
for (i = 0, cmp = 0 ; cmp == 0 && i < a->ob_size; ++i)
|
2001-01-17 20:00:53 -04:00
|
|
|
cmp = PyObject_RichCompareBool(el, PyTuple_GET_ITEM(a, i),
|
2002-09-05 17:18:08 -03:00
|
|
|
Py_EQ);
|
2002-09-05 18:32:55 -03:00
|
|
|
return cmp;
|
2000-04-27 18:41:03 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
tupleitem(register PyTupleObject *a, register Py_ssize_t i)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
if (i < 0 || i >= a->ob_size) {
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_SetString(PyExc_IndexError, "tuple index out of range");
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(a->ob_item[i]);
|
1990-10-14 09:07:46 -03:00
|
|
|
return a->ob_item[i];
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
tupleslice(register PyTupleObject *a, register Py_ssize_t ilow,
|
|
|
|
register Py_ssize_t ihigh)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
register PyTupleObject *np;
|
2004-03-08 03:25:05 -04:00
|
|
|
PyObject **src, **dest;
|
2006-02-15 13:27:45 -04:00
|
|
|
register Py_ssize_t i;
|
|
|
|
Py_ssize_t len;
|
1990-10-14 09:07:46 -03:00
|
|
|
if (ilow < 0)
|
|
|
|
ilow = 0;
|
|
|
|
if (ihigh > a->ob_size)
|
|
|
|
ihigh = a->ob_size;
|
|
|
|
if (ihigh < ilow)
|
|
|
|
ihigh = ilow;
|
2001-09-11 16:48:03 -03:00
|
|
|
if (ilow == 0 && ihigh == a->ob_size && PyTuple_CheckExact(a)) {
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(a);
|
|
|
|
return (PyObject *)a;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
2004-03-08 03:25:05 -04:00
|
|
|
len = ihigh - ilow;
|
|
|
|
np = (PyTupleObject *)PyTuple_New(len);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
2004-03-08 03:25:05 -04:00
|
|
|
src = a->ob_item + ilow;
|
|
|
|
dest = np->ob_item;
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
PyObject *v = src[i];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(v);
|
2004-03-08 03:25:05 -04:00
|
|
|
dest[i] = v;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *)np;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
PyTuple_GetSlice(PyObject *op, Py_ssize_t i, Py_ssize_t j)
|
1992-01-14 14:45:33 -04:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
if (op == NULL || !PyTuple_Check(op)) {
|
|
|
|
PyErr_BadInternalCall();
|
1992-01-14 14:45:33 -04:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return tupleslice((PyTupleObject *)op, i, j);
|
1992-01-14 14:45:33 -04:00
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2000-07-09 04:04:36 -03:00
|
|
|
tupleconcat(register PyTupleObject *a, register PyObject *bb)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
register Py_ssize_t size;
|
|
|
|
register Py_ssize_t i;
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject **src, **dest;
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTupleObject *np;
|
|
|
|
if (!PyTuple_Check(bb)) {
|
2000-06-01 00:12:13 -03:00
|
|
|
PyErr_Format(PyExc_TypeError,
|
2000-06-16 14:05:57 -03:00
|
|
|
"can only concatenate tuple (not \"%.200s\") to tuple",
|
2000-06-01 00:12:13 -03:00
|
|
|
bb->ob_type->tp_name);
|
1990-10-14 09:07:46 -03:00
|
|
|
return NULL;
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
#define b ((PyTupleObject *)bb)
|
1990-10-14 09:07:46 -03:00
|
|
|
size = a->ob_size + b->ob_size;
|
2002-10-11 18:05:56 -03:00
|
|
|
if (size < 0)
|
|
|
|
return PyErr_NoMemory();
|
1997-05-02 00:12:38 -03:00
|
|
|
np = (PyTupleObject *) PyTuple_New(size);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (np == NULL) {
|
1991-06-07 19:59:30 -03:00
|
|
|
return NULL;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
2004-03-09 09:05:22 -04:00
|
|
|
src = a->ob_item;
|
|
|
|
dest = np->ob_item;
|
1990-10-14 09:07:46 -03:00
|
|
|
for (i = 0; i < a->ob_size; i++) {
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject *v = src[i];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(v);
|
2004-03-09 09:05:22 -04:00
|
|
|
dest[i] = v;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
2004-03-09 09:05:22 -04:00
|
|
|
src = b->ob_item;
|
|
|
|
dest = np->ob_item + a->ob_size;
|
1990-10-14 09:07:46 -03:00
|
|
|
for (i = 0; i < b->ob_size; i++) {
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject *v = src[i];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(v);
|
2004-03-09 09:05:22 -04:00
|
|
|
dest[i] = v;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *)np;
|
1990-10-14 09:07:46 -03:00
|
|
|
#undef b
|
|
|
|
}
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PyObject *
|
2006-02-15 13:27:45 -04:00
|
|
|
tuplerepeat(PyTupleObject *a, Py_ssize_t n)
|
1991-06-04 16:35:24 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i, j;
|
|
|
|
Py_ssize_t size;
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTupleObject *np;
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject **p, **items;
|
1991-06-04 16:35:24 -03:00
|
|
|
if (n < 0)
|
|
|
|
n = 0;
|
1999-07-12 20:06:58 -03:00
|
|
|
if (a->ob_size == 0 || n == 1) {
|
2001-09-11 16:48:03 -03: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 16:35:24 -03:00
|
|
|
}
|
|
|
|
size = a->ob_size * n;
|
1999-07-13 02:41:12 -03:00
|
|
|
if (size/a->ob_size != n)
|
1999-07-12 20:06:58 -03:00
|
|
|
return PyErr_NoMemory();
|
1997-05-02 00:12:38 -03:00
|
|
|
np = (PyTupleObject *) PyTuple_New(size);
|
1991-06-04 16:35:24 -03:00
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
|
|
|
p = np->ob_item;
|
2004-03-09 09:05:22 -04:00
|
|
|
items = a->ob_item;
|
1991-06-04 16:35:24 -03:00
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
for (j = 0; j < a->ob_size; j++) {
|
2004-03-09 09:05:22 -04:00
|
|
|
*p = items[j];
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_INCREF(*p);
|
1991-06-04 16:35:24 -03:00
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
1997-05-02 00:12:38 -03:00
|
|
|
return (PyObject *) np;
|
1991-06-04 16:35:24 -03:00
|
|
|
}
|
|
|
|
|
2000-06-23 11:18:11 -03:00
|
|
|
static int
|
|
|
|
tupletraverse(PyTupleObject *o, visitproc visit, void *arg)
|
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
2006-04-21 07:40:58 -03:00
|
|
|
|
|
|
|
for (i = o->ob_size; --i >= 0; )
|
|
|
|
Py_VISIT(o->ob_item[i]);
|
2000-06-23 11:18:11 -03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-01-17 20:00:53 -04:00
|
|
|
static PyObject *
|
|
|
|
tuplerichcompare(PyObject *v, PyObject *w, int op)
|
|
|
|
{
|
|
|
|
PyTupleObject *vt, *wt;
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
|
|
|
Py_ssize_t vlen, wlen;
|
2001-01-17 20:00:53 -04:00
|
|
|
|
|
|
|
if (!PyTuple_Check(v) || !PyTuple_Check(w)) {
|
|
|
|
Py_INCREF(Py_NotImplemented);
|
|
|
|
return Py_NotImplemented;
|
|
|
|
}
|
|
|
|
|
|
|
|
vt = (PyTupleObject *)v;
|
|
|
|
wt = (PyTupleObject *)w;
|
|
|
|
|
2001-05-15 17:12:59 -03: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-17 20:00:53 -04: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 17:12:59 -03:00
|
|
|
if (i >= vlen || i >= wlen) {
|
2001-01-17 20:00:53 -04:00
|
|
|
/* No more items to compare -- compare sizes */
|
|
|
|
int cmp;
|
|
|
|
PyObject *res;
|
|
|
|
switch (op) {
|
2001-05-15 17:12:59 -03: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-17 20:00:53 -04: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 13:30:39 -03:00
|
|
|
static PyObject *
|
2001-08-30 00:11:59 -03:00
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
|
|
|
|
|
2001-08-02 01:15:00 -03:00
|
|
|
static PyObject *
|
|
|
|
tuple_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
|
|
|
PyObject *arg = NULL;
|
2006-02-27 12:46:16 -04:00
|
|
|
static char *kwlist[] = {"sequence", 0};
|
2001-08-02 01:15:00 -03:00
|
|
|
|
2001-08-30 00:11:59 -03:00
|
|
|
if (type != &PyTuple_Type)
|
|
|
|
return tuple_subtype_new(type, args, kwds);
|
2001-08-02 01:15:00 -03: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 00:11:59 -03:00
|
|
|
static PyObject *
|
|
|
|
tuple_subtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
|
|
{
|
2006-04-21 07:40:58 -03:00
|
|
|
PyObject *tmp, *newobj, *item;
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i, n;
|
2001-08-30 00:11:59 -03:00
|
|
|
|
|
|
|
assert(PyType_IsSubtype(type, &PyTuple_Type));
|
|
|
|
tmp = tuple_new(&PyTuple_Type, args, kwds);
|
|
|
|
if (tmp == NULL)
|
|
|
|
return NULL;
|
|
|
|
assert(PyTuple_Check(tmp));
|
2006-04-21 07:40:58 -03:00
|
|
|
newobj = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
|
|
|
|
if (newobj == NULL)
|
2001-08-30 00:11:59 -03:00
|
|
|
return NULL;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
item = PyTuple_GET_ITEM(tmp, i);
|
|
|
|
Py_INCREF(item);
|
2006-04-21 07:40:58 -03:00
|
|
|
PyTuple_SET_ITEM(newobj, i, item);
|
2001-08-30 00:11:59 -03:00
|
|
|
}
|
|
|
|
Py_DECREF(tmp);
|
2006-04-21 07:40:58 -03:00
|
|
|
return newobj;
|
2001-08-30 00:11:59 -03:00
|
|
|
}
|
|
|
|
|
2002-06-13 17:33:02 -03:00
|
|
|
PyDoc_STRVAR(tuple_doc,
|
2001-09-02 03:42:25 -03:00
|
|
|
"tuple() -> an empty tuple\n"
|
|
|
|
"tuple(sequence) -> tuple initialized from sequence's items\n"
|
|
|
|
"\n"
|
2002-06-13 17:33:02 -03:00
|
|
|
"If the argument is a tuple, the return value is the same object.");
|
2001-08-02 01:15:00 -03:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
static PySequenceMethods tuple_as_sequence = {
|
2006-02-15 13:27:45 -04:00
|
|
|
(lenfunc)tuplelength, /* sq_length */
|
2001-01-17 20:00:53 -04:00
|
|
|
(binaryfunc)tupleconcat, /* sq_concat */
|
2006-02-15 13:27:45 -04:00
|
|
|
(ssizeargfunc)tuplerepeat, /* sq_repeat */
|
|
|
|
(ssizeargfunc)tupleitem, /* sq_item */
|
|
|
|
(ssizessizeargfunc)tupleslice, /* sq_slice */
|
2001-01-17 20:00:53 -04:00
|
|
|
0, /* sq_ass_item */
|
|
|
|
0, /* sq_ass_slice */
|
|
|
|
(objobjproc)tuplecontains, /* sq_contains */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
|
|
|
|
2002-06-11 07:55:12 -03:00
|
|
|
static PyObject*
|
|
|
|
tuplesubscript(PyTupleObject* self, PyObject* item)
|
|
|
|
{
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
which unfortunately means the errors from the bytes type change somewhat:
bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a
TypeError (either that, or bytes(1.0) also raises a ValueError --
PyNumber_AsSsize_t() can only raise one type of exception.)
Merged revisions 51188-51433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines
Retrieval of previous shell command was not always preserving indentation
since 1.2a1) Patch 1528468 Tal Einat.
........
r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines
Chris McDonough's patch to defend against certain DoS attacks on FieldStorage.
SF bug #1112549.
........
r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines
News item for SF bug 1112549.
........
r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines
Fix title -- it's rc1, not beta3.
........
r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines
Update dangling references to the 3.2 database to
mention that this is UCD 4.1 now.
........
r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines
Followup to bug #1069160.
PyThreadState_SetAsyncExc(): internal correctness changes wrt
refcount safety and deadlock avoidance. Also added a basic test
case (relying on ctypes) and repaired the docs.
........
r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines
Whitespace normalization.
........
r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines
Whitespace normalization broke test_cgi, because a line
of quoted test data relied on preserving a single trailing
blank. Changed the string from raw to regular, and forced
in the trailing blank via an explicit \x20 escape.
........
r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines
test_PyThreadState_SetAsyncExc(): This is failing on some
64-bit boxes. I have no idea what the ctypes docs mean
by "integers", and blind-guessing here that it intended to
mean the signed C "int" type, in which case perhaps I can
repair this by feeding the thread id argument to type
ctypes.c_long().
Also made the worker thread daemonic, so it doesn't hang
Python shutdown if the test continues to fail.
........
r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines
force_test_exit(): This has been completely ineffective
at stopping test_signal from hanging forever on the Tru64
buildbot. That could be because there's no such thing as
signal.SIGALARM. Changed to the idiotic (but standard)
signal.SIGALRM instead, and added some more debug output.
........
r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines
Fix the failures on cygwin (2006-08-10 fixed the actual locking issue).
The first hunk changes the colon to an ! like other Windows variants.
We need to always wait on the child so the lock gets released and
no other tests fail. This is the try/finally in the second hunk.
........
r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines
Add Chris McDonough (latest cgi.py patch)
........
r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines
logging's atexit hook now runs even if the rest of the module has
already been cleaned up.
........
r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines
Add ignore of *.pyc and *.pyo to Lib/xml/etree/.
........
r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines
When a ctypes C callback function is called, zero out the result
storage before converting the result to C data. See the comment in
the code for details.
Provide a better context for errors when the conversion of a callback
function's result cannot be converted.
........
r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines
Klocwork made another run and found a bunch more problems.
This is the first batch of fixes that should be easy to verify based on context.
This fixes problem numbers: 220 (ast), 323-324 (symtable),
321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree).
........
r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines
Even though _Py_Mangle() isn't truly public anyone can call it and
there was no verification that privateobj was a PyString. If it wasn't
a string, this could have allowed a NULL pointer to creep in below and crash.
I wonder if this should be PyString_CheckExact? Must identifiers be strings
or can they be subclasses?
Klocwork #275
........
r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines
It's highly unlikely, though possible for PyEval_Get*() to return NULLs.
So be safe and do an XINCREF.
Klocwork # 221-222.
........
r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines
This code is actually not used unless WITHOUT_COMPLEX is defined.
However, there was no error checking that PyFloat_FromDouble returned
a valid pointer. I believe this change is correct as it seemed
to follow other code in the area.
Klocwork # 292.
........
r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines
Handle NULL nodes while parsing. I'm not entirely sure this is correct.
There might be something else that needs to be done to setup the error.
Klocwork #295.
........
r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines
If _stat_float_times is false, we will try to INCREF ival which could be NULL.
Return early in that case. The caller checks for PyErr_Occurred so this
should be ok.
Klocwork #297
........
r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines
Move the assert which checks for a NULL pointer first.
Klocwork #274.
........
r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines
Try to handle a malloc failure. I'm not entirely sure this is correct.
There might be something else we need to do to handle the exception.
Klocwork # 212-213
........
r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines
I'm not sure why this code allocates this string for the error message.
I think it would be better to always use snprintf and have the format
limit the size of the name appropriately (like %.200s).
Klocwork #340
........
r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines
Check returned pointer is valid.
Klocwork #233
........
r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line
Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed
........
r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines
Don't deref v if it's NULL.
Klocwork #214
........
r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines
Check return of PyMem_MALLOC (garbage) is non-NULL.
Check seq in both portions of if/else.
Klocwork #289-290.
........
r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines
PyModule_GetDict() can fail, produce fatal errors if this happens on startup.
Klocwork #298-299.
........
r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines
Verify verdat which is returned from malloc is not NULL.
Ensure we don't pass NULL to free.
Klocwork #306 (at least the first part, checking malloc)
........
r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines
test_signal: Signal handling on the Tru64 buildbot
appears to be utterly insane. Plug some theoretical
insecurities in the test script:
- Verify that the SIGALRM handler was actually installed.
- Don't call alarm() before the handler is installed.
- Move everything that can fail inside the try/finally,
so the test cleans up after itself more often.
- Try sending all the expected signals in
force_test_exit(), not just SIGALRM. Since that was
fixed to actually send SIGALRM (instead of invisibly
dying with an AttributeError), we've seen that sending
SIGALRM alone does not stop this from hanging.
- Move the "kill the child" business into the finally
clause, so the child doesn't survive test failure
to send SIGALRM to other tests later (there are also
baffling SIGALRM-related failures in test_socket).
- Cancel the alarm in the finally clause -- if the
test dies early, we again don't want SIGALRM showing
up to confuse a later test.
Alas, this still relies on timing luck wrt the spawned
script that sends the test signals, but it's hard to see
how waiting for seconds can so often be so unlucky.
test_threadedsignals: curiously, this test never fails
on Tru64, but doesn't normally signal SIGALRM. Anyway,
fixed an obvious (but probably inconsequential) logic
error.
........
r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines
Ah, fudge. One of the prints here actually "shouldn't be"
protected by "if verbose:", which caused the test to fail on
all non-Windows boxes.
Note that I deliberately didn't convert this to unittest yet,
because I expect it would be even harder to debug this on Tru64
after conversion.
........
r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines
Repair logging test spew caused by rev. 51206.
........
r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines
Patch #1538606, Patch to fix __index__() clipping.
I modified this patch some by fixing style, some error checking, and adding
XXX comments. This patch requires review and some changes are to be expected.
I'm checking in now to get the greatest possible review and establish a
baseline for moving forward. I don't want this to hold up release if possible.
........
r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines
Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots
were failing due to inappropriate clipping of numbers larger than 2**31
with new-style classes. (typeobject.c) In reviewing the code for classic
classes, there were 2 problems. Any negative value return could be returned.
Always return -1 if there was an error. Also make the checks similar
with the new-style classes. I believe this is correct for 32 and 64 bit
boxes, including Windows64.
Add a test of classic classes too.
........
r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line
SF bug #1539336, distutils example code missing
........
r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines
Move/copy assert for tstate != NULL before first use.
Verify that PyEval_Get{Globals,Locals} returned valid pointers.
Klocwork 231-232
........
r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle a whole lot of failures from PyString_FromInternedString().
Should fix most of Klocwork 234-272.
........
r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines
cpathname could be NULL if it was longer than MAXPATHLEN. Don't try
to write the .pyc to NULL.
Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.
Klocwork 282, 283, 285
........
r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines
Fix segfault when doing string formatting on subclasses of long if
__oct__, __hex__ don't return a string.
Klocwork 308
........
r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines
Check return result of PyModule_GetDict().
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle malloc and fopen failures more gracefully.
Klocwork 180-181
........
r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines
It's very unlikely, though possible that source is not a string. Verify
that PyString_AsString() returns a valid pointer. (The problem can
arise when zlib.decompress doesn't return a string.)
Klocwork 346
........
r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle failures from lookup.
Klocwork 341-342
........
r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines
Handle failure from PyModule_GetDict() (Klocwork 208).
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines
Really address the issue of where to place the assert for leftblock.
(Followup of Klocwork 274)
........
r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle malloc failure.
Klocwork 281
........
r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle alloca failures.
Klocwork 225-228
........
r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line
Get rid of compiler warning
........
r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line
Ignore pgen.exe and kill_python.exe for cygwin
........
r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines
Can't return NULL from a void function. If there is a memory error,
about the best we can do is call PyErr_WriteUnraisable and go on.
We won't be able to do the call below either, so verify delstr is valid.
........
r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line
Update purify doc some.
........
r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines
Remove unused, buggy test function.
Fixes klockwork issue #207.
........
r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value from new_CArgObject().
Fixes klockwork issues #183, #184, #185.
........
r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value of GenericCData_new().
Fixes klockwork issues #188, #189.
........
r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines
Revert the change that tries to zero out a closure's result storage
area because the size if unknown in source/callproc.c.
........
r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines
Slightly revised version of patch #1538956:
Replace UnicodeDecodeErrors raised during == and !=
compares of Unicode and other objects with a new
UnicodeWarning.
All other comparisons continue to raise exceptions.
Exceptions other than UnicodeDecodeErrors are also left
untouched.
........
r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines
Apply the patch #1532975 plus ideas from the patch #1533481.
ctypes instances no longer have the internal and undocumented
'_as_parameter_' attribute which was used to adapt them to foreign
function calls; this mechanism is replaced by a function pointer in
the type's stgdict.
In the 'from_param' class methods, try the _as_parameter_ attribute if
other conversions are not possible.
This makes the documented _as_parameter_ mechanism work as intended.
Change the ctypes version number to 1.0.1.
........
r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines
Readd NEWS items that were accidentally removed by r51276.
........
r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines
Improve markup in PyUnicode_RichCompare.
........
r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines
Correct an accidentally removed previous patch.
........
r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536908: Add support for AMD64 / OpenBSD.
Remove the -no-stack-protector compiler flag for OpenBSD
as it has been reported to be unneeded.
........
r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line
News item for rev 51281.
........
r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines
Fix refleak introduced in rev. 51248.
........
r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines
Make tabnanny recognize IndentationErrors raised by tokenize.
Add a test to test_inspect to make sure indented source
is recognized correctly. (fixes #1224621)
........
r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1535500: fix segfault in BZ2File.writelines and make sure it
raises the correct exceptions.
........
r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines
Add an additional test: BZ2File write methods should raise IOError
when file is read-only.
........
r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536071: trace.py should now find the full module name of a
file correctly even on Windows.
........
r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Cookie.py shouldn't "bogusly" use string._idmap.
........
r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Patch #1511317: don't crash on invalid hostname info
........
r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines
Whitespace normalization.
........
r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines
Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.
Now we're even. :-)
........
r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines
Fix the test for SocketServer so it should pass on cygwin and not fail
sporadically on other platforms. This is really a band-aid that doesn't
fix the underlying issue in SocketServer. It's not clear if it's worth
it to fix SocketServer, however, I opened a bug to track it:
http://python.org/sf/1540386
........
r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines
Update the docstring to use a version a little newer than 1999. This was
taken from a Debian patch. Should we update the version for each release?
........
r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines
Subclasses of int/long are allowed to define an __index__.
........
r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line
Check for NULL return value from new_CArgObject calls.
........
r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines
The 'with' statement is now a Code Context block opener
........
r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1
........
r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1 - no, really this time
........
r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines
Patch #1540892: site.py Quitter() class attempts to close sys.stdin
before raising SystemExit, allowing IDLE to honor quit() and exit().
M Lib/site.py
M Lib/idlelib/PyShell.py
M Lib/idlelib/CREDITS.txt
M Lib/idlelib/NEWS.txt
M Misc/NEWS
........
r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines
Update code and tests to support the 'bytes_le' attribute (for
little-endian byte order on Windows), and to work around clocks
with low resolution yielding duplicate UUIDs.
Anthony Baxter has approved this change.
........
r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines
Get quit() and exit() to work cleanly when not using subprocess.
........
r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines
Revert to having static version numbers again.
........
r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines
Build _hashlib on Windows. Build OpenSSL with masm assembler code.
Fixes #1535502.
........
r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines
Add commented assert statements to check that the result of
PyObject_stgdict() and PyType_stgdict() calls are non-NULL before
dereferencing the result. Hopefully this fixes what klocwork is
complaining about.
Fix a few other nits as well.
........
r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line
news entry for 51307
........
r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line
Add UnicodeWarning
........
r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line
Bump document version to 1.0; remove pystone paragraph
........
r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line
Link to docs; remove an XXX comment
........
r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line
Make cl build step compile-only (/c). Remove libs from source list.
........
r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines
The __repr__ method of a NULL py_object does no longer raise an
exception. Remove a stray '?' character from the exception text
when the value is retrieved of such an object.
Includes tests.
........
r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line
Update bug/patch counts
........
r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line
Wording/typo fixes
........
r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines
Remove the special casing of Py_None when converting the return value
of the Python part of a callback function to C. If it cannot be
converted, call PyErr_WriteUnraisable with the exception we got.
Before, arbitrary data has been passed to the calling C code in this
case.
(I'm not really sure the NEWS entry is understandable, but I cannot
find better words)
........
r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines
Add NEWS item mentioning the reverted distutils version number patch.
........
r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines
SF#1534630
ignore data that arrives before the opening start tag
........
r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line
Grammar fix
........
r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines
Tutorial:
Clarify somewhat how parameters are passed to functions
(especially explain what integer means).
Correct the table - Python integers and longs can both be used.
Further clarification to the table comparing ctypes types, Python
types, and C types.
Reference:
Replace integer by C ``int`` where it makes sense.
........
r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines
File menu hotkeys: there were three 'p' assignments. Reassign the
'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the
Shell menu hotkey from 's' to 'l'.
M Bindings.py
M PyShell.py
M NEWS.txt
........
r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines
Fix a bug in the ``compiler`` package that caused invalid code to be
generated for generator expressions.
........
r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines
Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
........
r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines
Bug #1541863: uuid.uuid1 failed to generate unique identifiers
on systems with low clock resolution.
........
r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line
Add template for 2.6 on HEAD
........
r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line
More post-release wibble
........
r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again
........
r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again. Take 2
........
r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Unix bots install working again.
........
r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line
Set version to 2.6a0, seems more consistent.
........
r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line
More version wibble
........
r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines
Bug #1541682: Fix example in the "Refcount details" API docs.
Additionally, remove a faulty example showing PySequence_SetItem applied
to a newly created list object and add notes that this isn't a good idea.
........
r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines
Updating IDLE's version number to match Python's (as per python-dev
discussion).
........
r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line
RPM specfile updates
........
r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines
Typo in tp_clear docs.
........
r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line
Minor edits
........
r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines
Add asserts to check for 'impossible' NULL values, with comments.
In one place where I'n not 1000% sure about the non-NULL, raise
a RuntimeError for safety.
This should fix the klocwork issues that Neal sent me. If so,
it should be applied to the release25-maint branch also.
........
r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines
Move initialization of interned strings to before allocating the
object so we don't leak op. (Fixes an earlier patch to this code)
Klockwork #350
........
r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines
Move assert to after NULL check, otherwise we deref NULL in the assert.
Klocwork #307
........
r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines
SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
........
r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines
Move initialization to after the asserts for non-NULL values.
Klocwork 286-287.
(I'm not backporting this, but if someone wants to, feel free.)
........
r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines
Handle PyString_FromInternedString() failing (unlikely, but possible).
Klocwork #325
(I'm not backporting this, but if someone wants to, feel free.)
........
r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines
Patch #1542948: fix urllib2 header casing issue. With new test.
........
r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines
Move peephole optimizer to separate file.
........
r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines
Move peephole optimizer to separate file. (Forgot .h in previous checkin.)
........
r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines
Fix bug #1543303, tarfile adds padding that breaks gunzip.
Patch # 1543897.
Will backport to 2.5
........
r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines
Add assert to make Klocwork happy (#276)
........
2006-08-21 16:07:27 -03:00
|
|
|
if (PyIndex_Check(item)) {
|
|
|
|
Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
|
2002-06-11 07:55:12 -03:00
|
|
|
if (i == -1 && PyErr_Occurred())
|
|
|
|
return NULL;
|
|
|
|
if (i < 0)
|
|
|
|
i += PyTuple_GET_SIZE(self);
|
|
|
|
return tupleitem(self, i);
|
|
|
|
}
|
|
|
|
else if (PySlice_Check(item)) {
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t start, stop, step, slicelength, cur, i;
|
2002-06-11 07:55:12 -03:00
|
|
|
PyObject* result;
|
|
|
|
PyObject* it;
|
2004-03-09 09:05:22 -04:00
|
|
|
PyObject **src, **dest;
|
2002-06-11 07:55:12 -03:00
|
|
|
|
|
|
|
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);
|
2006-04-21 07:40:58 -03:00
|
|
|
if (!result) return NULL;
|
2002-06-11 07:55:12 -03:00
|
|
|
|
2004-03-09 09:05:22 -04:00
|
|
|
src = self->ob_item;
|
|
|
|
dest = ((PyTupleObject *)result)->ob_item;
|
2002-06-11 07:55:12 -03:00
|
|
|
for (cur = start, i = 0; i < slicelength;
|
|
|
|
cur += step, i++) {
|
2004-03-09 09:05:22 -04:00
|
|
|
it = src[cur];
|
2002-06-11 07:55:12 -03:00
|
|
|
Py_INCREF(it);
|
2004-03-09 09:05:22 -04:00
|
|
|
dest[i] = it;
|
2002-06-11 07:55:12 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
PyErr_SetString(PyExc_TypeError,
|
|
|
|
"tuple indices must be integers");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-01-29 13:58:45 -04:00
|
|
|
static PyObject *
|
|
|
|
tuple_getnewargs(PyTupleObject *v)
|
|
|
|
{
|
|
|
|
return Py_BuildValue("(N)", tupleslice(v, 0, v->ob_size));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static PyMethodDef tuple_methods[] = {
|
|
|
|
{"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS},
|
|
|
|
{NULL, NULL} /* sentinel */
|
|
|
|
};
|
|
|
|
|
2002-06-11 07:55:12 -03:00
|
|
|
static PyMappingMethods tuple_as_mapping = {
|
2006-02-15 13:27:45 -04:00
|
|
|
(lenfunc)tuplelength,
|
2002-06-11 07:55:12 -03:00
|
|
|
(binaryfunc)tuplesubscript,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
2002-08-08 22:30:17 -03:00
|
|
|
static PyObject *tuple_iter(PyObject *seq);
|
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
PyTypeObject PyTuple_Type = {
|
|
|
|
PyObject_HEAD_INIT(&PyType_Type)
|
1990-10-14 09:07:46 -03:00
|
|
|
0,
|
|
|
|
"tuple",
|
2001-08-29 20:54:21 -03:00
|
|
|
sizeof(PyTupleObject) - sizeof(PyObject *),
|
1997-05-02 00:12:38 -03:00
|
|
|
sizeof(PyObject *),
|
2001-01-17 20:00:53 -04: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 07:55:12 -03:00
|
|
|
&tuple_as_mapping, /* tp_as_mapping */
|
2001-01-17 20:00:53 -04:00
|
|
|
(hashfunc)tuplehash, /* tp_hash */
|
|
|
|
0, /* tp_call */
|
|
|
|
0, /* tp_str */
|
2001-08-02 01:15:00 -03:00
|
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
2001-01-17 20:00:53 -04:00
|
|
|
0, /* tp_setattro */
|
|
|
|
0, /* tp_as_buffer */
|
2001-08-30 00:11:59 -03:00
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |
|
|
|
|
Py_TPFLAGS_BASETYPE, /* tp_flags */
|
2001-08-02 01:15:00 -03:00
|
|
|
tuple_doc, /* tp_doc */
|
2001-01-17 20:00:53 -04:00
|
|
|
(traverseproc)tupletraverse, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
tuplerichcompare, /* tp_richcompare */
|
2001-08-02 01:15:00 -03:00
|
|
|
0, /* tp_weaklistoffset */
|
2002-08-08 22:30:17 -03:00
|
|
|
tuple_iter, /* tp_iter */
|
2001-08-02 01:15:00 -03:00
|
|
|
0, /* tp_iternext */
|
2003-01-29 13:58:45 -04:00
|
|
|
tuple_methods, /* tp_methods */
|
2001-08-02 01:15:00 -03:00
|
|
|
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 00:05:52 -03:00
|
|
|
PyObject_GC_Del, /* tp_free */
|
1990-10-14 09:07:46 -03:00
|
|
|
};
|
1993-10-26 14:58:25 -03: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 16:36:49 -03: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 19:30:08 -03:00
|
|
|
known to some other part of the code. */
|
1993-10-26 14:58:25 -03:00
|
|
|
|
|
|
|
int
|
2006-02-15 13:27:45 -04:00
|
|
|
_PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
|
1993-10-26 14:58:25 -03:00
|
|
|
{
|
1997-05-02 00:12:38 -03:00
|
|
|
register PyTupleObject *v;
|
|
|
|
register PyTupleObject *sv;
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
|
|
|
Py_ssize_t oldsize;
|
1993-11-01 09:46:50 -04:00
|
|
|
|
1997-05-02 00:12:38 -03:00
|
|
|
v = (PyTupleObject *) *pv;
|
2001-08-30 15:31:30 -03:00
|
|
|
if (v == NULL || v->ob_type != &PyTuple_Type ||
|
2001-05-28 10:11:02 -03:00
|
|
|
(v->ob_size != 0 && v->ob_refcnt != 1)) {
|
1993-10-26 14:58:25 -03:00
|
|
|
*pv = 0;
|
2000-10-05 16:36:49 -03:00
|
|
|
Py_XDECREF(v);
|
1997-05-02 00:12:38 -03:00
|
|
|
PyErr_BadInternalCall();
|
1993-10-26 14:58:25 -03:00
|
|
|
return -1;
|
|
|
|
}
|
2001-12-07 16:00:04 -04:00
|
|
|
oldsize = v->ob_size;
|
|
|
|
if (oldsize == newsize)
|
1993-11-01 09:46:50 -04:00
|
|
|
return 0;
|
2000-10-05 16:36:49 -03:00
|
|
|
|
2001-12-07 16:00:04 -04:00
|
|
|
if (oldsize == 0) {
|
2001-05-28 10:11:02 -03: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 04:58:45 -03:00
|
|
|
return *pv == NULL ? -1 : 0;
|
2001-05-28 10:11:02 -03:00
|
|
|
}
|
|
|
|
|
1993-10-26 14:58:25 -03: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 03:23:50 -03:00
|
|
|
_Py_DEC_REFTOTAL;
|
2001-08-29 20:54:21 -03:00
|
|
|
_PyObject_GC_UNTRACK(v);
|
2000-10-05 16:36:49 -03:00
|
|
|
_Py_ForgetReference((PyObject *) v);
|
2001-12-07 16:00:04 -04:00
|
|
|
/* DECREF items deleted by shrinkage */
|
|
|
|
for (i = newsize; i < oldsize; i++) {
|
1997-05-02 00:12:38 -03:00
|
|
|
Py_XDECREF(v->ob_item[i]);
|
1993-11-01 09:46:50 -04:00
|
|
|
v->ob_item[i] = NULL;
|
|
|
|
}
|
2001-08-29 20:54:21 -03:00
|
|
|
sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
|
2000-10-05 16:36:49 -03:00
|
|
|
if (sv == NULL) {
|
|
|
|
*pv = NULL;
|
2001-08-29 20:54:21 -03:00
|
|
|
PyObject_GC_Del(v);
|
2000-10-05 16:36:49 -03:00
|
|
|
return -1;
|
1993-10-26 14:58:25 -03:00
|
|
|
}
|
2000-10-05 16:36:49 -03:00
|
|
|
_Py_NewReference((PyObject *) sv);
|
2001-12-07 16:00:04 -04:00
|
|
|
/* Zero out items added by growing */
|
2002-06-13 18:11:11 -03:00
|
|
|
if (newsize > oldsize)
|
2002-06-20 20:13:17 -03:00
|
|
|
memset(&sv->ob_item[oldsize], 0,
|
|
|
|
sizeof(*sv->ob_item) * (newsize - oldsize));
|
2000-10-05 16:36:49 -03:00
|
|
|
*pv = (PyObject *) sv;
|
2001-08-29 20:54:21 -03:00
|
|
|
_PyObject_GC_TRACK(sv);
|
1993-10-26 14:58:25 -03:00
|
|
|
return 0;
|
|
|
|
}
|
1997-08-04 23:16:08 -03:00
|
|
|
|
|
|
|
void
|
2000-07-09 04:04:36 -03:00
|
|
|
PyTuple_Fini(void)
|
1997-08-04 23:16:08 -03: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 20:54:21 -03:00
|
|
|
PyObject_GC_Del(q);
|
1997-08-04 23:16:08 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2002-08-08 22:30:17 -03:00
|
|
|
|
|
|
|
/*********************** Tuple Iterator **************************/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
long it_index;
|
|
|
|
PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
|
|
|
|
} tupleiterobject;
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
2006-04-21 07:40:58 -03:00
|
|
|
Py_VISIT(it->it_seq);
|
|
|
|
return 0;
|
2002-08-08 22:30:17 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2005-09-24 18:23:05 -03:00
|
|
|
static PyObject *
|
2004-03-18 18:43:10 -04:00
|
|
|
tupleiter_len(tupleiterobject *it)
|
|
|
|
{
|
2006-02-16 10:32:27 -04:00
|
|
|
Py_ssize_t len = 0;
|
2004-03-18 18:43:10 -04:00
|
|
|
if (it->it_seq)
|
2005-09-24 18:23:05 -03:00
|
|
|
len = PyTuple_GET_SIZE(it->it_seq) - it->it_index;
|
2006-02-16 10:32:27 -04:00
|
|
|
return PyInt_FromSsize_t(len);
|
2004-03-18 18:43:10 -04:00
|
|
|
}
|
|
|
|
|
2006-02-11 17:32:43 -04:00
|
|
|
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
|
2005-09-24 18:23:05 -03:00
|
|
|
|
|
|
|
static PyMethodDef tupleiter_methods[] = {
|
2006-02-11 17:32:43 -04:00
|
|
|
{"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
|
2005-09-24 18:23:05 -03:00
|
|
|
{NULL, NULL} /* sentinel */
|
2004-03-18 18:43:10 -04:00
|
|
|
};
|
|
|
|
|
2002-08-08 22:30:17 -03:00
|
|
|
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 */
|
2005-09-24 18:23:05 -03:00
|
|
|
0, /* tp_as_sequence */
|
2002-08-08 22:30:17 -03:00
|
|
|
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 */
|
2003-03-17 15:46:11 -04:00
|
|
|
PyObject_SelfIter, /* tp_iter */
|
2002-08-08 22:30:17 -03:00
|
|
|
(iternextfunc)tupleiter_next, /* tp_iternext */
|
2005-09-24 18:23:05 -03:00
|
|
|
tupleiter_methods, /* tp_methods */
|
|
|
|
0,
|
2002-08-08 22:30:17 -03:00
|
|
|
};
|
2006-04-21 07:40:58 -03:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|