Changeset: cf2eb42961ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf2eb42961ee
Modified Files:
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
Branch: Jun2016
Log Message:
Declare variables as volatile since they're set in other threads.
diffs (29 lines):
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -99,9 +99,9 @@ dpair _mero_topdp = NULL;
/* lock to _mero_topdp, initialised as recursive lateron */
pthread_mutex_t _mero_topdp_lock;
/* for the logger, when set to 0, the logger terminates */
-int _mero_keep_logging = 1;
+volatile int _mero_keep_logging = 1;
/* for accepting connections, when set to 0, listening socket terminates */
-char _mero_keep_listening = 1;
+volatile char _mero_keep_listening = 1;
/* stream to where to write the log */
FILE *_mero_logfile = NULL;
/* stream to the stdout for the neighbour discovery service */
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -64,8 +64,8 @@ typedef struct _dpair {
extern char *_mero_mserver;
extern dpair _mero_topdp;
extern pthread_mutex_t _mero_topdp_lock;
-extern int _mero_keep_logging;
-extern char _mero_keep_listening;
+extern volatile int _mero_keep_logging;
+extern volatile char _mero_keep_listening;
extern FILE *_mero_logfile;
extern unsigned short _mero_port;
extern FILE *_mero_discout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
