Changeset: 6717012ea7f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6717012ea7f2
Modified Files:
common/utils/msabaoth.c
common/utils/msabaoth.h
monetdb5/mal/mal_session.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/utils/database.c
Branch: Nov2019
Log Message:
Use bool for sabaoth locked flag.
diffs (191 lines):
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -671,11 +671,7 @@ msab_getSingleStatus(const char *pathbuf
}
}
snprintf(buf, sizeof(buf), "%s/%s/%s", pathbuf, dbname,
MAINTENANCEFILE);
- if (stat(buf, &statbuf) == -1) {
- sdb->locked = 0;
- } else {
- sdb->locked = 1;
- }
+ sdb->locked = stat(buf, &statbuf) != -1;
/* add scenarios that are supported */
sdb->scens = NULL;
diff --git a/common/utils/msabaoth.h b/common/utils/msabaoth.h
--- a/common/utils/msabaoth.h
+++ b/common/utils/msabaoth.h
@@ -27,7 +27,7 @@ typedef enum {
typedef struct Ssabdb {
char *dbname; /* database name */
char *path; /* path to this database */
- int locked; /* whether this database is under maintenance
*/
+ bool locked; /* whether this database is under maintenance
*/
SABdbState state; /* current database state */
sablist* scens; /* scenarios available for this database */
sablist* conns; /* connections available for this database */
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -295,7 +295,7 @@ MSscheduleClient(str command, str challe
GDKfree(command);
return;
}
- if (stats->locked == 1) {
+ if (stats->locked) {
if (uid == 0) {
mnstr_printf(fout, "#server is running
in "
"maintenance
mode\n");
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -304,7 +304,7 @@ printStatus(sabdb *stats, int mode, int
break;
}
/* override if locked for brevity */
- if (stats->locked == 1)
+ if (stats->locked)
locked = 'L';
info[0] = '\0';
@@ -388,7 +388,7 @@ printStatus(sabdb *stats, int mode, int
printf(" connection uri: %s\n", stats->uri);
printf(" database name: %s\n", stats->dbname);
printf(" state: %s\n", state);
- printf(" locked: %s\n", stats->locked == 1 ? "yes" : "no");
+ printf(" locked: %s\n", stats->locked ? "yes" : "no");
entry = stats->scens;
printf(" scenarios:");
if (entry == NULL) {
@@ -470,7 +470,7 @@ printStatus(sabdb *stats, int mode, int
snprintf(buf, sizeof(buf), "unknown");
break;
}
- if (stats->locked == 1)
+ if (stats->locked)
strcat(buf, ", locked");
printf("database %s, %s\n", stats->dbname, buf);
printf(" crash average: %d.00 %.2f %.2f (over 1, 15, 30
starts) "
@@ -759,7 +759,7 @@ command_status(int argc, char *argv[])
/* perform selection based on state (and order at the same time) */
for (p = &state[strlen(state) - 1]; p >= state; p--) {
- int curLock = 0;
+ bool curLock = false;
SABdbState curMode = SABdbIllegal;
switch (*p) {
case 'b':
@@ -775,15 +775,15 @@ command_status(int argc, char *argv[])
curMode = SABdbCrashed;
break;
case 'l':
- curLock = 1;
+ curLock = true;
break;
}
stats = orig;
prev = NULL;
while (stats != NULL) {
if (stats->locked == curLock &&
- (curLock == 1 ||
- (curLock == 0 && stats->state ==
curMode)))
+ (curLock ||
+ (!curLock && stats->state == curMode)))
{
sabdb *next = stats->next;
stats->next = neworig;
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
@@ -62,7 +62,7 @@ leavedbS(sabdb *stats)
char *shared;
readProps(props, stats->path);
shared = getConfVal(props, "shared");
- if (stats->locked != 1 && (shared == NULL || strcmp(shared, "no") != 0))
+ if (!stats->locked && (shared == NULL || strcmp(shared, "no") != 0))
leavedb(stats->dbname);
freeConfFile(props);
free(props);
@@ -76,7 +76,7 @@ setURI(sabdb *stats)
char *shared;
readProps(props, stats->path);
shared = getConfVal(props, "shared");
- if (stats->locked != 1 && (shared == NULL || strcmp(shared, "no") !=
0)) {
+ if (!stats->locked && (shared == NULL || strcmp(shared, "no") != 0)) {
snprintf(_internal_uri_buf, sizeof(_internal_uri_buf),
"mapi:monetdb://%s:%u/%s%s%s",
_mero_hostname,
@@ -98,7 +98,7 @@ anncdbS(sabdb *stats)
char *shared;
readProps(props, stats->path);
shared = getConfVal(props, "shared");
- if (stats->locked != 1 && (shared == NULL || strcmp(shared, "no") !=
0)) {
+ if (!stats->locked && (shared == NULL || strcmp(shared, "no") != 0)) {
snprintf(buf, sizeof(buf),
"ANNC %s%s%s mapi:monetdb://%s:%u/ %d",
stats->dbname,
diff --git a/tools/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -187,7 +187,7 @@ getRemoteDB(char *database)
}
walk->dbname = strdup(rdb->dbname);
walk->path = walk->dbname; /* only freed by sabaoth */
- walk->locked = 0;
+ walk->locked = false;
walk->state = SABdbRunning;
walk->scens = malloc(sizeof(sablist));
walk->scens->val = strdup("sql");
@@ -343,7 +343,7 @@ discoveryRunner(void *d)
kv = findConfKey(ckv, "shared");
val = kv->val == NULL ? "" : kv->val;
/* skip databases under maintenance */
- if (strcmp(val, "no") != 0 && stats->locked !=
1) {
+ if (strcmp(val, "no") != 0 && !stats->locked) {
/* craft ANNC message for this db */
if (strcmp(val, "yes") == 0)
val = "";
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
@@ -276,7 +276,7 @@ forkMserver(char *database, sabdb** stat
if (kv->val == NULL)
kv = findConfKey(_mero_db_props, "type");
- if ((*stats)->locked == 1) {
+ if ((*stats)->locked) {
if (force == 0) {
Mfprintf(stdout, "%s '%s' is under maintenance\n",
kv->val, database);
@@ -808,7 +808,7 @@ forkMserver(char *database, sabdb** stat
}
}
- if ((*stats)->locked == 1) {
+ if ((*stats)->locked) {
Mfprintf(stdout, "database '%s' has been put into
maintenance "
"mode during startup\n", database);
}
diff --git a/tools/merovingian/utils/database.c
b/tools/merovingian/utils/database.c
--- a/tools/merovingian/utils/database.c
+++ b/tools/merovingian/utils/database.c
@@ -315,7 +315,7 @@ char* db_lock(char *dbname) {
return(strdup(buf));
}
- if (stats->locked == 1) {
+ if (stats->locked) {
msab_freeStatus(&stats);
snprintf(buf, sizeof(buf), "database '%s' already is "
"under maintenance", dbname);
@@ -354,7 +354,7 @@ char *db_release(char *dbname) {
return(strdup(buf));
}
- if (stats->locked != 1) {
+ if (!stats->locked) {
msab_freeStatus(&stats);
snprintf(buf, sizeof(buf), "database '%s' is not "
"under maintenance", dbname);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
