Changeset: 17ac2f27810c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17ac2f27810c
Modified Files:
        gdk/gdk_posix.h
        gdk/gdk_utils.mx
Branch: Apr2012
Log Message:

Enable GDKvmtrim thread if madvise is available and posix_madvise is not.


diffs (41 lines):

diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -126,6 +126,7 @@ gdk_export void MT_sleep_ms(unsigned int
 #ifndef HAVE_POSIX_MADVISE
 # ifdef HAVE_MADVISE
 #  define posix_madvise madvise
+#  define HAVE_POSIX_MADVISE 1
 #  ifndef MADV_RANDOM
 #   define MADV_RANDOM 0
 #  endif
diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx
--- a/gdk/gdk_utils.mx
+++ b/gdk/gdk_utils.mx
@@ -1533,7 +1533,7 @@ GDKprotect(void)
        }
 }
 
-#ifdef HAVE_POSIX_FADVISE
+#ifdef HAVE_POSIX_MADVISE
 static str highload_name[] = { "idle", "low", "medium", "high", "extreme" };
 
 static MT_Id GDKvmtrim_id;
@@ -1737,7 +1737,7 @@ GDKinit(opt *set, int setlen)
        /*    per op:  2 args + 1 res, each with head & tail  =>  (2+1)*2 = 6  
^ */
 #endif
 
-#ifdef HAVE_POSIX_FADVISE
+#ifdef HAVE_POSIX_MADVISE
        if (!GDKembedded && GDK_vm_trim)
                MT_create_thread(&GDKvmtrim_id, GDKvmtrim, &GDK_mem_maxsize, 
MT_THR_JOINABLE);
 #endif
@@ -1769,7 +1769,7 @@ GDKexit(int status)
        gdk_set_lock(GDKthreadLock, "GDKexit");
        if (GDKstopped == 0) {
                GDKstopped = 1; /* shouldn't there be a lock here? */
-#ifdef HAVE_POSIX_FADVISE
+#ifdef HAVE_POSIX_MADVISE
                if (!GDKembedded && GDK_vm_trim && GDKvmtrim_id)
                        MT_join_thread(GDKvmtrim_id);
 #endif
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to