Changeset: 3b16952ba79b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b16952ba79b
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_parser.c
Branch: default
Log Message:
indent with uncrustify
diffs (truncated from 4256 to 300 lines):
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
@@ -38,9 +38,10 @@
int MDBdelay; /* do not immediately react */
-#define skipBlanc(c,X) while(*(X) && isspace((int)*X)){ X++; }
-#define skipNonBlanc(c,X) while(*(X) && !isspace((int) *X)){ X++; }
-#define skipWord(c,X) while(*(X) && isalnum((int) *X)){X++;} skipBlanc(c,X);
+#define skipBlanc(c, X) while (*(X) && isspace((int) *X)) { X++; }
+#define skipNonBlanc(c, X) while (*(X) && !isspace((int) *X)) { X++; }
+#define skipWord(c, X) while (*(X) && isalnum((int) *X)) { X++; } \
+ skipBlanc(c, X);
static void printStackElm(stream *f, MalBlkPtr mb, ValPtr v, int index, BUN
cnt, BUN first);
static void printStackHdr(stream *f, MalBlkPtr mb, ValPtr v, int index);
@@ -65,21 +66,21 @@ isBreakpoint(Client cntxt, MalBlkPtr mb,
int i, j;
for (i = 0; i < mdbTable[cntxt->idx].brkTop; i++) {
- if( mdbTable[cntxt->idx].brkBlock[i] != mb)
+ if (mdbTable[cntxt->idx].brkBlock[i] != mb)
continue;
- if( mdbTable[cntxt->idx].brkPc[i] == pc )
+ if (mdbTable[cntxt->idx].brkPc[i] == pc)
return mdbTable[cntxt->idx].brkCmd[i];
- if( mdbTable[cntxt->idx].brkMod[i] && getModuleId(p) &&
- mdbTable[cntxt->idx].brkFcn[i] && getFunctionId(p) &&
- strcmp(mdbTable[cntxt->idx].brkMod[i],
getModuleId(p))==0 &&
- strcmp(mdbTable[cntxt->idx].brkFcn[i],
getFunctionId(p))==0)
+ if (mdbTable[cntxt->idx].brkMod[i] && getModuleId(p) &&
+ mdbTable[cntxt->idx].brkFcn[i] && getFunctionId(p) &&
+ strcmp(mdbTable[cntxt->idx].brkMod[i], getModuleId(p))
== 0 &&
+ strcmp(mdbTable[cntxt->idx].brkFcn[i],
getFunctionId(p)) == 0)
return mdbTable[cntxt->idx].brkCmd[i];
- if( mdbTable[cntxt->idx].brkVar[i] >= 0 )
- for (j = 0; j < p->retc; j++)
- if (mdbTable[cntxt->idx].brkVar[i] == getArg(p,j))
- return mdbTable[cntxt->idx].brkCmd[i];
+ if (mdbTable[cntxt->idx].brkVar[i] >= 0)
+ for (j = 0; j < p->retc; j++)
+ if (mdbTable[cntxt->idx].brkVar[i] == getArg(p,
j))
+ return mdbTable[cntxt->idx].brkCmd[i];
}
return 0;
}
@@ -87,7 +88,7 @@ isBreakpoint(Client cntxt, MalBlkPtr mb,
/*
* Break points can be set on assignment to a specific variable,
* specific operation, or a instruction line
-*/
+ */
void
mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd)
{
@@ -97,12 +98,12 @@ mdbSetBreakRequest(Client cntxt, MalBlkP
Symbol sym;
/* set breakpoint on specific line */
- if( *request == '#' ){
- i= atoi(request+1);
- if( i<0 || i>= mb->stop)
- mnstr_printf(cntxt->fdout, "breakpoint on #%d (<%d) not
set\n",
- i, mb->stop);
- else {
+ if (*request == '#') {
+ i = atoi(request + 1);
+ if (i < 0 || i >= mb->stop)
+ mnstr_printf(cntxt->fdout, "breakpoint on #%d (<%d) not
set\n",
+ i, mb->stop);
+ else {
mdb->brkBlock[mdb->brkTop] = mb;
mdb->brkPc[mdb->brkTop] = i;
mdb->brkVar[mdb->brkTop] = -1;
@@ -117,27 +118,28 @@ mdbSetBreakRequest(Client cntxt, MalBlkP
}
/* check for a [module.]function request */
- fcnnme= strchr(request,'.');
- if( fcnnme){
- modnme= request;
- *fcnnme= 0;
+ fcnnme = strchr(request, '.');
+ if (fcnnme) {
+ modnme = request;
+ *fcnnme = 0;
fcnnme++;
- sym= findSymbol(cntxt->nspace, modnme,fcnnme);
- mdb->brkBlock[mdb->brkTop] = sym? sym->def: mb;
+ sym = findSymbol(cntxt->nspace, modnme, fcnnme);
+ mdb->brkBlock[mdb->brkTop] = sym ? sym->def : mb;
mdb->brkPc[mdb->brkTop] = -1;
mdb->brkVar[mdb->brkTop] = -1;
- mdb->brkMod[mdb->brkTop] = putName(modnme,strlen(modnme));
- mdb->brkFcn[mdb->brkTop] = putName(fcnnme,strlen(fcnnme));
- fcnnme--; *fcnnme= '.';
+ mdb->brkMod[mdb->brkTop] = putName(modnme, strlen(modnme));
+ mdb->brkFcn[mdb->brkTop] = putName(fcnnme, strlen(fcnnme));
+ fcnnme--;
+ *fcnnme = '.';
mdb->brkRequest[mdb->brkTop] = GDKstrdup(request);
mdb->brkCmd[mdb->brkTop] = cmd;
if (mdb->brkTop + 1 < MAXBREAKS)
mdb->brkTop++;
return;
- }
+ }
/* the final step is to break on a variable */
- i= findVariable(mb,request);
- if( i< 0)
+ i = findVariable(mb, request);
+ if (i < 0)
mnstr_printf(cntxt->fdout, "breakpoint on %s not set\n",
request);
else {
mdb->brkBlock[mdb->brkTop] = mb;
@@ -159,7 +161,7 @@ mdbSetBreakpoint(Client cntxt, MalBlkPtr
mdbState mdb = mdbTable + cntxt->idx;
char buf[20];
- snprintf(buf,20,"#%d",pc);
+ snprintf(buf, 20, "#%d", pc);
mdb->brkBlock[mdb->brkTop] = mb;
mdb->brkPc[mdb->brkTop] = pc;
mdb->brkVar[mdb->brkTop] = -1;
@@ -201,7 +203,6 @@ mdbClrBreakpoint(Client cntxt, int pc)
GDKfree(mdb->brkRequest[i]);
mdb->brkRequest[i] = 0;
}
-
}
mdb->brkTop = j;
}
@@ -212,7 +213,7 @@ mdbClrBreakRequest(Client cntxt, str req
int i, j = 0;
mdbState mdb = mdbTable + cntxt->idx;
- for (i=0; i < mdb->brkTop; i++) {
+ for (i = 0; i < mdb->brkTop; i++) {
mdb->brkBlock[j] = mdb->brkBlock[i];
mdb->brkPc[j] = mdb->brkPc[i];
mdb->brkVar[j] = mdb->brkVar[i];
@@ -231,16 +232,17 @@ mdbClrBreakRequest(Client cntxt, str req
}
int
-mdbSetTrap(Client cntxt, str modnme, str fcnnme, int flag){
+mdbSetTrap(Client cntxt, str modnme, str fcnnme, int flag)
+{
Symbol s;
- s = findSymbol( cntxt->nspace, putName(modnme, strlen(modnme)),
- putName(fcnnme, strlen(fcnnme)));
+ s = findSymbol(cntxt->nspace, putName(modnme, strlen(modnme)),
+ putName(fcnnme, strlen(fcnnme)));
if (s == NULL)
return -1;
- while ( s) {
+ while (s) {
s->def->trap = flag;
- s= s->peer;
- }
+ s = s->peer;
+ }
return 0;
}
@@ -249,10 +251,10 @@ static void
printCall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc)
{
str msg;
- msg = instruction2str(mb, stk, getInstrPtr(mb,pc), LIST_MAL_DEBUG);
- mnstr_printf(cntxt->fdout, "#%s at %s.%s[%d]\n", msg,
- getModuleId(getInstrPtr(mb,0)),
- getFunctionId(getInstrPtr(mb,0)),pc);
+ msg = instruction2str(mb, stk, getInstrPtr(mb, pc), LIST_MAL_DEBUG);
+ mnstr_printf(cntxt->fdout, "#%s at %s.%s[%d]\n", msg,
+ getModuleId(getInstrPtr(mb, 0)),
+ getFunctionId(getInstrPtr(mb, 0)), pc);
GDKfree(msg);
}
@@ -263,14 +265,15 @@ printTraceCall(stream *out, MalBlkPtr mb
str msg;
InstrPtr p;
- p= getInstrPtr(mb,pc);
+ p = getInstrPtr(mb, pc);
msg = instruction2str(mb, stk, p, flags);
- mnstr_printf(out, "#%s%s\n", (mb->errors?"!":""), msg);
+ mnstr_printf(out, "#%s%s\n", (mb->errors ? "!" : ""), msg);
GDKfree(msg);
}
static void
-mdbBacktrace(Client cntxt, MalStkPtr stk, int pci){
+mdbBacktrace(Client cntxt, MalStkPtr stk, int pci)
+{
for (; stk != NULL; stk = stk->up) {
printCall(cntxt, stk->blk, stk, pci);
if (stk->up)
@@ -281,7 +284,7 @@ mdbBacktrace(Client cntxt, MalStkPtr stk
* Sometimes we may want to trace the changes applied to the
* BAT buffer pool and report them together with the MAL
* instruction where it happened.
-*/
+ */
static int BBPtraceEnabled = 0;
static str BBPtracePattern = NULL;
char
@@ -293,46 +296,47 @@ BBPTraceCall(Client cntxt, MalBlkPtr mb,
int i, action;
(void) mb;
- if (BBPmirror == NULL ){
- bbpsize= BBPsize;
- BBPmirror = (int*) GDKzalloc(sizeof(int) * BBPsize);
+ if (BBPmirror == NULL) {
+ bbpsize = BBPsize;
+ BBPmirror = (int *) GDKzalloc(sizeof(int) * BBPsize);
}
- if( BBPsize > bbpsize) {
+ if (BBPsize > bbpsize) {
int *old = BBPmirror;
- BBPmirror = (int*) GDKzalloc(sizeof(int) * BBPsize);
- memcpy((char*)BBPmirror, (char*)old, sizeof(int) * bbpsize);
- bbpsize= BBPsize;
+ BBPmirror = (int *) GDKzalloc(sizeof(int) * BBPsize);
+ memcpy((char *) BBPmirror, (char *) old, sizeof(int) * bbpsize);
+ bbpsize = BBPsize;
GDKfree(old);
}
/* no growing BBP yet */
action = 0;
- for ( i=0; i<bbpsize; i++){
+ for (i = 0; i < bbpsize; i++) {
/* what happened to this BAT */
- if ( BBPmirror[i] != BBP_lrefs(i)){
+ if (BBPmirror[i] != BBP_lrefs(i)) {
BAT *b = BBPquickdesc(ABS(i), TRUE);
- BBPlogical(i,lbuf);
- if ( BBPtracePattern && strstr(lbuf,BBPtracePattern)
!= NULL )
+ BBPlogical(i, lbuf);
+ if (BBPtracePattern && strstr(lbuf, BBPtracePattern) !=
NULL)
continue;
- BBPphysical(i,pbuf);
- if ( BBPmirror[i] )
- mnstr_printf(cntxt->fdout, "#BBP [%d] state
change of %s %s refs %d rows " BUNFMT"\n",
- i,lbuf,pbuf, BBP_lrefs(i),
BATcount(b));
+ BBPphysical(i, pbuf);
+ if (BBPmirror[i])
+ mnstr_printf(cntxt->fdout, "#BBP [%d] state
change of %s %s refs %d rows " BUNFMT "\n",
+ i, lbuf, pbuf, BBP_lrefs(i),
BATcount(b));
action = 1;
}
BBPmirror[i] = BBP_lrefs(i);
}
- if ( action )
+ if (action)
mdbBacktrace(cntxt, stk, pc);
return 's';
}
static void
-printBATproperties(stream *f, BAT *b){
- mnstr_printf(f, " count=" BUNFMT " lrefs=%d ",
- BATcount(b), BBP_lrefs(ABS(b->batCacheid)));
- if( BBP_refs(ABS(b->batCacheid)) - 1)
- mnstr_printf(f, " refs=%d ", BBP_refs(ABS(b->batCacheid)) );
- if( b->batSharecnt)
+printBATproperties(stream *f, BAT *b)
+{
+ mnstr_printf(f, " count=" BUNFMT " lrefs=%d ",
+ BATcount(b), BBP_lrefs(ABS(b->batCacheid)));
+ if (BBP_refs(ABS(b->batCacheid)) - 1)
+ mnstr_printf(f, " refs=%d ", BBP_refs(ABS(b->batCacheid)));
+ if (b->batSharecnt)
mnstr_printf(f, " views=%d", b->batSharecnt);
if (b->H->heap.parentid)
mnstr_printf(f, "view on %s ", BBPname(b->H->heap.parentid));
@@ -350,44 +354,45 @@ printBATproperties(stream *f, BAT *b){
* The history of the optimizers is maintained, which can be localized
* for inspection.
*/
-#define MDBstatus(X) if(cntxt->fdout) \
- mnstr_printf(cntxt->fdout,"#MonetDB Debugger %s\n", (X?"on":"off"));
+#define MDBstatus(X) if (cntxt->fdout) \
+ mnstr_printf(cntxt->fdout, "#MonetDB Debugger %s\n", (X ? "on"
: "off"));
static MalBlkPtr
-mdbLocateMalBlk(Client cntxt, MalBlkPtr mb, str b, stream *out){
- MalBlkPtr m=mb;
- char *h=0;
- int idx=0;
+mdbLocateMalBlk(Client cntxt, MalBlkPtr mb, str b, stream *out)
+{
+ MalBlkPtr m = mb;
+ char *h = 0;
+ int idx = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
