Changeset: 17be5b2a774f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/17be5b2a774f
Modified Files:
monetdb5/mal/mal_interpreter.c
Branch: Sep2022
Log Message:
Layout.
diffs (truncated from 541 to 300 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
@@ -45,34 +45,41 @@ malCommandCall(MalStkPtr stk, InstrPtr p
str ret= MAL_SUCCEED;
switch (pci->argc) {
- case 0: ret = (*pci->fcn)();
+ case 0:
+ ret = (*pci->fcn)();
break;
- case 1: ret = (*pci->fcn)(
+ case 1:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0));
break;
- case 2: ret = (*pci->fcn)(
+ case 2:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1));
break;
- case 3: ret = (*pci->fcn)(
+ case 3:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2));
break;
- case 4: ret = (*pci->fcn)(
+ case 4:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
getArgReference(stk, pci, 3));
break;
- case 5: ret = (*pci->fcn)(
+ case 5:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
getArgReference(stk, pci, 3),
getArgReference(stk, pci, 4));
break;
- case 6: ret = (*pci->fcn)(
+ case 6:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -80,7 +87,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 4),
getArgReference(stk, pci, 5));
break;
- case 7: ret = (*pci->fcn)(
+ case 7:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -89,7 +97,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 5),
getArgReference(stk, pci, 6));
break;
- case 8: ret = (*pci->fcn)(
+ case 8:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -99,7 +108,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 6),
getArgReference(stk, pci, 7));
break;
- case 9: ret = (*pci->fcn)(
+ case 9:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -110,7 +120,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 7),
getArgReference(stk, pci, 8));
break;
- case 10: ret = (*pci->fcn)(
+ case 10:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -122,7 +133,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 8),
getArgReference(stk, pci, 9));
break;
- case 11: ret = (*pci->fcn)(
+ case 11:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -135,7 +147,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 9),
getArgReference(stk, pci, 10));
break;
- case 12: ret = (*pci->fcn)(
+ case 12:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -149,7 +162,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 10),
getArgReference(stk, pci, 11));
break;
- case 13: ret = (*pci->fcn)(
+ case 13:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -164,7 +178,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 11),
getArgReference(stk, pci, 12));
break;
- case 14: ret = (*pci->fcn)(
+ case 14:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -180,7 +195,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 12),
getArgReference(stk, pci, 13));
break;
- case 15: ret = (*pci->fcn)(
+ case 15:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -197,7 +213,8 @@ malCommandCall(MalStkPtr stk, InstrPtr p
getArgReference(stk, pci, 13),
getArgReference(stk, pci, 14));
break;
- case 16: ret = (*pci->fcn)(
+ case 16:
+ ret = (*pci->fcn)(
getArgReference(stk, pci, 0),
getArgReference(stk, pci, 1),
getArgReference(stk, pci, 2),
@@ -226,21 +243,23 @@ malCommandCall(MalStkPtr stk, InstrPtr p
* Also we cannot overwrite values on the stack as this maybe part of a
* sequence of factory calls.
*/
-#define initStack(S, R)\
- for (i = S; i < mb->vtop; i++) {\
- lhs = &stk->stk[i];\
- if (isVarConstant(mb, i) > 0) {\
- if (!isVarDisabled(mb, i)) {\
- rhs = &getVarConstant(mb, i);\
- if(VALcopy(lhs, rhs) == NULL) \
- R = 0; \
- }\
- } else {\
- lhs->vtype = getVarGDKType(mb, i);\
- lhs->val.pval = 0;\
- lhs->len = 0;\
- }\
- }
+#define initStack(S, R)
\
+ do {
\
+ for (int i = (S); i < mb->vtop; i++) { \
+ lhs = &stk->stk[i];
\
+ if (isVarConstant(mb, i) > 0) { \
+ if (!isVarDisabled(mb, i)) { \
+ rhs = &getVarConstant(mb, i); \
+ if(VALcopy(lhs, rhs) == NULL) \
+ R = 0;
\
+ }
\
+ } else {
\
+ lhs->vtype = getVarGDKType(mb, i); \
+ lhs->val.pval = 0;
\
+ lhs->len = 0;
\
+ }
\
+ }
\
+ } while (0)
static inline bool
isNotUsedIn(InstrPtr p, int start, int a)
@@ -255,7 +274,7 @@ MalStkPtr
prepareMALstack(MalBlkPtr mb, int size)
{
MalStkPtr stk = NULL;
- int i, res = 1;
+ int res = 1;
ValPtr lhs, rhs;
stk = newGlobalStack(size);
@@ -277,7 +296,6 @@ str
runMAL(Client cntxt, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env)
{
MalStkPtr stk = NULL;
- int i;
ValPtr lhs, rhs;
str ret;
(void) mbcaller;
@@ -387,7 +405,6 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
{
MalStkPtr stk = NULL;
str ret = MAL_SUCCEED;
- int i;
ValPtr lhs;
InstrPtr pci = getInstrPtr(mb, 0);
@@ -417,7 +434,7 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
throw(MAL, "mal.interpreter", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
assert(stk);
- for (i = pci->retc; i < pci->argc; i++) {
+ for (int i = pci->retc; i < pci->argc; i++) {
lhs = &stk->stk[pci->argv[i]];
if (VALcopy(lhs, argv[i]) == NULL)
throw(MAL, "mal.interpreter", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -439,7 +456,7 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
}
if (stk)
garbageCollector(cntxt, mb, stk, TRUE);
- if ( ret == MAL_SUCCEED && cntxt->querytimeout && mb->starttime &&
GDKusec()- mb->starttime > cntxt->querytimeout)
+ if (ret == MAL_SUCCEED && cntxt->querytimeout && mb->starttime &&
GDKusec()- mb->starttime > cntxt->querytimeout)
throw(MAL, "mal.interpreter", SQLSTATE(HYT00)
RUNTIME_QRY_TIMEOUT);
return ret;
}
@@ -456,7 +473,6 @@ runMALsequence(Client cntxt, MalBlkPtr m
int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr
pcicaller)
{
ValPtr lhs, rhs, v;
- int i, k;
InstrPtr pci = 0;
int exceptionVar;
str ret = MAL_SUCCEED, localGDKerrbuf= GDKerrbuf;
@@ -489,7 +505,7 @@ runMALsequence(Client cntxt, MalBlkPtr m
garbage = garbages;
memset(garbages, 0, sizeof(garbages));
}
- } else if ( mb->maxarg > 16 ){
+ } else if (mb->maxarg > 16 ){
backup = GDKmalloc(mb->maxarg * sizeof(ValRecord));
garbage = (int*)GDKzalloc(mb->maxarg * sizeof(int));
if( backup == NULL || garbage == NULL) {
@@ -504,14 +520,16 @@ runMALsequence(Client cntxt, MalBlkPtr m
}
/* also produce event record for start of function */
- if ( startpc == 1 && startpc < mb->stop ){
+ if (startpc == 1 && startpc < mb->stop ){
startedProfileQueue = 1;
runtimeProfileInit(cntxt, mb, stk);
runtimeProfileBegin(cntxt, mb, stk, getInstrPtr(mb,0),
&runtimeProfileFunction);
if (cntxt->sessiontimeout && mb->starttime - cntxt->session >
cntxt->sessiontimeout) {
runtimeProfileFinish(cntxt, mb, stk);
- if ( backup != backups) GDKfree(backup);
- if ( garbage != garbages) GDKfree(garbage);
+ if (backup != backups)
+ GDKfree(backup);
+ if (garbage != garbages)
+ GDKfree(garbage);
throw(MAL, "mal.interpreter", SQLSTATE(HYT00)
RUNTIME_SESSION_TIMEOUT);
}
}
@@ -542,11 +560,11 @@ runMALsequence(Client cntxt, MalBlkPtr m
if (cntxt->itrace || stk->status) {
if (stk->status == 'p'){
// execution is paused
- while ( stk->status == 'p')
+ while (stk->status == 'p')
MT_sleep_ms(50);
continue;
}
- if ( stk->status == 'q')
+ if (stk->status == 'q')
stk->cmd = 'x';
if (stk->cmd == 0)
@@ -583,9 +601,9 @@ runMALsequence(Client cntxt, MalBlkPtr m
if (ATOMIC_CAS(&cntxt->lastprint, &lp, t)) {
const char *q = cntxt->query ?
cntxt->query : NULL;
TRC_INFO(MAL_SERVER, "%s: query already
running "LLFMT"s: %.200s\n",
- cntxt->mythread->name,
- (lng) (time(0) -
cntxt->lastcmd),
- q ? q : "");
+ cntxt->mythread->name,
+ (lng) (time(0) -
cntxt->lastcmd),
+ q ? q : "");
}
}
}
@@ -610,11 +628,11 @@ runMALsequence(Client cntxt, MalBlkPtr m
* garbage collected are identified. In the post-execution
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
