Changeset: 99bcc306c7aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99bcc306c7aa
Modified Files:
geom/lib/libgeom.c
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/sql_scenario.c
tools/mserver/mserver5.c
Branch: noconsole
Log Message:
startup messages don't have to start with #
diffs (139 lines):
diff --git a/geom/lib/libgeom.c b/geom/lib/libgeom.c
--- a/geom/lib/libgeom.c
+++ b/geom/lib/libgeom.c
@@ -23,7 +23,7 @@ libgeom_init(void)
{
initGEOS((GEOSMessageHandler) GDKerror, (GEOSMessageHandler) GDKerror);
GEOS_setWKBByteOrder(1); /* NDR (little endian) */
- printf("# MonetDB/GIS module loaded\n");
+ printf("MonetDB/GIS module loaded\n");
fflush(stdout); /* make merovingian see this *now* */
}
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -511,7 +511,7 @@ str RAPIprelude(void *ret) {
}
MT_lock_unset(&rapiLock);
- printf("# MonetDB/R module loaded\n");
+ printf("MonetDB/R module loaded\n");
}
return MAL_SUCCEED;
}
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -1023,7 +1023,7 @@ void setHeartbeat(int delay)
void initProfiler(void)
{
if( mal_trace)
- openProfilerStream(mal_clients[0].fdout,0);
+ openProfilerStream(GDKout, 0);
}
void initHeartbeat(void)
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -613,7 +613,7 @@ CLTsessions(Client cntxt, MalBlkPtr mb,
MT_lock_set(&mal_contextLock);
- for (c = mal_clients + (GDKgetenv_isyes("monet_daemon") != 0); c <
mal_clients + MAL_MAXCLIENTS; c++)
+ for (c = mal_clients; c < mal_clients + MAL_MAXCLIENTS; c++)
if (c->mode == RUNCLIENT) {
BUNappend(user, c->username, FALSE);
msg = MTIMEunix_epoch(&ts);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -433,7 +433,7 @@ static void SERVERannounce(struct in_add
free(buf);
else
/* announce that we're now reachable */
- printf("# Listening for connection requests on "
+ printf("Listening for connection requests on "
"mapi:monetdb://%s:%i/\n", host, port);
}
if (usockfile != NULL) {
@@ -442,7 +442,7 @@ static void SERVERannounce(struct in_add
free(buf);
else
/* announce that we're now reachable */
- printf("# Listening for UNIX domain connection requests
on "
+ printf("Listening for UNIX domain connection requests
on "
"mapi:monetdb://%s\n", usockfile);
}
}
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c
b/sql/backends/monet5/UDF/pyapi/pyapi.c
--- a/sql/backends/monet5/UDF/pyapi/pyapi.c
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.c
@@ -1288,7 +1288,7 @@ PyAPIprelude(void *ret) {
pyapiInitialized++;
}
MT_lock_unset(&pyapiLock);
- fprintf(stdout, "# MonetDB/Python module loaded\n");
+ fprintf(stdout, "MonetDB/Python module loaded\n");
option_disable_fork = GDKgetenv_istrue(fork_disableflag) ||
GDKgetenv_isyes(fork_disableflag);
return MAL_SUCCEED;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -169,7 +169,7 @@ SQLprelude(void *ret)
if (tmp != MAL_SUCCEED)
return (tmp);
#ifndef HAVE_EMBEDDED
- fprintf(stdout, "# MonetDB/SQL module loaded\n");
+ fprintf(stdout, "MonetDB/SQL module loaded\n");
fflush(stdout); /* make merovingian see this *now* */
#endif
/* only register availability of scenarios AFTER we are inited! */
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -139,16 +139,16 @@ monet_hello(void)
qi++;
}
- printf("# MonetDB 5 server v" VERSION);
+ printf("MonetDB 5 server v" VERSION);
/* coverity[pointless_string_compare] */
if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
- printf("\n# This is an unreleased version");
+ printf("\nThis is an unreleased version");
else
printf(" \"%s\"", MONETDB_RELEASE);
- printf("\n# Serving database '%s', using %d thread%s\n",
+ printf("\nServing database '%s', using %d thread%s\n",
GDKgetenv("gdk_dbname"),
GDKnr_threads, (GDKnr_threads != 1) ? "s" : "");
- printf("# Compiled for %s/" SZFMT "bit%s\n",
+ printf("Compiled for %s/" SZFMT "bit%s\n",
HOST, sizeof(ptr) * 8,
#ifdef HAVE_HGE
" with 128bit integers"
@@ -156,15 +156,15 @@ monet_hello(void)
""
#endif
);
- printf("# Found %.3f %ciB available main-memory.\n",
+ 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"));
+ 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-2017 MonetDB B.V., all rights
reserved\n");
- printf("# Visit http://www.monetdb.org/ for further information\n");
+ printf("Copyright (c) 1993-July 2008 CWI.\n");
+ printf("Copyright (c) August 2008-2017 MonetDB B.V., all rights
reserved\n");
+ printf("Visit http://www.monetdb.org/ for further information\n");
// The properties shipped through the performance profiler
len = snprintf(monet_characteristics, sizeof(monet_characteristics)-1,
"{\n\"version\":\"%s\",\n", VERSION);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
