RepoMirrors
/
mediamtx
mirror of https://github.com/bluenviron/mediamtx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deadlock when sourceOnDemand is true and source exits

This commit is contained in:
aler9 2022-08-16 11:20:02 +02:00
parent 8c2b12a314
commit f5a031d72c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/core/path.go
View File

@ -460,12 +460,14 @@ func (pa *path) run() {
case req := <-pa.chSourceStaticSetNotReady:
pa.sourceSetNotReady()
// send response before calling onDemandStaticSourceStop()
// in order to avoid a deadlock due to sourceStatic.stop()
close(req.res)
if pa.hasOnDemandStaticSource() && pa.onDemandStaticSourceState != pathOnDemandStateInitial {
pa.onDemandStaticSourceStop()
}
close(req.res)
if pa.shouldClose() {
return fmt.Errorf("not in use")
}
@ -975,7 +977,7 @@ func (pa *path) sourceStaticSetReady(sourceStaticCtx context.Context, req pathSo
// this avoids:
// - invalid requests sent after the source has been terminated
// - freezes caused by <-done inside stop()
// - deadlocks caused by <-done inside stop()
case <-sourceStaticCtx.Done():
req.res <- pathSourceStaticSetReadyRes{err: fmt.Errorf("terminated")}
}
@ -991,7 +993,7 @@ func (pa *path) sourceStaticSetNotReady(sourceStaticCtx context.Context, req pat
// this avoids:
// - invalid requests sent after the source has been terminated
// - freezes caused by <-done inside stop()
// - deadlocks caused by <-done inside stop()
case <-sourceStaticCtx.Done():
close(req.res)
}