From 57be47758e3203fe5e01c15895c4351206415024 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Tue, 21 Feb 2012 10:05:46 -0800 Subject: [PATCH 1/2] Also force SIGSEGV without HAVE_BACKTRACE --- src/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/debug.c b/src/debug.c index fe21531b..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,9 @@ 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) { From ca2344f9916f048667304bfa1e476fc52d1bc15d Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Tue, 21 Feb 2012 10:11:20 -0800 Subject: [PATCH 2/2] Solaris has backtrace(3) --- src/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.h b/src/config.h index f38ce872..323a3ddd 100644 --- a/src/config.h +++ b/src/config.h @@ -25,7 +25,7 @@ #endif /* Test for backtrace() */ -#if defined(__APPLE__) || defined(__linux__) +#if defined(__APPLE__) || defined(__linux__) || defined(__sun) #define HAVE_BACKTRACE 1 #endif