Changeset: c85e8b28c130 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c85e8b28c130
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (153 lines):
diff -r da66132de105 -r c85e8b28c130 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mx Thu Oct 07 18:16:11 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mx Thu Oct 07 18:40:28 2010 +0200
@@ -2646,6 +2646,11 @@
gdk_export MT_Cond GDKunloadCond;
gdk_export MT_Lock GDKtmLock;
+/*
+ See `man monetdb5.conf` or MonetDB5/conf/monetdb5.conf.5
+ for a documentation of the following debug options.
+*/
+
#define CHECKMASK (1<<1)
#define CHECKDEBUG if (GDKdebug & CHECKMASK)
#define MEMMASK (1<<2)
diff -r da66132de105 -r c85e8b28c130 MonetDB5/conf/monetdb5.conf.5
--- a/MonetDB5/conf/monetdb5.conf.5 Thu Oct 07 18:16:11 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.5 Thu Oct 07 18:40:28 2010 +0200
@@ -90,6 +90,8 @@
for debugging (GDK developers, only)
134217728 = OPTMASK = trace the actions, decisions and
effects of MAL optimizers
+ 268435456 = EXTENDMASK = trace/debug HEAPextend;
+ used only for development & debugging
536870912 = FORCEMITOMASK = forcefully activate mitosis even on
small tables, i.e., split small tables
in as many (tiny) pieces as there are
@@ -102,6 +104,7 @@
used only for development & testing;
set automatically by Mtest.py
.EE
+
Note that mserver5 recognizes a series of command line options as well:
.EX
--threads (1 | PARMASK)
@@ -116,6 +119,7 @@
--optimizers (OPTMASK)
--forcemito (FORCEMITOMASK)
.EE
+
Default: 0
.SH "MONETDB5 PARAMETERS"
@@ -137,6 +141,7 @@
32 = List the hidden details
64 = List the bat tuple count
.EE
+
Default: 0
.SH "FILES"
monetdb5.conf
diff -r da66132de105 -r c85e8b28c130 MonetDB5/src/mal/mal.mx
--- a/MonetDB5/src/mal/mal.mx Thu Oct 07 18:16:11 2010 +0200
+++ b/MonetDB5/src/mal/mal.mx Thu Oct 07 18:40:28 2010 +0200
@@ -211,6 +211,11 @@
#define mal_up_sema(X,Y) if(GDKprotected) MT_up_sema(X,Y)
#define mal_down_sema(X,Y) if(GDKprotected) MT_down_sema(X,Y)
+/*
+ See MonetDB/src/gdk/gdk.mx for the definition of all debug masks.
+ See `man monetdb5.conf` or MonetDB5/conf/monetdb5.conf.5
+ for a documentation of all debug options.
+*/
#define GRPthreads ( 1 | PARMASK)
#define GRPmemory (MEMMASK | ALLOCMASK )
#define GRPproperties (CHECKMASK | PROPMASK | BATMASK )
diff -r da66132de105 -r c85e8b28c130
MonetDB5/src/tools/Tests/mserver5--help.stable.err
--- a/MonetDB5/src/tools/Tests/mserver5--help.stable.err Thu Oct 07
18:16:11 2010 +0200
+++ b/MonetDB5/src/tools/Tests/mserver5--help.stable.err Thu Oct 07
18:40:28 2010 +0200
@@ -21,7 +21,7 @@
--set <option>=<value> Set configuration option
--help Print this list of options
--version Print version and compile time info
-The trace options:
+The debug, testing & trace options:
--threads
--memory
--properties
@@ -34,6 +34,7 @@
--optimizers
--forcemito
--debug=<bitmask>
+(See `man monetdb5.conf` for the documentation.)
# 10:03:11 >
# 10:03:11 > Done.
diff -r da66132de105 -r c85e8b28c130
MonetDB5/src/tools/Tests/mserver5--help.stable.err.Windows
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/tools/Tests/mserver5--help.stable.err.Windows Thu Oct
07 18:40:28 2010 +0200
@@ -0,0 +1,41 @@
+stderr of test 'mserver5--help` in directory 'src/tools` itself:
+
+
+# 16:36:12 >
+# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help
+# 16:36:12 >
+
+
+# 16:36:12 >
+# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help
+# 16:36:12 >
+
+Usage: mserver5 [options] [scripts]
+ --dbname=<database_name> Specify database name
+ --dbfarm=<directory> Specify database location
+ --dbinit=<stmt> Execute statement at startup
+ --config=<config_file> Specify location of configuration file
+ --daemon=yes|no Do not read commands from standard input [no]
+ --single-user Allow only one user at a time
+ --readonly Safeguard database
+ --set <option>=<value> Set configuration option
+ --help Print this list of options
+ --version Print version and compile time info
+The debug, testing & trace options:
+ --threads
+ --memory
+ --properties
+ --io
+ --transactions
+ --modules
+ --algorithms
+ --xproperties
+ --performance
+ --optimizers
+ --forcemito
+ --debug=<bitmask>
+
+# 10:03:11 >
+# 10:03:11 > Done.
+# 10:03:11 >
+
diff -r da66132de105 -r c85e8b28c130 MonetDB5/src/tools/mserver5.mx
--- a/MonetDB5/src/tools/mserver5.mx Thu Oct 07 18:16:11 2010 +0200
+++ b/MonetDB5/src/tools/mserver5.mx Thu Oct 07 18:40:28 2010 +0200
@@ -143,7 +143,7 @@
fprintf(stderr, " --help Print this list of
options\n");
fprintf(stderr, " --version Print version and
compile time info\n");
- fprintf(stderr,"The trace options:\n");
+ fprintf(stderr,"The debug, testing & trace options:\n");
fprintf(stderr," --threads\n");
fprintf(stderr," --memory\n");
fprintf(stderr," --properties\n");
@@ -156,6 +156,9 @@
fprintf(stderr," --optimizers\n");
fprintf(stderr," --forcemito\n");
fprintf(stderr," --debug=<bitmask>\n");
+#ifndef NATIVE_WIN32
+ fprintf(stderr,"(See `man monetdb5.conf` for the documentation.)\n");
+#endif
exit(0);
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
