MonetDB: Apr2011 - Partially undo changeset 5a12847e523d.

[Sjoerd Mullender]

Changeset: 985fa3015ff7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=985fa3015ff7
Modified Files:
        gdk/gdk_heap.mx
Branch: Apr2011
Log Message:

Partially undo changeset 5a12847e523d.
Once again switch over to explicit MMAP when heaps get large.


diffs (16 lines):

diff --git a/gdk/gdk_heap.mx b/gdk/gdk_heap.mx
--- a/gdk/gdk_heap.mx
+++ b/gdk/gdk_heap.mx
@@ -352,9 +352,9 @@
                int exceeds_swap = size > (tot + tot - MIN(tot + tot, cur));
                int can_mmap = h->filename && (size >= GDK_mem_bigsize || 
h->newstorage != STORE_MEM);
                int small_cpy = (h->size * 4 < size) && (size >= 
GDK_mmap_minsize);
-               /* the commented condition is to use explicit MMAP
-                  instead of anonymous MMAP in GDKmalloc */
-               int must_mmap = can_mmap && (small_cpy || exceeds_swap || 
h->newstorage != STORE_MEM /* || size >= GDK_mem_bigsize */ );
+               /* the last condition is to use explicit MMAP instead
+                  of anonymous MMAP in GDKmalloc */
+               int must_mmap = can_mmap && (small_cpy || exceeds_swap || 
h->newstorage != STORE_MEM || size >= GDK_mem_bigsize);
 
                h->size = size;
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list