Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dhtnet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
dhtnet
Commits
648907ca
Commit
648907ca
authored
1 year ago
by
François-Simon Fauteux-Chapleau
Committed by
Adrien Béraud
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
UPnPContext: fix deadlock during shutdown
GitLab:
#19
Change-Id: Id8adf0faca9e575ce035d7e9a1cc5744d92ef635
parent
423b25b2
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/upnp/upnp_context.cpp
+4
-0
4 additions, 0 deletions
src/upnp/upnp_context.cpp
with
4 additions
and
0 deletions
src/upnp/upnp_context.cpp
+
4
−
0
View file @
648907ca
...
...
@@ -112,6 +112,10 @@ UPnPContext::shutdown()
}
else
{
if
(
logger_
)
logger_
->
error
(
"Shutdown timed-out"
);
}
// NOTE: It's important to unlock mappingMutex_ here, otherwise we get a
// deadlock when the call to cv.wait_for() above times out before we return
// from proto->terminate() in shutdown(cv).
lk
.
unlock
();
if
(
ioContextRunner_
)
{
if
(
logger_
)
logger_
->
debug
(
"UPnPContext: stopping io_context thread {}"
,
fmt
::
ptr
(
this
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment