Changeset: 7496cba6f143 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7496cba6f143
Modified Files:
common/options/monet_options.c
monetdb5/optimizer/opt_groups.c
tools/mserver/mserver5.1
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (82 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
@@ -232,7 +232,7 @@ mo_builtin_settings(opt **Set)
if (Set == NULL)
return 0;
-#define N_OPTIONS 12 /*MUST MATCH # OPTIONS BELOW */
+#define N_OPTIONS 11 /*MUST MATCH # OPTIONS BELOW */
set = malloc(sizeof(opt) * N_OPTIONS);
if (set == NULL)
return 0;
@@ -252,10 +252,6 @@ mo_builtin_settings(opt **Set)
set[i].value = strdup("0");
i++;
set[i].kind = opt_builtin;
- set[i].name = strdup("gdk_alloc_map");
- set[i].value = strdup("no");
- i++;
- set[i].kind = opt_builtin;
set[i].name = strdup("gdk_vmtrim");
set[i].value = strdup("yes");
i++;
diff --git a/monetdb5/optimizer/opt_groups.c b/monetdb5/optimizer/opt_groups.c
--- a/monetdb5/optimizer/opt_groups.c
+++ b/monetdb5/optimizer/opt_groups.c
@@ -28,22 +28,16 @@ OPTgroupsImplementation(Client cntxt, Ma
InstrPtr q;
InstrPtr *old;
int limit,slimit;
- Lifespan span;
(void) cntxt;
(void) stk;
- span= setLifespan(mb);
- if( span == NULL)
- return 0;
if (varGetProp(mb, getArg(mb->stmt[0], 0), inlineProp) != NULL) {
- GDKfree(span);
return 0;
}
/* beware, new variables and instructions are introduced */
pc= (int*) GDKzalloc(sizeof(int)* mb->vtop * 2); /* to find last
assignment */
if ( pc == NULL) {
- GDKfree(span);
return 0;
}
@@ -51,7 +45,6 @@ OPTgroupsImplementation(Client cntxt, Ma
limit= mb->stop;
slimit= mb->ssize;
if ( newMalBlkStmt(mb,mb->ssize) <0) {
- GDKfree(span);
GDKfree(pc);
return 0;
}
@@ -96,7 +89,6 @@ OPTgroupsImplementation(Client cntxt, Ma
freeInstruction(old[i]);
GDKfree(old);
GDKfree(pc);
- GDKfree(span);
DEBUGoptimizers
mnstr_printf(cntxt->fdout,"#opt_groups: %d statements
glued\n",actions);
return actions;
diff --git a/tools/mserver/mserver5.1 b/tools/mserver/mserver5.1
--- a/tools/mserver/mserver5.1
+++ b/tools/mserver/mserver5.1
@@ -78,13 +78,6 @@ anonymously. Default: 1<<20 == 1024576
.IP "gdk_vmtrim"
Enable or disable the vmtrim thread which tries to unload memory that is
not in use. Default: yes
-.IP "gdk_alloc_map"
-This parameter is mainly for debugging with valgrind.
-.\" For 32-bit systems, GDK tries claim 3G of (virtual) memory.
-.\" set the alloc map to "no" to run mserver with valgrind;
-Also, you need to tell valgrind to use 8-byte alignment, hence:
-\(dq\&valgrind --alignment=8 mserver5 --set gdk_alloc_map=no ...\(dq\&
-This feature should better be disabled for normal use. Default: no
.IP "gdk_debug"
You can enable debug output for specific kernel operations. By default
debug is switched off for obvious reasons. The value of gdk_debug is an
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
