Changeset: fa6ef5ed1271 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa6ef5ed1271
Modified Files:
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/url.c
monetdb5/modules/mal/cbp.c
monetdb5/optimizer/opt_emptySet.c
monetdb5/optimizer/opt_inline.c
Branch: headless
Log Message:
Post-merge fixes to get the headless branch to compile again.
diffs (123 lines):
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -333,7 +333,7 @@
if (mb->vtop > stk->stksize)
showScriptException(mb, 0, MAL, "stack too small\n");
pci = pcicaller;
- @:initStack(env->stkbot)@
+ initStack(mb, stk, env->stkbot);
} else {
stk = prepareMALstack(mb, mb->vsize);
if (stk == 0)
@@ -350,13 +350,6 @@
/* we are running low on stack space */
throw(MAL, "mal.interpreter", MAL_STACK_FAIL);
}
-@-
-An optimization is to copy all constant variables used in functions immediately
-onto the value stack. Then we do not have to check for their location
-later on any more. At some point, the effect is optimal, if at least several
-constants are referenced in a function (a gain on tst400a of 20% has been
-observed due the small size of the function).
-@c
}
/*
* An optimization is to copy all constant variables used in functions
immediately
diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -54,10 +54,8 @@
#include "mal.h"
#include "mal_exception.h"
-#if 0
static void getword(char *word, char *line, char stop);
static void plustospace(char *str);
-#endif
static char x2c(char *what);
/* COMMAND "getAnchor": Extract an anchor (reference) from the URL
@@ -415,7 +413,6 @@
return MAL_SUCCEED;
}
-#if 0
/* COMMAND "getQueryArg": Extract the argument mappings from the URL query
* SIGNATURE: getQueryArg(str) : bat[str,str]; */
static str
@@ -462,7 +459,6 @@
*ret2= CBPkeepref(v);
return MAL_SUCCEED;
}
-#endif
/* COMMAND "getRobotURL": Extract the location of the robot control file
* SIGNATURE: getRobotURL(str) : str; */
@@ -705,7 +701,6 @@
#define LF 10
#define CR 13
-#if 0
static void
getword(char *word, char *line, char stop)
{
@@ -723,6 +718,7 @@
;
}
+#if 0
char *
makeword(char *line, char stop)
{
@@ -754,7 +750,6 @@
return (digit);
}
-#if 0
static void
plustospace(char *str)
{
@@ -764,7 +759,6 @@
if (str[x] == '+')
str[x] = ' ';
}
-#endif
int
URLfromString(str src, int *len, str *url)
diff --git a/monetdb5/modules/mal/cbp.c b/monetdb5/modules/mal/cbp.c
--- a/monetdb5/modules/mal/cbp.c
+++ b/monetdb5/modules/mal/cbp.c
@@ -215,6 +215,7 @@
return MAL_SUCCEED;
}
+#if 0
/*
* A column designated as garbage can be removed, provided we
* do not keep additional references in the stack frame
diff --git a/monetdb5/optimizer/opt_emptySet.c
b/monetdb5/optimizer/opt_emptySet.c
--- a/monetdb5/optimizer/opt_emptySet.c
+++ b/monetdb5/optimizer/opt_emptySet.c
@@ -283,7 +283,7 @@
* are not the target of an update.
*/
-static int
+int
OPTemptySetImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p)
{
char *empty;
diff --git a/monetdb5/optimizer/opt_inline.c b/monetdb5/optimizer/opt_inline.c
--- a/monetdb5/optimizer/opt_inline.c
+++ b/monetdb5/optimizer/opt_inline.c
@@ -50,7 +50,7 @@
}
-static int
+int
OPTinlineImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
int i,limit;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
