[vlc-devel] [PATCH 0/3] input/decoder.c deadlock

Thomas Guillem thomas at gllm.fr
Tue Oct 10 11:37:33 CEST 2017


This set of patches fix the deadlock described in #16100

I also tried to simplify decoder.c by merging the 2 locks. I don't see any
advantages of having 2 locks here. I think that there were 2 locks because of
the vlc_fifo (that owns one).

One question: Do we want to also merge the conditions variables ?

Having one condition for the decoder thread and one other for the input thread
is enough but will induce more spurious wake and doesn't make necessarily the
code less complex..

Thomas Guillem (3):
  decoder: rename wait_fifo to wait_fifo_consumed
  decoder: merge the decoder lock and the fifo lock
  decoder: fix occasional deadlock on seek

 src/input/decoder.c | 207 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 136 insertions(+), 71 deletions(-)

-- 
2.11.0



More information about the vlc-devel mailing list