Changeset: b254bc20bdc0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b254bc20bdc0 Modified Files: tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h Branch: Nov2019 Log Message:
Merge with Apr2019 branch. diffs (44 lines): diff --git a/tools/merovingian/daemon/handlers.c b/tools/merovingian/daemon/handlers.c --- a/tools/merovingian/daemon/handlers.c +++ b/tools/merovingian/daemon/handlers.c @@ -79,7 +79,7 @@ handler(int sig) /* we're not using a lock for setting, reading and clearing this flag * (deadlock!), but we should use atomic instructions */ -static volatile int hupflag = 0; +static volatile sig_atomic_t hupflag = 0; /** * Handler for SIGHUP, causes a re-read of the .merovingian_properties 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 @@ -106,7 +106,7 @@ pthread_mutex_t _mero_topdp_lock = PTHRE /* for the logger, when set to 0, the logger terminates */ volatile int _mero_keep_logging = 1; /* for accepting connections, when set to 0, listening socket terminates */ -volatile char _mero_keep_listening = 1; +volatile sig_atomic_t _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 @@ -11,6 +11,7 @@ #include <netinet/in.h> /* struct sockaddr_in */ #include <pthread.h> /* pthread_mutex_t */ +#include <signal.h> /* sig_atomic_t */ #include "utils/utils.h" /* confkeyval */ @@ -65,7 +66,7 @@ extern char *_mero_mserver; extern dpair _mero_topdp; extern pthread_mutex_t _mero_topdp_lock; extern volatile int _mero_keep_logging; -extern volatile char _mero_keep_listening; +extern volatile sig_atomic_t _mero_keep_listening; extern FILE *_mero_logfile; extern unsigned short _mero_port; extern FILE *_mero_discout; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
