[Python-checkins] python/dist/src/Objects abstract.c, 2.120, 2.121 listobject.c, 2.174, 2.175

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv32531

Modified Files:
	abstract.c listobject.c 
Log Message:
Apply tuple/list pre-sizing optimization to a broader class of objects.
Formerly, length data fetched from sequence objects.
Now, any object that reports its length can benefit from pre-sizing.

On one sample timing, it gave a threefold speedup for list(s) where s
was a set object.



Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.120
retrieving revision 2.121
diff -C2 -d -r2.120 -r2.121
*** abstract.c	27 Oct 2003 09:22:16 -0000	2.120
--- abstract.c	4 Jan 2004 06:08:16 -0000	2.121
***************
*** 1381,1385 ****
  
  	/* Guess result size and allocate space. */
! 	n = PySequence_Size(v);
  	if (n < 0) {
  		PyErr_Clear();
--- 1381,1385 ----
  
  	/* Guess result size and allocate space. */
! 	n = PyObject_Size(v);
  	if (n < 0) {
  		PyErr_Clear();

Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.174
retrieving revision 2.175
diff -C2 -d -r2.174 -r2.175
*** listobject.c	28 Dec 2003 07:42:31 -0000	2.174
--- listobject.c	4 Jan 2004 06:08:16 -0000	2.175
***************
*** 2267,2279 ****
  
  	/* Guess a result list size. */
! 	n = -1;	 /* unknown */
! 	if (PySequence_Check(v) &&
! 	    v->ob_type->tp_as_sequence->sq_length) {
! 		n = PySequence_Size(v);
! 		if (n < 0)
! 			PyErr_Clear();
! 	}
! 	if (n < 0)
  		n = 8;	/* arbitrary */
  	NRESIZE(result->ob_item, PyObject*, n);
  	if (result->ob_item == NULL) {
--- 2267,2275 ----
  
  	/* Guess a result list size. */
! 	n = PyObject_Size(v);
! 	if (n < 0) {
! 		PyErr_Clear();
  		n = 8;	/* arbitrary */
+ 	}
  	NRESIZE(result->ob_item, PyObject*, n);
  	if (result->ob_item == NULL) {