X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/a48c8d873bc2a49f66ab398ebed51dc45764ca17..a5bd08487ff22156cbaae9286ab8820172b35df7:/src/debug.c diff --git a/src/debug.c b/src/debug.c index 54920032..a355df05 100644 --- a/src/debug.c +++ b/src/debug.c @@ -314,8 +314,8 @@ void _redisAssert(char *estr, char *file, int line) { server.assert_file = file; server.assert_line = line; redisLog(REDIS_WARNING,"(forcing SIGSEGV to print the bug report.)"); - *((char*)-1) = 'x'; #endif + *((char*)-1) = 'x'; } void _redisAssertPrintClientInfo(redisClient *c) { @@ -384,9 +384,17 @@ void _redisPanic(char *msg, char *file, int line) { redisLog(REDIS_WARNING,"Guru Meditation: %s #%s:%d",msg,file,line); #ifdef HAVE_BACKTRACE redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)"); +#endif redisLog(REDIS_WARNING,"------------------------------------------------"); *((char*)-1) = 'x'; -#endif +} + +void bugReportStart(void) { + if (server.bug_report_start == 0) { + redisLog(REDIS_WARNING, + "\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ==="); + server.bug_report_start = 1; + } } #ifdef HAVE_BACKTRACE @@ -420,14 +428,6 @@ static void *getMcontextEip(ucontext_t *uc) { #endif } -void bugReportStart(void) { - if (server.bug_report_start == 0) { - redisLog(REDIS_WARNING, - "\n\n=== REDIS BUG REPORT START: Cut & paste starting from here ==="); - server.bug_report_start = 1; - } -} - void logStackContent(void **sp) { int i; for (i = 15; i >= 0; i--) {