[vlc-devel] [PATCH] preparser: remove wrong assertion

[Alexandre Janniaux]

Hi,

Merged!

Regards,
--
Alexandre Janniaux
Videolabs

On Tue, Nov 03, 2020 at 11:31:57AM +0100, Romain Vimont wrote:
> Assertion failure was reported on CI:
> > test_libvlc_media: preparser/preparser.c:291: Interrupt: Assertion `!atomic_load(&task->interrupted)' failed.
>
> The "interrupted" atomic flag set in Interrupt() may also be set
> asynchronously on timeout in Parse(). This is expected (and harmless),
> so just remove the assertion.
> ---
>  src/preparser/preparser.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/src/preparser/preparser.c b/src/preparser/preparser.c
> index e5bd0b87cb..255efc6ce1 100644
> --- a/src/preparser/preparser.c
> +++ b/src/preparser/preparser.c
> @@ -288,7 +288,6 @@ end:
>  static void
>  Interrupt(struct task *task)
>  {
> -    assert(!atomic_load(&task->interrupted));
>      atomic_store(&task->interrupted, true);
>
>      /* Wake up the preparser cond_wait */
> --
> 2.29.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel