Changeset: 3b5b2e290f89 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b5b2e290f89
Modified Files:
tools/merovingian/daemon/client.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/forkmserver.h
Branch: Nov2019
Log Message:
Use bool in forkMserver.
diffs (84 lines):
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -273,7 +273,7 @@ handleClient(void *data)
}
}
- if ((e = forkMserver(database, &top, 0)) != NO_ERR) {
+ if ((e = forkMserver(database, &top, false)) != NO_ERR) {
if (top == NULL) {
mnstr_printf(fout, "!monetdbd: no such database '%s',
please create it first\n", database);
} else {
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -327,7 +327,7 @@ static void ctl_handle_client(
msab_freeStatus(&stats);
}
- if ((e = forkMserver(q, &stats, 1)) != NO_ERR) {
+ if ((e = forkMserver(q, &stats, true)) !=
NO_ERR) {
Mfprintf(_mero_ctlerr, "%s: failed to
fork mserver: "
"%s\n", origin,
getErrMsg(e));
len = snprintf(buf2, sizeof(buf2),
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -181,7 +181,7 @@ terminateProcess(pid_t pid, char *dbname
#define MAX_NR_ARGS 511
err
-forkMserver(char *database, sabdb** stats, int force)
+forkMserver(char *database, sabdb** stats, bool force)
{
pid_t pid;
char *er;
@@ -205,7 +205,7 @@ forkMserver(char *database, sabdb** stat
char listenaddr[512];
char muri[512]; /* possibly undersized */
char usock[512];
- char mydoproxy;
+ bool mydoproxy;
char nthreads[32];
char nclients[32];
char pipeline[512];
@@ -277,7 +277,7 @@ forkMserver(char *database, sabdb** stat
kv = findConfKey(_mero_db_props, "type");
if ((*stats)->locked) {
- if (force == 0) {
+ if (!force) {
Mfprintf(stdout, "%s '%s' is under maintenance\n",
kv->val, database);
freeConfFile(ckv);
@@ -525,7 +525,7 @@ forkMserver(char *database, sabdb** stat
kv = findConfKey(ckv, "listenaddr");
if (kv->val != NULL) {
- if (mydoproxy == 1) {
+ if (mydoproxy) {
// listenaddr is only available on forwarding method
freeConfFile(ckv);
free(ckv);
@@ -557,7 +557,7 @@ forkMserver(char *database, sabdb** stat
"--dbextra=%s", dbextra);
argv[c++] = dbextra_path;
}
- if (mydoproxy == 1) {
+ if (mydoproxy) {
struct sockaddr_un s; /* only for sizeof(s.sun_path) :( */
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
/* we "proxy", so we can just solely use UNIX domain sockets
diff --git a/tools/merovingian/daemon/forkmserver.h
b/tools/merovingian/daemon/forkmserver.h
--- a/tools/merovingian/daemon/forkmserver.h
+++ b/tools/merovingian/daemon/forkmserver.h
@@ -12,7 +12,7 @@
#include "msabaoth.h" /* sabdb */
#include "merovingian.h" /* err */
-err forkMserver(char* database, sabdb** stats, int force);
+err forkMserver(char* database, sabdb** stats, bool force);
err fork_profiler(char *database, sabdb **stats, char **log_path);
err shutdown_profiler(char *dbname, sabdb **stats);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
