Changeset: a755aa657727 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a755aa657727
Modified Files:
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_session.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Removing unused argument.
runMAL has too many arguments and did not emit the bounding
events for the complete MAL function.
diffs (129 lines):
diff --git a/monetdb5/extras/jaql/jaql.c b/monetdb5/extras/jaql/jaql.c
--- a/monetdb5/extras/jaql/jaql.c
+++ b/monetdb5/extras/jaql/jaql.c
@@ -1933,7 +1933,7 @@ JAQLexecute(Client cntxt, MalBlkPtr mb,
printFunction(cntxt->fdout, prg->def, 0,
LIST_MAL_STMT | LIST_MAPI);
} else {
- err = (str)runMAL(cntxt, prg->def, 1, 0, 0, 0);
+ err = (str)runMAL(cntxt, prg->def, 0, 0, 0);
freeMalBlk(prg->def);
if (err != MAL_SUCCEED) {
snprintf(j->err, sizeof(j->err), "%s",
err);
diff --git a/monetdb5/extras/jaql/jaqlscenario.c
b/monetdb5/extras/jaql/jaqlscenario.c
--- a/monetdb5/extras/jaql/jaqlscenario.c
+++ b/monetdb5/extras/jaql/jaqlscenario.c
@@ -284,7 +284,7 @@ JAQLengine(Client c)
} else if (MALcommentsOnly(c->curprg->def)) {
msg = MAL_SUCCEED;
} else {
- msg = runMAL(c, c->curprg->def, 1, 0, 0, 0);
+ msg = runMAL(c, c->curprg->def, 0, 0, 0);
}
if (msg) {
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -1296,7 +1296,7 @@ str
runMALDebugger(Client cntxt, Symbol s)
{
cntxt->itrace = 'n';
- runMAL(cntxt, s->def, 1, 0, 0, 0);
+ runMAL(cntxt, s->def, 0, 0, 0);
return MAL_SUCCEED;
}
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -379,7 +379,7 @@ runFactory(Client cntxt, MalBlkPtr mb, M
}
}
pl->stk->stkbot= mb->vtop; /* stack already initialized */
- msg = runMAL(cntxt, mb, 1, 0, pl->stk, 0);
+ msg = runMAL(cntxt, mb, 0, pl->stk, 0);
} else {
if( cmd && cntxt->timer == 0)
mdbStep(cntxt,mb,pl->stk,pl->pc);
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
@@ -356,7 +356,7 @@ prepareMALstack(MalBlkPtr mb, int size)
return stk;
}
-str runMAL(Client cntxt, MalBlkPtr mb, int startpc, MalBlkPtr mbcaller,
+str runMAL(Client cntxt, MalBlkPtr mb, MalBlkPtr mbcaller,
MalStkPtr env, InstrPtr pcicaller)
{
MalStkPtr stk = NULL;
@@ -451,7 +451,10 @@ str runMAL(Client cntxt, MalBlkPtr mb, i
if (stk->cmd && env && stk->cmd != 'f')
stk->cmd = env->cmd;
- ret = runMALsequence(cntxt, mb, startpc, 0, stk, env, pcicaller);
+ runtimeProfileBegin(cntxt, mb, stk, 0, &runtimeProfile, 1);
+ ret = runMALsequence(cntxt, mb, 1, 0, stk, env, pcicaller);
+ runtimeProfile.ppc = 0; /* also finalize function call event */
+ runtimeProfileExit(cntxt, mb, stk, &runtimeProfile);
/* pass the new debug mode to the caller */
if (stk->cmd && env && stk->cmd != 'f')
diff --git a/monetdb5/mal/mal_interpreter.h b/monetdb5/mal/mal_interpreter.h
--- a/monetdb5/mal/mal_interpreter.h
+++ b/monetdb5/mal/mal_interpreter.h
@@ -38,7 +38,7 @@
mal_export void showErrors(Client cntxt);
mal_export MalStkPtr prepareMALstack(MalBlkPtr mb, int size);
-mal_export str runMAL(Client c, MalBlkPtr mb, int startpc, MalBlkPtr mbcaller,
MalStkPtr env, InstrPtr pcicaller);
+mal_export str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr
env, InstrPtr pcicaller);
mal_export str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int
stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
mal_export str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc,
MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
mal_export str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr
argv[], char debug);
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -616,7 +616,7 @@ MALengine(Client c)
c->glb->keepAlive = TRUE; /* no garbage collection */
}
if (prg->def->errors == 0)
- msg = (str) runMAL(c, prg->def, 1, 0, c->glb, 0);
+ msg = (str) runMAL(c, prg->def, 0, c->glb, 0);
if (msg) {
/* ignore "internal" exceptions */
str fcn = getExceptionPlace(msg); /* retrieves from "first"
exception */
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -7317,7 +7317,7 @@ RAstatement(Client cntxt, MalBlkPtr mb,
backend_callinline(b, cntxt, s );
addQueryToCache(cntxt);
- msg = (str) runMAL(cntxt, cntxt->curprg->def, 1, 0, 0, 0);
+ msg = (str) runMAL(cntxt, cntxt->curprg->def, 0, 0, 0);
if (!msg) {
resetMalBlk(cntxt->curprg->def, oldstop);
freeVariables(cntxt,cntxt->curprg->def, cntxt->glb,
oldvtop);
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -881,7 +881,7 @@ SQLstatementIntern(Client c, str *expr,
if ( execute) {
if (!output)
sql->out = NULL; /* no output */
- msg = (str) runMAL(c, c->curprg->def, 1, 0, 0, 0);
+ msg = (str) runMAL(c, c->curprg->def, 0, 0, 0);
MSresetInstructions(c->curprg->def, oldstop);
freeVariables(c,c->curprg->def, c->glb, oldvtop);
}
@@ -1813,7 +1813,7 @@ SQLengineIntern(Client c, backend *be)
if (MALcommentsOnly(c->curprg->def)) {
msg = MAL_SUCCEED;
} else {
- msg = (str) runMAL(c, c->curprg->def, 1, 0, 0, 0);
+ msg = (str) runMAL(c, c->curprg->def, 0, 0, 0);
}
cleanup_engine:
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
