Changeset: 67af82937c1c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/67af82937c1c
Modified Files:
documentation/source/manual_pages/mserver5.rst.in
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_logger_old.c
monetdb5/mal/mal.h
monetdb5/mal/mal_interpreter.c
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Get rid of -d8, i.e. -d10 and -d2 are equivalent. Also -d implies -d2 instead
of -d1.
diffs (196 lines):
diff --git a/documentation/source/manual_pages/mserver5.rst.in
b/documentation/source/manual_pages/mserver5.rst.in
--- a/documentation/source/manual_pages/mserver5.rst.in
+++ b/documentation/source/manual_pages/mserver5.rst.in
@@ -99,7 +99,7 @@ MSERVER5 OPTIONS
**-d**\ [*value*]
Set debug level. This is mostly for debugging purposes. The *value*
together with the **=** sign is optional. If not specified, it
- defaults to **1**. In the short form **-d**, the value, if present,
+ defaults to **2**. In the short form **-d**, the value, if present,
must immediately (i.e. without space) follow the option. The values
of multiple instances of this flag are OR-ed together. The value is
an integer, which can be (a bit-wise OR of):
@@ -108,11 +108,7 @@ MSERVER5 OPTIONS
(THRDMASK) thread-specific debug output
**2**
- (CHECKMASK) property enforcing on new BATs
-
- **8**
- (PROPMASK) property checking on all values: tells about wrongly
- set properties
+ (CHECKMASK) property checking on new BATs
**16**
(IOMASK) major IO activity
@@ -195,7 +191,7 @@ MSERVER5 OPTIONS
Equivalent to **--debug=**\ *(DEADBEEFMASK)*.
**--properties**
- Equivalent to **--debug=**\ *(CHECKMASK \| PROPMASK \| BATMASK)*.
+ Equivalent to **--debug=**\ *(CHECKMASK)*.
**--threads**
Equivalent to **--debug=**\ *(THRDMASK \| PARMASK)*.
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -378,8 +378,8 @@ gdk_export _Noreturn void GDKfatal(_In_z
#define THRDMASK (1)
#define CHECKMASK (1<<1)
#define CHECKDEBUG if (GDKdebug & CHECKMASK)
-#define PROPMASK (1<<3)
-#define PROPDEBUG if (GDKdebug & PROPMASK)
+#define PROPMASK (1<<3) /* unused */
+#define PROPDEBUG if (GDKdebug & PROPMASK) /* unused */
#define IOMASK (1<<4)
#define BATMASK (1<<5)
#define PARMASK (1<<7)
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2457,7 +2457,7 @@ BATmode(BAT *b, bool transient)
#ifdef NDEBUG
/* assertions are disabled, turn failing tests into a message */
#undef assert
-#define assert(test) ((void) ((test) || (TRC_CRITICAL_ENDIF(BAT_, "Assertion
`%s' failed\n", #test), 0)))
+#define assert(test) ((void) ((test) || (TRC_CRITICAL_ENDIF(CHECK,
"Assertion `%s' failed\n", #test), 0)))
#endif
/* Assert that properties are set correctly.
@@ -2706,9 +2706,8 @@ BATassertProps(BAT *b)
return;
}
- /* only do a scan if property checking is requested and the bat
- * is not a view */
- if (!isview1 && !isview2 && GDKdebug & PROPMASK) {
+ /* only do a scan if the bat is not a view */
+ if (!isview1 && !isview2) {
const void *maxval = NULL;
const void *minval = NULL;
bool seenmax = false, seenmin = false;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3062,7 +3062,7 @@ BBPkeepref(BAT *b)
BATsettrivprop(b);
MT_lock_unset(&b->theaplock);
}
- if (GDKdebug & (CHECKMASK | PROPMASK))
+ if (GDKdebug & CHECKMASK)
BATassertProps(b);
if (BATsetaccess(b, BAT_READ) == NULL)
return; /* already decreffed */
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1116,7 +1116,7 @@ logger_read_transaction(logger *lg)
int dbg = GDKdebug;
if (!lg->flushing)
- GDKdebug &= ~(CHECKMASK|PROPMASK);
+ GDKdebug &= ~CHECKMASK;
while (err == LOG_OK && (ok=log_read_format(lg, &l))) {
if (l.flag == 0 && l.id == 0) {
@@ -2001,7 +2001,7 @@ logger_load(int debug, const char *fn, c
needcommit = true;
}
dbg = GDKdebug;
- GDKdebug &= ~(CHECKMASK|PROPMASK);
+ GDKdebug &= ~CHECKMASK;
if (needcommit && bm_commit(lg) != GDK_SUCCEED) {
GDKerror("Logger_new: commit failed");
goto error;
@@ -2026,7 +2026,7 @@ logger_load(int debug, const char *fn, c
}
}
dbg = GDKdebug;
- GDKdebug &= ~(CHECKMASK|PROPMASK);
+ GDKdebug &= ~CHECKMASK;
if (logger_commit(lg) != GDK_SUCCEED) {
goto error;
}
diff --git a/gdk/gdk_logger_old.c b/gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c
+++ b/gdk/gdk_logger_old.c
@@ -1016,7 +1016,7 @@ logger_readlog(old_logger *lg, char *fil
int dbg = GDKdebug;
int fd;
- GDKdebug &= ~(CHECKMASK|PROPMASK);
+ GDKdebug &= ~CHECKMASK;
if (lg->lg->debug & 1) {
fprintf(stderr, "#logger_readlog opening %s\n", filename);
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -57,7 +57,7 @@ mal_export stream *maleventstream;
*/
#define GRPthreads (THRDMASK | PARMASK)
#define GRPmemory (ALLOCMASK )
-#define GRPproperties (CHECKMASK | PROPMASK | BATMASK )
+#define GRPproperties (CHECKMASK )
#define GRPio (IOMASK | PERFMASK )
#define GRPheaps (HEAPMASK)
#define GRPtransactions (TMMASK | DELTAMASK | TEMMASK)
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
@@ -855,7 +855,7 @@ str runMALsequence(Client cntxt, MalBlkP
lhs->val.pval != stk->stk[getArg(pci,
i)].val.pval)
GDKfree(lhs->val.pval);
}
- if (GDKdebug & (CHECKMASK|PROPMASK) && exceptionVar <
0) {
+ if (GDKdebug & CHECKMASK && exceptionVar < 0) {
BAT *b;
for (i = 0; i < pci->retc; i++) {
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -136,7 +136,7 @@ The
together with the
.B =
sign is optional. If not specified, it defaults to
-.BR 1 .
+.BR 2 .
In the short form \fB\-d\fP, the value, if present, must immediately
(i.e. without space) follow the option.
The values of multiple instances of this flag are OR-ed together.
@@ -147,11 +147,7 @@ The value is an integer, which can be (a
(THRDMASK) thread-specific debug output
.TP
.B 2
-(CHECKMASK) property enforcing on new BATs
-.TP
-.B 8
-(PROPMASK) property checking on all values:
-tells about wrongly set properties
+(CHECKMASK) property checking on new BATs
.TP
.B 16
(IOMASK) major IO activity
@@ -245,7 +241,7 @@ Equivalent to \fB\-\-debug=\fP\fI(LOADMA
Equivalent to \fB\-\-debug=\fP\fI(DEADBEEFMASK)\fP.
.TP
.B \-\-properties
-Equivalent to \fB\-\-debug=\fP\fI(CHECKMASK | PROPMASK | BATMASK)\fP.
+Equivalent to \fB\-\-debug=\fP\fI(CHECKMASK)\fP.
.TP
.B \-\-threads
Equivalent to \fB\-\-debug=\fP\fI(THRDMASK | PARMASK)\fP.
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -524,7 +524,7 @@ main(int argc, char **av)
usage(prog, -1);
}
} else {
- debug |= 1;
+ debug |= CHECKMASK;
}
break;
case 'r':
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
