Produce the watchlog warning log in a way that is safer from a signal handler. Fix...

diff --git a/src/debug.c b/src/debug.c
index 30fb00915982dbf37e51bc97df30444db16aa07f..49c76824d2223c66a6a7804006bf702d43a46ab8 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -559,10 +559,11 @@ void logRegisters(ucontext_t *uc) {
 }
 
 /* Logs the stack trace using the backtrace() call. */
 }
 
 /* Logs the stack trace using the backtrace() call. */

-void logStackTrace(ucontext_t *uc) {
+sds getStackTrace(ucontext_t *uc) {

     void *trace[100];
     int i, trace_size = 0;
     char **messages = NULL;
     void *trace[100];
     int i, trace_size = 0;
     char **messages = NULL;

+    sds st = sdsempty();

 
     /* Generate the stack trace */
     trace_size = backtrace(trace, 100);
 
     /* Generate the stack trace */
     trace_size = backtrace(trace, 100);


@@ -572,9 +573,12 @@ void logStackTrace(ucontext_t *uc) {
         trace[1] = getMcontextEip(uc);
     }
     messages = backtrace_symbols(trace, trace_size);
         trace[1] = getMcontextEip(uc);
     }
     messages = backtrace_symbols(trace, trace_size);

-    redisLog(REDIS_WARNING, "--- STACK TRACE");
-    for (i=1; i<trace_size; ++i)
-        redisLog(REDIS_WARNING,"%s", messages[i]);
+    for (i=1; i<trace_size; ++i) {
+        st = sdscat(st,messages[i]);
+        st = sdscatlen(st,"\n",1);
+    }
+    zlibc_free(messages);
+    return st;

 }
 
 /* Log information about the "current" client, that is, the client that is
 }
 
 /* Log information about the "current" client, that is, the client that is


@@ -617,7 +621,7 @@ void logCurrentClient(void) {
 
 void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
     ucontext_t *uc = (ucontext_t*) secret;
 
 void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
     ucontext_t *uc = (ucontext_t*) secret;

-    sds infostring, clients;
+    sds infostring, clients, st;

     struct sigaction act;
     REDIS_NOTUSED(info);
 
     struct sigaction act;
     REDIS_NOTUSED(info);
 


@@ -629,7 +633,9 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
                         server.assert_file, server.assert_line);
 
     /* Log the stack trace */
                         server.assert_file, server.assert_line);
 
     /* Log the stack trace */

-    logStackTrace(uc);
+    st = getStackTrace(uc);
+    redisLog(REDIS_WARNING, "--- STACK TRACE\n%s", st);
+    sdsfree(st);

 
     /* Log INFO and CLIENT LIST */
     redisLog(REDIS_WARNING, "--- INFO OUTPUT");
 
     /* Log INFO and CLIENT LIST */
     redisLog(REDIS_WARNING, "--- INFO OUTPUT");


@@ -675,13 +681,28 @@ void watchdogSignalHandler(int sig, siginfo_t *info, void *secret) {
     ucontext_t *uc = (ucontext_t*) secret;
     REDIS_NOTUSED(info);
     REDIS_NOTUSED(sig);
     ucontext_t *uc = (ucontext_t*) secret;
     REDIS_NOTUSED(info);
     REDIS_NOTUSED(sig);

+    sds st, log;
+    time_t now = time(NULL);
+    char date[128];
+    FILE *fp;

 
 

-    /* Log INFO and CLIENT LIST */
-    redisLog(REDIS_WARNING, "--- WATCHDOG TIMER EXPIRED ---"); 
+    fp = (server.logfile == NULL) ? stdout : fopen(server.logfile,"a");
+    if (fp == NULL) return;
+
+    strftime(date,sizeof(date),"%d %b %H:%M:%S",localtime(&now));
+    log = sdscatprintf(sdsempty(),
+        "\n--- WATCHDOG TIMER EXPIRED (%s) ---\n",date); 

 #ifdef HAVE_BACKTRACE
 #ifdef HAVE_BACKTRACE

-    logStackTrace(uc);
-    redisLog(REDIS_WARNING, "------");
+    st = getStackTrace(uc);
+#else
+    st = sdsnew("Sorry: no support for backtrace().\n");

 #endif
 #endif

+    log = sdscatsds(log,st);
+    log = sdscat(log,"------\n\n");
+    fprintf(fp,"%s",log);
+    if (server.logfile) fclose(fp);
+    sdsfree(st);
+    sdsfree(log);

 }
 
 /* Schedule a SIGALRM delivery after the specified period in milliseconds.
 }
 
 /* Schedule a SIGALRM delivery after the specified period in milliseconds.

diff --git a/src/zmalloc.c b/src/zmalloc.c
index 970677355f26656742b8ffc1c3071ec6a5c3e264..5e5598cf1ce7a28c86daaaf3fcfcceb373786d9a 100644 (file)
--- a/src/zmalloc.c
+++ b/src/zmalloc.c
@@ -227,6 +227,10 @@ void zmalloc_enable_thread_safeness(void) {
     zmalloc_thread_safe = 1;
 }
 
     zmalloc_thread_safe = 1;
 }
 

+void zlibc_free(void *ptr) {
+    free(ptr);
+}
+

 /* Get the RSS information in an OS-specific way.
  *
  * WARNING: the function zmalloc_get_rss() is not designed to be fast
 /* Get the RSS information in an OS-specific way.
  *
  * WARNING: the function zmalloc_get_rss() is not designed to be fast

diff --git a/src/zmalloc.h b/src/zmalloc.h
index 995814c86bebd3cb6c40b27434d63c63b16a57bb..8079fb5319a0e568b8d64e0bc44c3c5117e3614b 100644 (file)
--- a/src/zmalloc.h
+++ b/src/zmalloc.h
@@ -75,6 +75,7 @@ size_t zmalloc_used_memory(void);
 void zmalloc_enable_thread_safeness(void);
 float zmalloc_get_fragmentation_ratio(void);
 size_t zmalloc_get_rss(void);
 void zmalloc_enable_thread_safeness(void);
 float zmalloc_get_fragmentation_ratio(void);
 size_t zmalloc_get_rss(void);

+void zlibc_free(void *ptr);

 
 #ifndef HAVE_MALLOC_SIZE
 size_t zmalloc_size(void *ptr);
 
 #ifndef HAVE_MALLOC_SIZE
 size_t zmalloc_size(void *ptr);