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
1b3b7520
Unverified
Commit
1b3b7520
authored
Sep 20, 2020
by
Daniel Dai
Committed by
GitHub
Sep 20, 2020
Browse files
fix make warnings in debug.c MacOS (#7805)
Co-authored-by:
Oran Agra
<
oran@redislabs.com
>
parent
eabe3eae
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/debug.c
View file @
1b3b7520
...
@@ -1563,7 +1563,7 @@ int memtest_test_linux_anonymous_maps(void) {
...
@@ -1563,7 +1563,7 @@ int memtest_test_linux_anonymous_maps(void) {
closeDirectLogFiledes
(
fd
);
closeDirectLogFiledes
(
fd
);
return
errors
;
return
errors
;
}
}
#endif
#endif
/* HAVE_PROC_MAPS */
static
void
killMainThread
(
void
)
{
static
void
killMainThread
(
void
)
{
int
err
;
int
err
;
...
@@ -1580,7 +1580,7 @@ static void killMainThread(void) {
...
@@ -1580,7 +1580,7 @@ static void killMainThread(void) {
* should be used only when it's critical to stop the threads for some reason.
* should be used only when it's critical to stop the threads for some reason.
* Currently Redis does this only on crash (for instance on SIGSEGV) in order
* Currently Redis does this only on crash (for instance on SIGSEGV) in order
* to perform a fast memory check without other threads messing with memory. */
* to perform a fast memory check without other threads messing with memory. */
static
void
killThreads
(
void
)
{
void
killThreads
(
void
)
{
killMainThread
();
killMainThread
();
bioKillThreads
();
bioKillThreads
();
killIOThreads
();
killIOThreads
();
...
@@ -1600,7 +1600,7 @@ void doFastMemoryTest(void) {
...
@@ -1600,7 +1600,7 @@ void doFastMemoryTest(void) {
"Fast memory test PASSED, however your memory can still be broken. Please run a memory test for several hours if possible.
\n
"
);
"Fast memory test PASSED, however your memory can still be broken. Please run a memory test for several hours if possible.
\n
"
);
}
}
}
}
#endif
#endif
/* HAVE_PROC_MAPS */
}
}
/* Scans the (assumed) x86 code starting at addr, for a max of `len`
/* Scans the (assumed) x86 code starting at addr, for a max of `len`
...
...
src/server.h
View file @
1b3b7520
...
@@ -2488,6 +2488,7 @@ void xorDigest(unsigned char *digest, void *ptr, size_t len);
...
@@ -2488,6 +2488,7 @@ void xorDigest(unsigned char *digest, void *ptr, size_t len);
int
populateCommandTableParseFlags
(
struct
redisCommand
*
c
,
char
*
strflags
);
int
populateCommandTableParseFlags
(
struct
redisCommand
*
c
,
char
*
strflags
);
void
debugDelay
(
int
usec
);
void
debugDelay
(
int
usec
);
void
killIOThreads
(
void
);
void
killIOThreads
(
void
);
void
killThreads
(
void
);
/* TLS stuff */
/* TLS stuff */
void
tlsInit
(
void
);
void
tlsInit
(
void
);
...
...
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