Changeset: cdb967ed778f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdb967ed778f
Modified Files:
tools/merovingian/daemon/handlers.c
Branch: Jun2016
Log Message:
Avoid malloc in interrupt handler.
diffs (24 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
@@ -66,12 +66,17 @@ sigtostr(int sig)
void
handler(int sig)
{
+ char buf[64];
const char *signame = sigtostr(sig);
- if (signame == NULL) {
- Mfprintf(stdout, "caught signal %d, starting shutdown
sequence\n", sig);
+
+ strcpy(buf, "caught ");
+ if (signame) {
+ strcpy(buf + 7, signame);
} else {
- Mfprintf(stdout, "caught %s, starting shutdown sequence\n",
signame);
+ strcpy(buf + 7, "some signal");
}
+ strcpy(buf + strlen(buf), ", starting shutdown sequence\n");
+ write(1, buf, strlen(buf));
_mero_keep_listening = 0;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list