Changeset: 6b8dc7d8d257 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b8dc7d8d257
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.mx
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_storage.c
gdk/gdk_system.h
gdk/gdk_utils.c
monetdb5/mal/mal.h
monetdb5/mal/mal_interpreter.mx
monetdb5/modules/kernel/counters.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/bbp.mx
tools/mserver/mserver5.1
Branch: default
Log Message:
Clean up of debug mask definitions.
Commented out unused debug mask definitions, and replaced "magic"
numbers with the appropriate debug mask definition.
diffs (truncated from 464 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2319,6 +2319,7 @@ VALptr(ValPtr v)
for a documentation of the following debug options.
*/
+#define THRDMASK (1)
#define CHECKMASK (1<<1)
#define CHECKDEBUG if (GDKdebug & CHECKMASK)
#define MEMMASK (1<<2)
@@ -2329,26 +2330,34 @@ VALptr(ValPtr v)
#define IODEBUG if (GDKdebug & IOMASK)
#define BATMASK (1<<5)
#define BATDEBUG if (GDKdebug & BATMASK)
+/* PARSEMASK not used anymore
#define PARSEMASK (1<<6)
#define PARSEDEBUG if (GDKdebug & PARSEMASK)
+*/
#define PARMASK (1<<7)
#define PARDEBUG if (GDKdebug & PARMASK)
+/* TRGMASK not used anymore
#define TRGMASK (1<<8)
#define TRGDEBUG if (GDKdebug & TRGMASK)
+*/
#define TMMASK (1<<9)
#define TMDEBUG if (GDKdebug & TMMASK)
#define TEMMASK (1<<10)
#define TEMDEBUG if (GDKdebug & TEMMASK)
+/* DLMASK not used anymore
#define DLMASK (1<<11)
#define DLDEBUG if (GDKdebug & DLMASK)
+*/
#define PERFMASK (1<<12)
#define PERFDEBUG if (GDKdebug & PERFMASK)
#define DELTAMASK (1<<13)
#define DELTADEBUG if (GDKdebug & DELTAMASK)
#define LOADMASK (1<<14)
#define LOADDEBUG if (GDKdebug & LOADMASK)
+/* YACCMASK not used anymore
#define YACCMASK (1<<15)
#define YACCDEBUG if (GDKdebug & YACCMASK)
+*/
/*
#define ?tcpip? if (GDKdebug&(1<<16))
#define ?monet_multiplex? if (GDKdebug&(1<<17))
@@ -2360,8 +2369,10 @@ VALptr(ValPtr v)
#define ALGODEBUG if (GDKdebug & ALGOMASK)
#define ESTIMASK (1<<22)
#define ESTIDEBUG if (GDKdebug & ESTIMASK)
+/* XPROPMASK not used anymore
#define XPROPMASK (1<<23)
#define XPROPDEBUG if (GDKdebug & XPROPMASK)
+*/
#define JOINPROPMASK (1<<24)
#define JOINPROPCHK if (!(GDKdebug & JOINPROPMASK))
@@ -2372,12 +2383,10 @@ VALptr(ValPtr v)
#define ALLOCDEBUG if (GDKdebug & ALLOCMASK)
/* M5, only; cf.,
- * MonetDB5/src/optimizer/opt_prelude.mx
- * MonetDB5/src/mal/mal.mx
-
+ * monetdb5/mal/mal.h
+ */
#define OPTMASK (1<<27)
#define OPTDEBUG if (GDKdebug & OPTMASK)
-*/
#define EXTENDMASK (1<<28)
#define EXTENDDEBUG if (GDKdebug & EXTENDMASK)
diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx
--- a/gdk/gdk_bbp.mx
+++ b/gdk/gdk_bbp.mx
@@ -1541,7 +1541,7 @@ BBPdir_subcommit(int cnt, bat *subcommit
if (n < BBPsize)
n = BBPsize;
- if (GDKdebug & (IOMASK | 1))
+ if (GDKdebug & (IOMASK | THRDMASK))
THRprintf(GDKstdout, "#BBPdir: writing BBP.dir (%d bats).\n",
n);
IODEBUG {
THRprintf(GDKstdout, "#BBPdir start oid=");
@@ -1616,7 +1616,7 @@ BBPdir(int cnt, bat *subcommit)
if (subcommit)
return BBPdir_subcommit(cnt, subcommit);
- if (GDKdebug & (IOMASK | 1))
+ if (GDKdebug & (IOMASK | THRDMASK))
THRprintf(GDKstdout, "#BBPdir: writing BBP.dir (%d bats).\n",
(int) BBPsize);
IODEBUG {
THRprintf(GDKstdout, "#BBPdir start oid=");
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -51,15 +51,15 @@ BAT *
BATcommit(BAT *b)
{
BATcheck(b, "BATcommit");
- DELTAprintf("#BATcommit1 %s free " SZFMT "," SZFMT " ins " BUNFMT " del
" BUNFMT " first " BUNFMT " base " PTRFMT "," PTRFMT "\n",
- BATgetId(b),
- b->H->heap.free,
- b->T->heap.free,
- b->batInserted,
- b->batDeleted,
- b->batFirst,
- PTRFMTCAST b->H->heap.base,
- PTRFMTCAST b->T->heap.base);
+ DELTADEBUG printf("#BATcommit1 %s free " SZFMT "," SZFMT " ins " BUNFMT
" del " BUNFMT " first " BUNFMT " base " PTRFMT "," PTRFMT "\n",
+ BATgetId(b),
+ b->H->heap.free,
+ b->T->heap.free,
+ b->batInserted,
+ b->batDeleted,
+ b->batFirst,
+ PTRFMTCAST b->H->heap.base,
+ PTRFMTCAST b->T->heap.base);
ALIGNcommit(b);
if (b->batDeleted < b->batFirst && BBP_cache(b->batCacheid)) {
BATiter bi = bat_iterator(b);
@@ -97,15 +97,15 @@ BATcommit(BAT *b)
}
b->batDeleted = b->batFirst;
b->batInserted = BUNlast(b);
- DELTAprintf("#BATcommit2 %s free " SZFMT "," SZFMT " ins " BUNFMT " del
" BUNFMT " first " BUNFMT " base " PTRFMT "," PTRFMT "\n",
- BATgetId(b),
- b->H->heap.free,
- b->T->heap.free,
- b->batInserted,
- b->batDeleted,
- b->batFirst,
- PTRFMTCAST b->H->heap.base,
- PTRFMTCAST b->T->heap.base);
+ DELTADEBUG printf("#BATcommit2 %s free " SZFMT "," SZFMT " ins " BUNFMT
" del " BUNFMT " first " BUNFMT " base " PTRFMT "," PTRFMT "\n",
+ BATgetId(b),
+ b->H->heap.free,
+ b->T->heap.free,
+ b->batInserted,
+ b->batDeleted,
+ b->batFirst,
+ PTRFMTCAST b->H->heap.base,
+ PTRFMTCAST b->T->heap.base);
return b;
}
@@ -144,7 +144,7 @@ BATundo(BAT *b)
BUN p, bunlast, bunfirst;
BATcheck(b, "BATundo");
- DELTAprintf("#BATundo %s \n", BATgetId(b));
+ DELTADEBUG printf("#BATundo %s \n", BATgetId(b));
ALIGNundo(b);
if (b->batDirtyflushed) {
b->batDirtydesc = b->H->heap.dirty = b->T->heap.dirty = 1;
diff --git a/gdk/gdk_delta.h b/gdk/gdk_delta.h
--- a/gdk/gdk_delta.h
+++ b/gdk/gdk_delta.h
@@ -27,7 +27,6 @@
* item of e.g. a BAT[void,bit] is (at least) integer aligned.
* This optimizes processing on such BATs (DDBENCH).
*/
-#define DELTAprintf DELTADEBUG printf
#define DELTAinit(P1) \
do { \
BATsetcount((P1), 0); \
@@ -36,8 +35,10 @@
(P1)->batDeleted = (P1)->batInserted = (P1)->batFirst = 0; \
(P1)->H->shift = ATOMelmshift(Hsize(P1)); \
(P1)->T->shift = ATOMelmshift(Tsize(P1)); \
- DELTAprintf( \
- "#DELTAinit %s free " SZFMT "," SZFMT " ins " BUNFMT "
del " BUNFMT " first " BUNFMT " base " PTRFMT "," PTRFMT "\n", \
+ DELTADEBUG printf( \
+ "#DELTAinit %s free " SZFMT "," SZFMT " ins " BUNFMT \
+ " del " BUNFMT " first " BUNFMT " base " PTRFMT "," \
+ PTRFMT "\n", \
BATgetId(P1), \
(P1)->H->heap.free, \
(P1)->T->heap.free, \
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -681,7 +681,8 @@ BATload_intern(bat i, int lock)
}
b->batDirtydesc |= batmapdirty; /* if some heap mode changed, make desc
dirty */
- if ((b->batRestricted == BAT_WRITE && (GDKdebug & 2)) || (GDKdebug &
8)) {
+ if ((b->batRestricted == BAT_WRITE && (GDKdebug & CHECKMASK)) ||
+ (GDKdebug & PROPMASK)) {
++b->batSharecnt;
--b->batSharecnt;
}
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -110,7 +110,7 @@ gdk_export unsigned long long MT_clock(v
#define MT_locktrace_set(s,n)
#endif
-#define MT_log(_impl, _object, _action, _caller, _fp) do { if (GDKdebug &
1024) { fprintf(_fp, "%s: " _action "(" PTRFMT ")\n", _caller,
PTRFMTCAST(void*) _object); fflush(_fp); } _impl; } while (0)
+#define MT_log(_impl, _object, _action, _caller, _fp) do { TEMDEBUG {
fprintf(_fp, "%s: " _action "(" PTRFMT ")\n", _caller, PTRFMTCAST(void*)
_object); fflush(_fp); } _impl; } while (0)
/* API */
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -699,7 +699,7 @@ GDKmemfail(str s, size_t len)
THRprintf(GDKstdout, "#%s(" SZFMT ") fails, try to free up space
[memory in use=" SZFMT ",virtual memory in use=" SZFMT "]\n", s, len,
GDKmem_inuse(), GDKvm_cursize());
GDKmemdump();
-/* GDKdebug |= 4; avoid debugging output */
+/* GDKdebug |= MEMMASK; avoid debugging output */
BBPtrim(BBPTRIM_ALL);
@@ -1692,7 +1692,7 @@ GDKfatal(const char *format, ...)
va_list ap;
FILE *fd = stderr;
- GDKdebug |= 16;
+ GDKdebug |= IOMASK;
#ifndef NATIVE_WIN32
BATSIGinit();
#endif
@@ -1927,7 +1927,7 @@ THRprintf(stream *s, const char *format,
do {
p = bf;
*p++ = c;
- if (GDKdebug&1) {
+ if (GDKdebug & THRDMASK) {
sprintf(p, "%02d ", THRgettid());
while (*p)
p++;
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -66,16 +66,16 @@ mal_export int memoryclaims; /* num
See `man mserver5` or tools/mserver/mserver5.1
for a documentation of all debug options.
*/
-#define GRPthreads ( 1 | PARMASK)
+#define GRPthreads (THRDMASK | PARMASK)
#define GRPmemory (MEMMASK | ALLOCMASK )
#define GRPproperties (CHECKMASK | PROPMASK | BATMASK )
#define GRPio (IOMASK | PERFMASK )
-#define GRPtransactions ( TMMASK | DELTAMASK | TEMMASK)
-#define GRPmodules (DLMASK | LOADMASK)
+#define GRPtransactions (TMMASK | DELTAMASK | TEMMASK)
+#define GRPmodules (LOADMASK)
#define GRPalgorithms (ALGOMASK | ESTIMASK)
-#define GRPxproperties (XPROPMASK )
+#define GRPxproperties 0 /* (XPROPMASK) */
#define GRPperformance (JOINPROPMASK | DEADBEEFMASK)
-#define GRPoptimizers (1<<27) /* == OPTMASK; cf., gdk/gdk.mx */
+#define GRPoptimizers (OPTMASK)
#define GRPforcemito (FORCEMITOMASK)
/*
* @-
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
@@ -1901,7 +1901,7 @@ safeguardStack(Client cntxt, MalBlkPtr m
#endif
/* Provide debugging support */
#if @1
- if (GDKdebug & 10 && exceptionVar < 0) {
+ if (GDKdebug & (CHECKMASK|PROPMASK) && exceptionVar < 0) {
BAT *b;
for (i = 0; i < pci->retc; i++) {
@@ -1913,10 +1913,10 @@ safeguardStack(Client cntxt, MalBlkPtr m
continue;
}
if (b->batStamp <= stamp) {
- if (GDKdebug & 8) {
+ if (GDKdebug & PROPMASK) {
BATassertProps(b);
}
- } else if (GDKdebug & 2) {
+ } else if (GDKdebug & CHECKMASK) {
BATassertProps(b);
}
BBPunfix(b->batCacheid);
diff --git a/monetdb5/modules/kernel/counters.c
b/monetdb5/modules/kernel/counters.c
--- a/monetdb5/modules/kernel/counters.c
+++ b/monetdb5/modules/kernel/counters.c
@@ -2237,9 +2237,6 @@ event_t *X_event = NO_event;
#endif
-#define monet_modulesilent (!(GDKdebug&16384))
-
-
static int
init_counters(void)
{
@@ -2264,7 +2261,7 @@ init_counters(void)
event = P5_event;
} else if (!strcmp(uts.machine, "i686")) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
