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
f8660233
Commit
f8660233
authored
Sep 16, 2020
by
WuYunlong
Committed by
Oran Agra
Sep 16, 2020
Browse files
bio: doFastMemoryTest should try to kill io threads as well.
parent
8b70cb0e
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/debug.c
View file @
f8660233
...
...
@@ -1583,6 +1583,7 @@ static void killMainThread(void) {
static
void
killThreads
(
void
)
{
killMainThread
();
bioKillThreads
();
killIOThreads
();
}
void
doFastMemoryTest
(
void
)
{
...
...
src/networking.c
View file @
f8660233
...
...
@@ -3028,6 +3028,23 @@ void initThreadedIO(void) {
}
}
void killIOThreads(void) {
int err, j;
for (j = 0; j < server.io_threads_num; j++) {
if (io_threads[j] == pthread_self()) continue;
if (io_threads[j] && pthread_cancel(io_threads[j]) == 0) {
if ((err = pthread_join(io_threads[j],NULL)) != 0) {
serverLog(LL_WARNING,
"IO thread(tid:%lu) can not be joined: %s",
(unsigned long)io_threads[j], strerror(err));
} else {
serverLog(LL_WARNING,
"IO thread(tid:%lu) terminated",(unsigned long)io_threads[j]);
}
}
}
}
void startThreadedIO(void) {
if (tio_debug) { printf("S"); fflush(stdout); }
if (tio_debug) printf("--- STARTING THREADED IO ---\n");
...
...
src/server.h
View file @
f8660233
...
...
@@ -2478,6 +2478,7 @@ void mixDigest(unsigned char *digest, void *ptr, size_t len);
void xorDigest(unsigned char *digest, void *ptr, size_t len);
int populateCommandTableParseFlags(struct redisCommand *c, char *strflags);
void debugDelay(int usec);
void killIOThreads(void);
/* TLS stuff */
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