Re: [FFmpeg-devel] [PATCH] Make execute() and execute2() return FFMIN() of thread return codes

From: Anton Khirnov <anton@khirnov.net>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] Make execute() and execute2() return FFMIN() of thread return codes
Date: Sat, 18 Jun 2022 16:38:48 +0200
Message-ID: <165556312805.13099.8700038495542917682@lain> (raw)
In-Reply-To: <5183ed6eec9f945f54bd72907d52148d5e69d8a1.camel@acc.umu.se>

Quoting Tomas Härdin (2022-06-17 11:42:25)
> fre 2022-06-17 klockan 01:38 +0200 skrev Michael Niedermayer:
> > On Thu, Jun 16, 2022 at 11:04:01PM +0200, Tomas Härdin wrote:
> > > tor 2022-06-16 klockan 20:27 +0200 skrev Michael Niedermayer:
> > > > 
> > > > >  
> > > > >  void avpriv_slicethread_free(AVSliceThread **pctx)
> > > > > @@ -236,8 +244,8 @@ void avpriv_slicethread_free(AVSliceThread
> > > > > **pctx)
> > > > >  #else /* HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS32THREADS
> > > > > */
> > > > >  
> > > > >  int avpriv_slicethread_create(AVSliceThread **pctx, void
> > > > > *priv,
> > > > > -                              void (*worker_func)(void *priv,
> > > > > int
> > > > > jobnr, int threadnr, int nb_jobs, int nb_threads),
> > > > > -                              void (*main_func)(void *priv),
> > > > > +                              int (*worker_func)(void *priv,
> > > > > int
> > > > > jobnr, int threadnr, int nb_jobs, int nb_threads),
> > > > > +                              int (*main_func)(void *priv),
> > > > >                                int nb_threads)
> > > > >  {
> > > > >      *pctx = NULL;
> > > > 
> > > > You forgot to update the fallback code when threads are disabled
> > > 
> > > Uhm, the existing code just abort()s if threads are disabled? I'm
> > > not
> > > really sure if there anything that can or should be done there
> > 
> > Before your patches fate passes with --disable-pthreads
> > afterwards it will fail during build because the function mismatches,
> > the abort should not be reachable i hope
> 
> Updated patch attached
> 
> /Tomas
> 
> From e3729f70d016b8e5c9d1bdb6014506ddd8d4eb56 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@haerdin.se>
> Date: Thu, 16 Jun 2022 12:16:44 +0200
> Subject: [PATCH] Make execute() and execute2() return FFMIN() of thread return
>  codes
> 
> At the moment only fic.c actually checks return code of execute() hence the change to its FATE reference

Wait, how does this follow?

-- 
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".