Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
9f50ce0d
Commit
9f50ce0d
authored
Feb 21, 2012
by
Salvatore Sanfilippo
Browse files
Merge pull request #346 from pietern/2.4-segv
Force SIGSEGV without HAVE_BACKTRACE (2.4)
parents
246c4c23
c39b8694
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.h
View file @
9f50ce0d
...
...
@@ -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
...
...
src/debug.c
View file @
9f50ce0d
...
...
@@ -359,7 +359,9 @@ void redisLogObjectDebugInfo(robj *o) {
}
void
_redisAssert
(
char
*
estr
,
char
*
file
,
int
line
)
{
#ifdef HAVE_BACKTRACE
bugReportStart
();
#endif
redisLog
(
REDIS_WARNING
,
"=== ASSERTION FAILED ==="
);
redisLog
(
REDIS_WARNING
,
"==> %s:%d '%s' is not true"
,
file
,
line
,
estr
);
#ifdef HAVE_BACKTRACE
...
...
@@ -367,16 +369,18 @@ 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
_redisPanic
(
char
*
msg
,
char
*
file
,
int
line
)
{
#ifdef HAVE_BACKTRACE
bugReportStart
();
#endif
redisLog
(
REDIS_WARNING
,
"!!! Software Failure. Press left mouse button to continue"
);
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)"
);
*
((
char
*
)
-
1
)
=
'x'
;
#endif
*
((
char
*
)
-
1
)
=
'x'
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment