On Mon, Feb 01, 2010 at 08:03:42AM +0000, Martin Kersten wrote:

Update of /cvsroot/monetdb/MonetDB/src/gdk In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3139

Modified Files: Tag: Feb2010 gdk_storage.mx Log Message: Difference between free and size often too high to justify pre-read.

;-)

Index: gdk_storage.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_storage.mx,v retrieving revision 1.149.2.6 retrieving revision 1.149.2.7 diff -u -d -r1.149.2.6 -r1.149.2.7 --- gdk_storage.mx 31 Jan 2010 16:43:27 -0000 1.149.2.6 +++ gdk_storage.mx 1 Feb 2010 08:02:57 -0000 1.149.2.7 @@ -709,25 +709,25 @@

if ( b->T->vheap && b->T->vheap->base && pages){ IODEBUG THRprintf(GDKout,"#BATpreloaded(%s): T->vheap\n", BATgetId(b)); - limit = (size_t *) (b->T->vheap->base + b->T->vheap->size); + limit = (size_t *) (b->T->vheap->base + b->T->vheap->free); for ( i = (size_t *) b->T->vheap->base; i < limit && pages > 0; i+= step, pages--) dummy += *i; } if ( b->T->heap.base && pages ){ IODEBUG THRprintf(GDKout,"#BATpreload(%s): T->heap\n", BATgetId(b)); - limit = (size_t *) (b->T->heap.base + b->T->heap.size); + limit = (size_t *) (b->T->heap.base + b->T->heap.free); for ( i = (size_t *) b->T->heap.base; i < limit && pages > 0; i+= step, pages--) dummy += *i; } if ( b->H->heap.base && pages ){ IODEBUG THRprintf(GDKout,"#BATpreload(%s): H->heap\n", BATgetId(b)); - limit = (size_t *) (b->H->heap.base + b->H->heap.size); + limit = (size_t *) (b->H->heap.base + b->H->heap.free); for ( i = (size_t *) b->H->heap.base; i < limit && pages > 0 ; i+= step, pages--) dummy += *i; } if ( b->H->vheap && b->H->vheap->base && pages ){ IODEBUG THRprintf(GDKout,"#BATpreload(%s): H->vheap\n", BATgetId(b)); - limit = (size_t *) (b->H->vheap->base + b->H->vheap->size); + limit = (size_t *) (b->H->vheap->base + b->H->vheap->free); for ( i = (size_t *) b->H->vheap->base; i < limit && pages > 0 ; i+= step, pages--) dummy += *i; }

------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4199 |