A few small BSD related fixes.
This commit is contained in:
parent
01e95705f8
commit
ac834d237a
@ -175,7 +175,7 @@ else
|
||||
endif
|
||||
|
||||
.make-arch:
|
||||
-(cd ../deps && make $(DEPENDENCY_TARGETS) ARCH="$(ARCH)")
|
||||
-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS) ARCH="$(ARCH)")
|
||||
-(echo $(ARCH) > .make-arch)
|
||||
|
||||
# Clean local objects when allocator changes
|
||||
|
1
src/ae.c
1
src/ae.c
@ -35,6 +35,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "ae.h"
|
||||
#include "zmalloc.h"
|
||||
|
16
src/debug.c
16
src/debug.c
@ -389,6 +389,14 @@ void _redisPanic(char *msg, char *file, int line) {
|
||||
#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
|
||||
static void *getMcontextEip(ucontext_t *uc) {
|
||||
#if defined(__FreeBSD__)
|
||||
@ -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--) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user