Mailman 3 May 2004 - Python-checkins

python/dist/src/Objects listobject.c,2.204,2.205
by rhettinger＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25429 Modified Files: listobject.c Log Message: Nits: - Neatened the braces in PyList_New(). - Made sure "indexerr" was initialized to NULL. - Factored if blocks in PyList_Append(). - Made sure "allocated" is initialized in list_init(). Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.204 retrieving revision 2.205 diff -C2 -d -r2.204 -r2.205 *** listobject.c 5 May 2004 05:37:53 -0000 2.204 --- listobject.c 5 May 2004 06:28:16 -0000 2.205 *************** *** 66,72 **** nbytes = size * sizeof(PyObject *); /* Check for overflow */ ! if (nbytes / sizeof(PyObject *) != (size_t)size) { return PyErr_NoMemory(); - } if (num_free_lists) { num_free_lists--; --- 66,71 ---- nbytes = size * sizeof(PyObject *); /* Check for overflow */ ! if (nbytes / sizeof(PyObject *) != (size_t)size) return PyErr_NoMemory(); if (num_free_lists) { num_free_lists--; *************** *** 78,89 **** return NULL; } ! if (size <= 0) { op->ob_item = NULL; - } else { op->ob_item = (PyObject **) PyMem_MALLOC(nbytes); ! if (op->ob_item == NULL) { return PyErr_NoMemory(); - } memset(op->ob_item, 0, sizeof(*op->ob_item) * size); } --- 77,86 ---- return NULL; } ! if (size <= 0) op->ob_item = NULL; else { op->ob_item = (PyObject **) PyMem_MALLOC(nbytes); ! if (op->ob_item == NULL) return PyErr_NoMemory(); memset(op->ob_item, 0, sizeof(*op->ob_item) * size); } *************** *** 105,109 **** } ! static PyObject *indexerr; PyObject * --- 102,106 ---- } ! static PyObject *indexerr = NULL; PyObject * *************** *** 214,226 **** PyList_Append(PyObject *op, PyObject *newitem) { ! if (!PyList_Check(op)) { ! PyErr_BadInternalCall(); ! return -1; ! } ! if (newitem == NULL) { ! PyErr_BadInternalCall(); ! return -1; ! } ! return app1((PyListObject *)op, newitem); } --- 211,218 ---- PyList_Append(PyObject *op, PyObject *newitem) { ! if (PyList_Check(op) && (newitem != NULL)) ! return app1((PyListObject *)op, newitem); ! PyErr_BadInternalCall(); ! return -1; } *************** *** 2315,2318 **** --- 2307,2311 ---- return -1; /* Empty previous contents */ + self->allocated = self->ob_size; if (self->ob_size != 0) { if (list_ass_slice(self, 0, self->ob_size, (PyObject *)NULL) != 0)

1 0

python/dist/src/Objects listobject.c,2.203,2.204
by rhettinger＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18589/Objects Modified Files: listobject.c Log Message: SF patch #947476: Apply freelist technique to lists Re-use list object bodies. Saves calls to malloc() and free() for faster list instantiation and deallocation. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.203 retrieving revision 2.204 diff -C2 -d -r2.203 -r2.204 *** listobject.c 12 Apr 2004 17:21:03 -0000 2.203 --- listobject.c 5 May 2004 05:37:53 -0000 2.204 *************** *** 50,53 **** --- 50,58 ---- } + /* Empty list reuse scheme to save calls to malloc and free */ + #define MAXFREELISTS 80 + static PyListObject *free_lists[MAXFREELISTS]; + static int num_free_lists = 0; + PyObject * PyList_New(int size) *************** *** 64,70 **** return PyErr_NoMemory(); } ! op = PyObject_GC_New(PyListObject, &PyList_Type); ! if (op == NULL) { ! return NULL; } if (size <= 0) { --- 69,80 ---- return PyErr_NoMemory(); } ! if (num_free_lists) { ! num_free_lists--; ! op = free_lists[num_free_lists]; ! _Py_NewReference((PyObject *)op); ! } else { ! op = PyObject_GC_New(PyListObject, &PyList_Type); ! if (op == NULL) ! return NULL; } if (size <= 0) { *************** *** 234,238 **** PyMem_FREE(op->ob_item); } ! op->ob_type->tp_free((PyObject *)op); Py_TRASHCAN_SAFE_END(op) } --- 244,251 ---- PyMem_FREE(op->ob_item); } ! if (num_free_lists < MAXFREELISTS && PyList_CheckExact(op)) ! free_lists[num_free_lists++] = op; ! else ! op->ob_type->tp_free((PyObject *)op); Py_TRASHCAN_SAFE_END(op) }

1 0

python/dist/src/Misc NEWS,1.969,1.970
by rhettinger＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18589/Misc Modified Files: NEWS Log Message: SF patch #947476: Apply freelist technique to lists Re-use list object bodies. Saves calls to malloc() and free() for faster list instantiation and deallocation. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.969 retrieving revision 1.970 diff -C2 -d -r1.969 -r1.970 *** NEWS 22 Apr 2004 17:28:25 -0000 1.969 --- NEWS 5 May 2004 05:37:36 -0000 1.970 *************** *** 55,58 **** --- 55,61 ---- utilization for applications that have large numbers of small lists. + - Most list bodies now get re-used rather than freed. Speeds up list + instantiation and deletion by saving calls to malloc() and free(). + - The dict.update() method now accepts all the same argument forms as the dict() constructor. This now includes item lists and/or

1 0

python/dist/src/Doc/lib libpickle.tex, 1.42.10.2, 1.42.10.3
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13203 Modified Files: Tag: release23-maint libpickle.tex Log Message: - note that __getinitargs__() is only for old-style classes - describe __getnewargs__() (with index entry) (closes SF bug #873246) Index: libpickle.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libpickle.tex,v retrieving revision 1.42.10.2 retrieving revision 1.42.10.3 diff -C2 -d -r1.42.10.2 -r1.42.10.3 *** libpickle.tex 10 Sep 2003 20:50:06 -0000 1.42.10.2 --- libpickle.tex 5 May 2004 04:57:01 -0000 1.42.10.3 *************** *** 449,454 **** When a pickled class instance is unpickled, its \method{__init__()} method is normally \emph{not} invoked. If it is desirable that the ! \method{__init__()} method be called on unpickling, a class can define ! a method \method{__getinitargs__()}, which should return a \emph{tuple} containing the arguments to be passed to the class constructor (i.e. \method{__init__()}). The --- 449,454 ---- When a pickled class instance is unpickled, its \method{__init__()} method is normally \emph{not} invoked. If it is desirable that the ! \method{__init__()} method be called on unpickling, an old-style class ! can define a method \method{__getinitargs__()}, which should return a \emph{tuple} containing the arguments to be passed to the class constructor (i.e. \method{__init__()}). The *************** *** 459,462 **** --- 459,479 ---- \withsubitem{(instance constructor)}{\ttindex{__init__()}} + \withsubitem{(copy protocol)}{\ttindex{__getnewargs__()}} + + New-style types can provide a \method{__getnewargs__()} method that is + used for protocol 2. Implementing this method is needed if the type + establishes some internal invariants when the instance is created, or + if the memory allocation is affected by the values passed to the + \method{__new__()} method for the type (as it is for tuples and + strings). Instances of a new-style type \class{C} are created using + + \begin{alltt} + obj = C.__new__(C, *\var{args}) + \end{alltt} + + where \var{args} is the result of calling \method{__getnewargs__()} on + the original object; if there is no \method{__getnewargs__()}, an + empty tuple is assumed. + \withsubitem{(copy protocol)}{ \ttindex{__getstate__()}\ttindex{__setstate__()}}

1 0

python/dist/src/Doc/lib libpickle.tex,1.48,1.49
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13077 Modified Files: libpickle.tex Log Message: add an index entry for __getnewargs__() Index: libpickle.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libpickle.tex,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** libpickle.tex 5 May 2004 04:54:37 -0000 1.48 --- libpickle.tex 5 May 2004 04:56:06 -0000 1.49 *************** *** 459,462 **** --- 459,464 ---- \withsubitem{(instance constructor)}{\ttindex{__init__()}} + \withsubitem{(copy protocol)}{\ttindex{__getnewargs__()}} + New-style types can provide a \method{__getnewargs__()} method that is used for protocol 2. Implementing this method is needed if the type

1 0

python/dist/src/Doc/lib libpickle.tex,1.47,1.48
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12835 Modified Files: libpickle.tex Log Message: - note that __getinitargs__() is only for old-style classes - describe __getnewargs__() (closes SF bug #873246) Index: libpickle.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libpickle.tex,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** libpickle.tex 8 Jan 2004 15:01:08 -0000 1.47 --- libpickle.tex 5 May 2004 04:54:37 -0000 1.48 *************** *** 449,454 **** When a pickled class instance is unpickled, its \method{__init__()} method is normally \emph{not} invoked. If it is desirable that the ! \method{__init__()} method be called on unpickling, a class can define ! a method \method{__getinitargs__()}, which should return a \emph{tuple} containing the arguments to be passed to the class constructor (i.e. \method{__init__()}). The --- 449,454 ---- When a pickled class instance is unpickled, its \method{__init__()} method is normally \emph{not} invoked. If it is desirable that the ! \method{__init__()} method be called on unpickling, an old-style class ! can define a method \method{__getinitargs__()}, which should return a \emph{tuple} containing the arguments to be passed to the class constructor (i.e. \method{__init__()}). The *************** *** 459,462 **** --- 459,477 ---- \withsubitem{(instance constructor)}{\ttindex{__init__()}} + New-style types can provide a \method{__getnewargs__()} method that is + used for protocol 2. Implementing this method is needed if the type + establishes some internal invariants when the instance is created, or + if the memory allocation is affected by the values passed to the + \method{__new__()} method for the type (as it is for tuples and + strings). Instances of a new-style type \class{C} are created using + + \begin{alltt} + obj = C.__new__(C, *\var{args}) + \end{alltt} + + where \var{args} is the result of calling \method{__getnewargs__()} on + the original object; if there is no \method{__getnewargs__()}, an + empty tuple is assumed. + \withsubitem{(copy protocol)}{ \ttindex{__getstate__()}\ttindex{__setstate__()}}

1 0

python/dist/src/Doc/lib libcopy.tex, 1.16, 1.16.42.1
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8988 Modified Files: Tag: release23-maint libcopy.tex Log Message: Remove list of pickle protocol names used by the copy module; there are enough subtleties to pickling that we don't want misunderstanding to spread because we don't provide all the information twice. The reference to the pickle module for information will have to suffice; at least only one portion of the docs will be out of date. ;-( Index: libcopy.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcopy.tex,v retrieving revision 1.16 retrieving revision 1.16.42.1 diff -C2 -d -r1.16 -r1.16.42.1 *** libcopy.tex 6 Oct 2000 20:16:50 -0000 1.16 --- libcopy.tex 5 May 2004 04:24:53 -0000 1.16.42.1 *************** *** 73,84 **** Classes can use the same interfaces to control copying that they use ! to control pickling: they can define methods called ! \method{__getinitargs__()}, \method{__getstate__()} and ! \method{__setstate__()}. See the description of module \refmodule{pickle}\refstmodindex{pickle} for information on these methods. The \module{copy} module does not use the \refmodule[copyreg]{copy_reg} registration module. - \withsubitem{(copy protocol)}{\ttindex{__getinitargs__()} - \ttindex{__getstate__()}\ttindex{__setstate__()}} In order for a class to define its own copy implementation, it can --- 73,80 ---- Classes can use the same interfaces to control copying that they use ! to control pickling. See the description of module \refmodule{pickle}\refstmodindex{pickle} for information on these methods. The \module{copy} module does not use the \refmodule[copyreg]{copy_reg} registration module. In order for a class to define its own copy implementation, it can

1 0

python/dist/src/Doc/lib libcopy.tex,1.16,1.17
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8943 Modified Files: libcopy.tex Log Message: Remove list of pickle protocol names used by the copy module; there are enough subtleties to pickling that we don't want misunderstanding to spread because we don't provide all the information twice. The reference to the pickle module for information will have to suffice; at least only one portion of the docs will be out of date. ;-( Index: libcopy.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcopy.tex,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libcopy.tex 6 Oct 2000 20:16:50 -0000 1.16 --- libcopy.tex 5 May 2004 04:24:30 -0000 1.17 *************** *** 73,84 **** Classes can use the same interfaces to control copying that they use ! to control pickling: they can define methods called ! \method{__getinitargs__()}, \method{__getstate__()} and ! \method{__setstate__()}. See the description of module \refmodule{pickle}\refstmodindex{pickle} for information on these methods. The \module{copy} module does not use the \refmodule[copyreg]{copy_reg} registration module. - \withsubitem{(copy protocol)}{\ttindex{__getinitargs__()} - \ttindex{__getstate__()}\ttindex{__setstate__()}} In order for a class to define its own copy implementation, it can --- 73,80 ---- Classes can use the same interfaces to control copying that they use ! to control pickling. See the description of module \refmodule{pickle}\refstmodindex{pickle} for information on these methods. The \module{copy} module does not use the \refmodule[copyreg]{copy_reg} registration module. In order for a class to define its own copy implementation, it can

1 0

python/dist/src/Doc/lib libsocket.tex,1.81,1.82
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7986 Modified Files: libsocket.tex Log Message: note that the error code for socket.gaierror will be one of the EAI_* constants (closes SF bug #837929) Index: libsocket.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsocket.tex,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** libsocket.tex 3 Apr 2004 18:02:37 -0000 1.81 --- libsocket.tex 5 May 2004 04:18:11 -0000 1.82 *************** *** 108,111 **** --- 108,113 ---- \var{string} represents the description of \var{error}, as returned by the \cfunction{gai_strerror()} C function. + The \var{error} value will match one of the \constant{EAI_*} constants + defined in this module. \end{excdesc}

1 0

python/dist/src/Doc/lib libsocket.tex, 1.76.6.1, 1.76.6.2
by fdrake＠users.sourceforge.net May 5, 2004

May 5, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7517 Modified Files: Tag: release23-maint libsocket.tex Log Message: note that the error code for socket.gaierror will be one of the EAI_* constants (closes SF bug #837929) Index: libsocket.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libsocket.tex,v retrieving revision 1.76.6.1 retrieving revision 1.76.6.2 diff -C2 -d -r1.76.6.1 -r1.76.6.2 *** libsocket.tex 3 Apr 2004 18:03:51 -0000 1.76.6.1 --- libsocket.tex 5 May 2004 04:15:30 -0000 1.76.6.2 *************** *** 108,111 **** --- 108,113 ---- \var{string} represents the description of \var{error}, as returned by the \cfunction{gai_strerror()} C function. + The \var{error} value will match one of the \constant{EAI_*} constants + defined in this module. \end{excdesc}

1 0