fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 16:51:12 +00:00
Code Issues Projects Releases Wiki Activity

some minor changes to the backtrace code

Browse Source
This commit is contained in:
antirez 2009-06-07 20:22:43 +02:00
parent e65fdc7838
commit d76412d1d1
2 changed files with 13 additions and 11 deletions

9
config.h

@ -1,10 +1,10 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
/* malloc_size() */ /* test for malloc_size() */
#ifdef __APPLE__ #ifdef __APPLE__
#include <malloc/malloc.h> #include <malloc/malloc.h>
#define HAVE_MALLOC_SIZE #define HAVE_MALLOC_SIZE 1
#define redis_malloc_size(p) malloc_size(p) #define redis_malloc_size(p) malloc_size(p)
#endif #endif
@ -17,4 +17,9 @@
#define redis_stat stat #define redis_stat stat
#endif #endif
/* test for backtrace() */
#if defined(__APPLE__) || defined(__linux__)
#define HAVE_BACKTRACE 1
#endif
#endif #endif

15
redis.c

@ -330,7 +330,6 @@ static int setExpire(redisDb *db, robj *key, time_t when);
static void updateSalvesWaitingBgsave(int bgsaveerr); static void updateSalvesWaitingBgsave(int bgsaveerr);
static void freeMemoryIfNeeded(void); static void freeMemoryIfNeeded(void);
static int processCommand(redisClient *c); static int processCommand(redisClient *c);
static void segvHandler(int sig, siginfo_t *info, void *secret);
static void setupSigSegvAction(void); static void setupSigSegvAction(void);
static void authCommand(redisClient *c); static void authCommand(redisClient *c);
@ -4108,7 +4107,7 @@ static void debugCommand(redisClient *c) {
} }
} }
#if defined(__APPLE__) || defined(__linux__) #ifdef HAVE_BACKTRACE
static struct redisFunctionSym symsTable[] = { static struct redisFunctionSym symsTable[] = {
{"freeStringObject", (unsigned long)freeStringObject}, {"freeStringObject", (unsigned long)freeStringObject},
{"freeListObject", (unsigned long)freeListObject}, {"freeListObject", (unsigned long)freeListObject},
@ -4192,7 +4191,6 @@ static struct redisFunctionSym symsTable[] = {
{"debugCommand", (unsigned long)debugCommand}, {"debugCommand", (unsigned long)debugCommand},
{"processCommand", (unsigned long)processCommand}, {"processCommand", (unsigned long)processCommand},
{"setupSigSegvAction", (unsigned long)setupSigSegvAction}, {"setupSigSegvAction", (unsigned long)setupSigSegvAction},
{"segvHandler", (unsigned long)segvHandler},
{"readQueryFromClient", (unsigned long)readQueryFromClient}, {"readQueryFromClient", (unsigned long)readQueryFromClient},
{NULL,0} {NULL,0}
}; };
@ -4274,7 +4272,7 @@ static void segvHandler(int sig, siginfo_t *info, void *secret) {
trace[1] = getMcontextEip(uc); trace[1] = getMcontextEip(uc);
messages = backtrace_symbols(trace, trace_size); messages = backtrace_symbols(trace, trace_size);
for (i=0; i<trace_size; ++i) { for (i=1; i<trace_size; ++i) {
char *fn = findFuncName(trace[i], &offset), *p; char *fn = findFuncName(trace[i], &offset), *p;
p = strchr(messages[i],'+'); p = strchr(messages[i],'+');
@ -4289,7 +4287,6 @@ static void segvHandler(int sig, siginfo_t *info, void *secret) {
} }
static void setupSigSegvAction(void) { static void setupSigSegvAction(void) {
#if defined(__APPLE__) || defined(__linux__)
struct sigaction act; struct sigaction act;
sigemptyset (&act.sa_mask); sigemptyset (&act.sa_mask);
@ -4299,12 +4296,12 @@ static void setupSigSegvAction(void) {
act.sa_sigaction = segvHandler; act.sa_sigaction = segvHandler;
sigaction (SIGSEGV, &act, NULL); sigaction (SIGSEGV, &act, NULL);
sigaction (SIGBUS, &act, NULL); sigaction (SIGBUS, &act, NULL);
#else
return; return;
#endif
} }
#else /* HAVE_BACKTRACE */
#endif /* if __APPLE__ or __linux__ */ static void setupSigSegvAction(void) {
}
#endif /* HAVE_BACKTRACE */
/* =================================== Main! ================================ */ /* =================================== Main! ================================ */