Tests for lua globals protection.

[redis.git] / src / debug.c

diff --git a/src/debug.c b/src/debug.c
index 2df913b071d333a3aa764b0b46271c2f61936367..e7b3ba407fd756adadba96b932caf56f2aad9853 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,19 @@ 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;

 
 

-    /* Log INFO and CLIENT LIST */
-    redisLog(REDIS_WARNING, "--- WATCHDOG TIMER EXPIRED ---"); 
+    log = sdsnew("\n--- WATCHDOG TIMER EXPIRED ---\n");

 #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");
+    redisLogFromHandler(REDIS_WARNING,log);
+    sdsfree(st);
+    sdsfree(log);

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


@@ -692,7 +704,7 @@ void watchdogScheduleSignal(int period) {
 
     /* Will stop the timer if period is 0. */
     it.it_value.tv_sec = period/1000;
 
     /* Will stop the timer if period is 0. */
     it.it_value.tv_sec = period/1000;

-    it.it_value.tv_usec = period%1000;
+    it.it_value.tv_usec = (period%1000)*1000;

     /* Don't automatically restart. */
     it.it_interval.tv_sec = 0;
     it.it_interval.tv_usec = 0;
     /* Don't automatically restart. */
     it.it_interval.tv_sec = 0;
     it.it_interval.tv_usec = 0;