Changeset: d377db15b23c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d377db15b23c
Modified Files:
tools/Makefile.ag
tools/mserver/mserver5.c
Branch: strip
Log Message:
Stripped: Minimal mserver
diffs (291 lines):
diff --git a/tools/Makefile.ag b/tools/Makefile.ag
--- a/tools/Makefile.ag
+++ b/tools/Makefile.ag
@@ -15,4 +15,4 @@
# Copyright August 2008-2015 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = HAVE_MONETDB5?mserver
+SUBDIRS = mserver
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -86,46 +86,19 @@ usage(char *prog, int xit)
{
fprintf(stderr, "Usage: %s [options] [scripts]\n", prog);
fprintf(stderr, " --dbpath=<directory> Specify database
location\n");
- fprintf(stderr, " --dbextra=<directory> Directory for transient
BATs\n");
- fprintf(stderr, " --dbinit=<stmt> Execute statement at
startup\n");
- fprintf(stderr, " --config=<config_file> Use config_file to read
options from\n");
- fprintf(stderr, " --daemon=yes|no Do not read commands
from standard input [no]\n");
- fprintf(stderr, " --single-user Allow only one user at a
time\n");
fprintf(stderr, " --readonly Safeguard database\n");
fprintf(stderr, " --set <option>=<value> Set configuration
option\n");
fprintf(stderr, " --help Print this list of
options\n");
fprintf(stderr, " --version Print version and
compile time info\n");
-
- fprintf(stderr, "The debug, testing & trace options:\n");
- fprintf(stderr, " --threads\n");
- fprintf(stderr, " --memory\n");
- fprintf(stderr, " --io\n");
- fprintf(stderr, " --heaps\n");
- fprintf(stderr, " --properties\n");
- fprintf(stderr, " --transactions\n");
- fprintf(stderr, " --modules\n");
- fprintf(stderr, " --algorithms\n");
- fprintf(stderr, " --performance\n");
- fprintf(stderr, " --optimizers\n");
- fprintf(stderr, " --trace[=<stethoscope flags>]\n");
- fprintf(stderr, " --forcemito\n");
- fprintf(stderr, " --recycler\n");
- fprintf(stderr, " --debug=<bitmask>\n");
-
exit(xit);
}
static void
monet_hello(void)
{
-#ifdef MONETDB_STATIC
- char *linkinfo = "statically";
-#else
- char *linkinfo = "dynamically";
-#endif
dbl sz_mem_h;
- char *qc = " kMGTPE";
+ //char *qc = " kMGTPE";
int qi = 0;
monet_memory = MT_npages() * MT_pagesize();
@@ -135,15 +108,15 @@ monet_hello(void)
qi++;
}
- printf("# MonetDB 5 server v" VERSION);
+ printf("MonetDB v" VERSION);
/* coverity[pointless_string_compare] */
if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
- printf("\n# This is an unreleased version");
+ printf(" (unreleased)");
else
printf(" \"%s\"", MONETDB_RELEASE);
- printf("\n# Serving database '%s', using %d thread%s\n",
- GDKgetenv("gdk_dbname"),
- GDKnr_threads, (GDKnr_threads != 1) ? "s" : "");
+ printf(" serving %s\n",
+ GDKgetenv("gdk_dbpath"));
+ /*
printf("# Compiled for %s/" SZFMT "bit with " SZFMT "bit OIDs %s%s
linked\n",
HOST, sizeof(ptr) * 8, sizeof(oid) * 8,
#ifdef HAVE_HGE
@@ -153,14 +126,9 @@ monet_hello(void)
#endif
linkinfo);
printf("# Found %.3f %ciB available main-memory.\n",
- sz_mem_h, qc[qi]);
-#ifdef MONET_GLOBAL_DEBUG
- printf("# Database path:%s\n", GDKgetenv("gdk_dbpath"));
- printf("# Module path:%s\n", GDKgetenv("monet_mod_path"));
-#endif
- printf("# Copyright (c) 1993-July 2008 CWI.\n");
- printf("# Copyright (c) August 2008-2015 MonetDB B.V., all rights
reserved\n");
- printf("# Visit http://www.monetdb.org/ for further information\n");
+ sz_mem_h, qc[qi]);*/
+ printf("Copyright (c) 1993-July 2008 CWI, August 2008-2015 MonetDB
B.V., all rights reserved\n");
+ //printf("# Visit http://www.monetdb.org/ for further information\n");
}
static str
@@ -215,7 +183,7 @@ main(int argc, char **av)
{
char *prog = *av;
opt *set = NULL;
- int idx = 0, grpdebug = 0, debug = 0, setlen = 0, listing = 0, i = 0;
+ int idx = 0, grpdebug = 0, debug = 0, setlen = 0, listing = 0;
str dbinit = NULL;
str err = MAL_SUCCEED;
char prmodpath[1024];
@@ -225,30 +193,11 @@ main(int argc, char **av)
char *dbextra = NULL;
static struct option long_options[] = {
- { "config", 1, 0, 'c' },
{ "dbpath", 1, 0, 0 },
- { "dbextra", 1, 0, 0 },
- { "dbinit", 1, 0, 0 } ,
- { "daemon", 1, 0, 0 },
- { "debug", 2, 0, 'd' },
{ "help", 0, 0, '?' },
{ "version", 0, 0, 0 },
{ "readonly", 0, 0, 'r' },
- { "single-user", 0, 0, 0 },
{ "set", 1, 0, 's' },
- { "threads", 0, 0, 0 },
- { "memory", 0, 0, 0 },
- { "properties", 0, 0, 0 },
- { "io", 0, 0, 0 },
- { "transactions", 0, 0, 0 },
- { "trace", 2, 0, 't' },
- { "modules", 0, 0, 0 },
- { "algorithms", 0, 0, 0 },
- { "optimizers", 0, 0, 0 },
- { "performance", 0, 0, 0 },
- { "forcemito", 0, 0, 0 },
- { "recycler", 0, 0, 0 },
- { "heaps", 0, 0, 0 },
{ 0, 0, 0, 0 }
};
@@ -311,106 +260,12 @@ main(int argc, char **av)
setlen = mo_add_option(&set, setlen,
opt_cmdline, "gdk_dbpath", optarg);
break;
}
- if (strcmp(long_options[option_index].name, "dbextra")
== 0) {
- if (dbextra)
- fprintf(stderr, "#warning: ignoring
multiple --dbextra arguments\n");
- else
- dbextra = optarg;
- break;
- }
- if (strcmp(long_options[option_index].name, "dbinit")
== 0) {
- if (dbinit)
- fprintf(stderr, "#warning: ignoring
multiple --dbinit argument\n");
- else
- dbinit = optarg;
- break;
- }
-#ifdef HAVE_CONSOLE
- if (strcmp(long_options[option_index].name, "daemon")
== 0) {
- setlen = mo_add_option(&set, setlen,
opt_cmdline, "monet_daemon", optarg);
- break;
- }
-#endif
- if (strcmp(long_options[option_index].name,
"single-user") == 0) {
- setlen = mo_add_option(&set, setlen,
opt_cmdline, "gdk_single_user", "yes");
- break;
- }
if (strcmp(long_options[option_index].name, "version")
== 0) {
monet_version();
exit(0);
}
- /* debugging options */
- if (strcmp(long_options[option_index].name,
"properties") == 0) {
- grpdebug |= GRPproperties;
- break;
- }
- if (strcmp(long_options[option_index].name,
"algorithms") == 0) {
- grpdebug |= GRPalgorithms;
- break;
- }
- if (strcmp(long_options[option_index].name,
"optimizers") == 0) {
- grpdebug |= GRPoptimizers;
- break;
- }
- if (strcmp(long_options[option_index].name,
"forcemito") == 0) {
- grpdebug |= GRPforcemito;
- break;
- }
- if (strcmp(long_options[option_index].name, "recycler")
== 0) {
- grpdebug |= GRPrecycler;
- break;
- }
- if (strcmp(long_options[option_index].name,
"performance") == 0) {
- grpdebug |= GRPperformance;
- break;
- }
- if (strcmp(long_options[option_index].name, "io") == 0)
{
- grpdebug |= GRPio;
- break;
- }
- if (strcmp(long_options[option_index].name, "memory")
== 0) {
- grpdebug |= GRPmemory;
- break;
- }
- if (strcmp(long_options[option_index].name, "modules")
== 0) {
- grpdebug |= GRPmodules;
- break;
- }
- if (strcmp(long_options[option_index].name,
"transactions") == 0) {
- grpdebug |= GRPtransactions;
- break;
- }
- if (strcmp(long_options[option_index].name, "threads")
== 0) {
- grpdebug |= GRPthreads;
- break;
- }
- if (strcmp(long_options[option_index].name, "trace") ==
0) {
- mal_trace = optarg? optarg:"ISTest";
- break;
- }
- if (strcmp(long_options[option_index].name, "heaps") ==
0) {
- grpdebug |= GRPheaps;
- break;
- }
usage(prog, -1);
- /* not reached */
- case 'c':
- /* coverity[var_deref_model] */
- setlen = mo_add_option(&set, setlen, opt_cmdline,
"config", optarg);
- break;
- case 'd':
- if (optarg) {
- char *endarg;
- debug |= strtol(optarg, &endarg, 10);
- if (*endarg != '\0') {
- fprintf(stderr, "ERROR: wrong format
for --debug=%s\n",
- optarg);
- usage(prog, -1);
- }
- } else {
- debug |= 1;
- }
- break;
+
case 'r':
setlen = mo_add_option(&set, setlen, opt_cmdline,
"gdk_readonly", "yes");
break;
@@ -426,9 +281,6 @@ main(int argc, char **av)
fprintf(stderr, "ERROR: wrong format %s\n",
optarg);
}
break;
- case 't':
- mal_trace = optarg? optarg:"ISTest";
- break;
case '?':
/* a bit of a hack: look at the option that the
current `c' is based on and see if we recognize
@@ -631,19 +483,6 @@ main(int argc, char **av)
callString(mal_clients, dbinit, listing);
emergencyBreakpoint();
- if (monet_script)
- for (i = 0; monet_script[i]; i++) {
- str msg = evalFile(mal_clients, monet_script[i],
listing);
- /* check for internal exception message to terminate */
- if (msg) {
- if (strcmp(msg,
"MALException:client.quit:Server stopped.") == 0)
- mal_exit();
- fprintf(stderr, "#%s: %s\n", monet_script[i],
msg);
- GDKfree(msg);
- }
- GDKfree(monet_script[i]);
- monet_script[i] = 0;
- }
if ((err = msab_registerStarted()) != NULL) {
/* throw the error at the user, but don't die */
@@ -651,13 +490,6 @@ main(int argc, char **av)
free(err);
}
- if (monet_script)
- free(monet_script);
-#ifdef HAVE_CONSOLE
- if (!monet_daemon) {
- MSserveClient(mal_clients);
- } else
-#endif
while (1)
MT_sleep_ms(5000);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
