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
25725957
Unverified
Commit
25725957
authored
Apr 23, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 23, 2020
Browse files
Merge pull request #7121 from Dave-in-lafayette/patch-2
fix for crash during panic before all threads are up
parents
72f07519
80b6f9b0
Changes
1
Show whitespace changes
Inline
Side-by-side
src/bio.c
View file @
25725957
...
@@ -266,7 +266,7 @@ void bioKillThreads(void) {
...
@@ -266,7 +266,7 @@ void bioKillThreads(void) {
int
err
,
j
;
int
err
,
j
;
for
(
j
=
0
;
j
<
BIO_NUM_OPS
;
j
++
)
{
for
(
j
=
0
;
j
<
BIO_NUM_OPS
;
j
++
)
{
if
(
pthread_cancel
(
bio_threads
[
j
])
==
0
)
{
if
(
bio_threads
[
j
]
&&
pthread_cancel
(
bio_threads
[
j
])
==
0
)
{
if
((
err
=
pthread_join
(
bio_threads
[
j
],
NULL
))
!=
0
)
{
if
((
err
=
pthread_join
(
bio_threads
[
j
],
NULL
))
!=
0
)
{
serverLog
(
LL_WARNING
,
serverLog
(
LL_WARNING
,
"Bio thread for job type #%d can be joined: %s"
,
"Bio thread for job type #%d can be joined: %s"
,
...
...
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