A few small BSD related fixes.

This commit is contained in:
antirez 2012-02-08 22:24:59 +01:00
parent 01e95705f8
commit ac834d237a
4 changed files with 11 additions and 10 deletions

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
TCL=tclsh8.5
which $TCL
if [ "$?" != "0" ]

View File

@ -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

View File

@ -35,6 +35,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include "ae.h"
#include "zmalloc.h"

View File

@ -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--) {