Changeset: 015e364c82e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=015e364c82e3
Modified Files:
monetdb5/mal/mal_interpreter.mx
Branch: default
Log Message:
uncrustify (for readability)
diffs (truncated from 2843 to 300 lines):
diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -52,14 +52,10 @@
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 runMALdataflow( 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);
+mal_export str runMAL(Client c, MalBlkPtr mb, int startpc, MalBlkPtr mbcaller,
MalStkPtr env, InstrPtr pcicaller);
+mal_export str runMALdataflow(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);
mal_export void garbageElement(Client cntxt, ValPtr v);
mal_export void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
int flag);
mal_export void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid);
@@ -77,15 +73,14 @@
#define SLOW 1
#define FAST 0
-static str runMALsequence( Client cntxt, MalBlkPtr mb, int startpc,
- int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
+static str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc,
MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
static void displayVolume(Client cntxt, lng vol);
#define MEMORY_THRESHOLD 0.8
#ifdef USE_DFLOW_ADMISSION
-static lng memorypool; /* memory claimed by concurrent threads */
-static int memoryclaims = 0; /* number of threads active with expensive
operations */
+static lng memorypool; /* memory claimed by concurrent threads */
+static int memoryclaims = 0; /* number of threads active with expensive
operations */
#endif
#define heapinfo(X) if((X) && (X)->base) vol = (X)->free; else vol = 0;
@@ -102,37 +97,38 @@
#ifdef STRUCT_ALIGNED
return (ptr) & stk->stk[pci->argv[k]].val.ival;
#else
- int j=0;
- ValRecord *v=0;
+ int j = 0;
+ ValRecord *v = 0;
ptr ret = NULL;
j = pci->argv[k];
- v= &stk->stk[j];
+ v = &stk->stk[j];
- switch(ATOMstorage(v->vtype)){
- case TYPE_void: ret= (ptr) & v->val.ival; break;
- case TYPE_bit: ret= (ptr) & v->val.cval[0]; break;
- case TYPE_chr: ret= (ptr) & v->val.cval[0]; break;
- case TYPE_sht: ret= (ptr) & v->val.shval; break;
- case TYPE_bat: ret= (ptr) & v->val.bval; break;
- case TYPE_int: ret= (ptr) & v->val.ival; break;
- case TYPE_wrd: ret= (ptr) & v->val.wval; break;
- case TYPE_bte: ret= (ptr) & v->val.btval; break;
- case TYPE_oid: ret= (ptr) & v->val.oval; break;
- case TYPE_ptr: ret= (ptr) & v->val.pval; break;
- case TYPE_flt: ret= (ptr) & v->val.fval; break;
- case TYPE_dbl: ret= (ptr) & v->val.dval; break;
- case TYPE_lng: ret= (ptr) & v->val.lval; break;
- case TYPE_str: ret= (ptr) & v->val.sval; break;
+ switch (ATOMstorage(v->vtype)) {
+ case TYPE_void: ret = (ptr) & v->val.ival; break;
+ case TYPE_bit: ret = (ptr) & v->val.cval[0]; break;
+ case TYPE_chr: ret = (ptr) & v->val.cval[0]; break;
+ case TYPE_sht: ret = (ptr) & v->val.shval; break;
+ case TYPE_bat: ret = (ptr) & v->val.bval; break;
+ case TYPE_int: ret = (ptr) & v->val.ival; break;
+ case TYPE_wrd: ret = (ptr) & v->val.wval; break;
+ case TYPE_bte: ret = (ptr) & v->val.btval; break;
+ case TYPE_oid: ret = (ptr) & v->val.oval; break;
+ case TYPE_ptr: ret = (ptr) & v->val.pval; break;
+ case TYPE_flt: ret = (ptr) & v->val.fval; break;
+ case TYPE_dbl: ret = (ptr) & v->val.dval; break;
+ case TYPE_lng: ret = (ptr) & v->val.lval; break;
+ case TYPE_str: ret = (ptr) & v->val.sval; break;
default:
- ret= (ptr) & v->val.pval;
+ ret = (ptr) & v->val.pval;
}
return ret;
#endif
}
/* code is obsolete, because all should be handled as exceptions */
-void showErrors(Client cntxt) {
+void showErrors(Client cntxt)
+{
int i;
if (cntxt->errbuf && *cntxt->errbuf) {
i = (int)strlen(cntxt->errbuf);
@@ -154,22 +150,22 @@
updateBigFoot(Client cntxt, int bid, int add)
{
BAT *b;
- lng total = 0,vol = 0;
+ lng total = 0, vol = 0;
- if (bid != bat_nil ){
+ if (bid != bat_nil) {
BUN cnt = 0;
- b= BBPquickdesc(ABS(bid),TRUE);
+ b = BBPquickdesc(ABS(bid), TRUE);
if (b == NULL)
return;
- if ( isVIEW(b) )
+ if (isVIEW(b))
return;
/* count it once ! */
cntxt->cnt = cnt = BATcount(b);
@:calcFootprint@
- if ( b->H->hash )
- total += cnt * sizeof(int);
- if ( b->T->hash )
- total += cnt * sizeof(int);
+ if (b->H->hash)
+ total += cnt * sizeof(int);
+ if (b->T->hash)
+ total += cnt * sizeof(int);
if (add) {
cntxt->vmfoot += total;
@@ -189,15 +185,15 @@
sequence of factory calls.
BEWARE WE ASSUME THAT FIRST VARIABLES ON THE STACK ALIGN WITH THE SIGNATURE.
@= initStack
- for(i= @1; i< mb->vtop; i++) {
+ for (i = @1; i < mb->vtop; i++) {
lhs = &stk->stk[i];
- if( isVarConstant(mb,i) > 0 ){
- if( !isVarDisabled(mb,i)){
- rhs = &getVarConstant(mb,i);
- VALcopy(lhs,rhs);
+ if (isVarConstant(mb, i) > 0) {
+ if (!isVarDisabled(mb, i)) {
+ rhs = &getVarConstant(mb, i);
+ VALcopy(lhs, rhs);
}
} else{
- lhs->vtype = getVarGDKType(mb,i);
+ lhs->vtype = getVarGDKType(mb, i);
lhs->val.pval = 0;
lhs->len = 0;
}
@@ -207,35 +203,37 @@
isNotUsedIn(InstrPtr p, int start, int a)
{
int k;
- for (k=start; k<p->argc; k++)
- if( getArg(p,k)== a)
+ for (k = start; k < p->argc; k++)
+ if (getArg(p, k) == a)
return 0;
return 1;
}
MalStkPtr
-prepareMALstack(MalBlkPtr mb, int size){
- MalStkPtr stk= NULL;
+prepareMALstack(MalBlkPtr mb, int size)
+{
+ MalStkPtr stk = NULL;
int i;
- ValPtr lhs,rhs;
+ ValPtr lhs, rhs;
assert(size >= mb->vsize);
- stk= newGlobalStack(size);
- memset((char *) stk, 0, stackSize(size));
- stk->stktop= mb->vtop;
- stk->stksize= size;
- stk->blk= mb;
+ stk = newGlobalStack(size);
+ memset((char *)stk, 0, stackSize(size));
+ stk->stktop = mb->vtop;
+ stk->stksize = size;
+ stk->blk = mb;
@:initStack(1)@
return stk;
}
str runMAL(Client cntxt, MalBlkPtr mb, int startpc, MalBlkPtr mbcaller,
- MalStkPtr env, InstrPtr pcicaller){
- MalStkPtr stk= NULL;
+ MalStkPtr env, InstrPtr pcicaller)
+{
+ MalStkPtr stk = NULL;
int i;
- ValPtr lhs,rhs;
- InstrPtr pci=getInstrPtr(mb,0);
+ ValPtr lhs, rhs;
+ InstrPtr pci = getInstrPtr(mb, 0);
str ret;
@:performanceVariables@
@@ -258,32 +256,32 @@
@c
/* allocate space for value stack */
/* the global stack should be large enough */
- if( mbcaller== NULL && env != NULL){
+ if (mbcaller == NULL && env != NULL) {
stk = env;
- if( mb != stk->blk)
- showScriptException(mb,0,MAL,"runMAL:misalignment of
symbols\n");
- if( mb->vtop > stk->stksize)
- showScriptException(mb,0,MAL,"stack too small\n");
- pci= pcicaller;
+ if (mb != stk->blk)
+ showScriptException(mb, 0, MAL, "runMAL:misalignment of
symbols\n");
+ if (mb->vtop > stk->stksize)
+ showScriptException(mb, 0, MAL, "stack too small\n");
+ pci = pcicaller;
} else {
- newStack(stk,mb->vsize);
- stk->stktop= mb->vtop;
- stk->stksize= mb->vsize;
- stk->blk= mb;
- stk->cmd= cntxt->itrace; /* set debug mode */
- if( env) {
+ newStack(stk, mb->vsize);
+ stk->stktop = mb->vtop;
+ stk->stksize = mb->vsize;
+ stk->blk = mb;
+ stk->cmd = cntxt->itrace; /* set debug mode */
+ if (env) {
/*safeguardStack*/
- stk->stkdepth= stk->stksize + env->stkdepth;
- stk->calldepth= env->calldepth + 1;
- if ( stk->calldepth > 256 )
+ stk->stkdepth = stk->stksize + env->stkdepth;
+ stk->calldepth = env->calldepth + 1;
+ if (stk->calldepth > 256)
throw(MAL, "mal.interpreter",
MAL_CALLDEPTH_FAIL);
- if ( (unsigned) stk->stkdepth > THREAD_STACK_SIZE/
sizeof(mb->var[0]) / 4 && THRhighwater())
+ if ((unsigned)stk->stkdepth > THREAD_STACK_SIZE /
sizeof(mb->var[0]) / 4 && THRhighwater())
/* we are running low on stack space */
throw(MAL, "mal.interpreter", MAL_STACK_FAIL);
}
}
- if( env && mbcaller){
+ if (env && mbcaller) {
InstrPtr pp;
int k;
@-
@@ -292,21 +290,21 @@
f,a1..an,b1..bn. This slightly complicates the implementation
of the return statement.
@c
- pci= pcicaller;
+ pci = pcicaller;
pp = getInstrPtr(mb, 0);
/* set return types */
- for(i=0; i< pci->retc; i++){
+ for (i = 0; i < pci->retc; i++) {
lhs = &stk->stk[i];
- lhs->vtype =getVarGDKType(mb,i);
+ lhs->vtype = getVarGDKType(mb, i);
}
- for(k=pp->retc; i<pci->argc; i++,k++){
+ for (k = pp->retc; i < pci->argc; i++, k++) {
lhs = &stk->stk[pp->argv[k]];
/* variable arguments ? */
- if( k== pp->argc-1) k--;
+ if (k == pp->argc - 1) k--;
rhs = &env->stk[pci->argv[i]];
- VALcopy(lhs,rhs);
- if( lhs->vtype == TYPE_bat)
+ VALcopy(lhs, rhs);
+ if (lhs->vtype == TYPE_bat)
BBPincref(lhs->val.bval, TRUE);
}
stk->up = env;
@@ -325,20 +323,22 @@
@c
if (env && mbcaller) {
@:initStack(pci->argc)@
- } else if ( env && env->stkbot) {
+ } else if (env && env->stkbot) {
@:initStack(env->stkbot)@
} else {
- @:initStack(mbcaller? pci->argc:1)@
+ @:initStack(mbcaller ? pci->argc:1)@
}
- if(stk->cmd && env && stk->cmd!='f') stk->cmd = env->cmd ;
- ret = runMALsequence(cntxt, mb, startpc, 0, stk, env, pcicaller);
+ if (stk->cmd && env && stk->cmd != 'f')
+ stk->cmd = env->cmd;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
