Changeset: 88c13d5edcca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88c13d5edcca
Modified Files:
common/options/monet_options.c
gdk/gdk_utils.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (28 lines):
diff --git a/common/options/monet_options.c b/common/options/monet_options.c
--- a/common/options/monet_options.c
+++ b/common/options/monet_options.c
@@ -250,6 +250,10 @@ mo_builtin_settings(opt **Set)
i++;
set[i].kind = opt_builtin;
set[i].name = strdup("gdk_vmtrim");
+ /* default for gdk_vmtrim is
+ * "yes" on 32 bit architectures and
+ * "no" on 64 bit architectures;
+ * see also GDKinit() in gdk/gdk_utils.c */
#if SIZEOF_VOID_P == 4
/* 32 bit architecture */
set[i].value = strdup("yes");
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1107,7 +1107,9 @@ GDKinit(opt *set, int setlen)
/* only start vmtrim thread when explicitly asked to do so or
* when on a 32 bit architecture and not told to not start
- * it */
+ * it;
+ * see also mo_builtin_settings() in common/options/monet_options.c
+ */
p = mo_find_option(set, setlen, "gdk_vmtrim");
if (
#if SIZEOF_VOID_P == 4
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
