Recherche avancée

Sur d’autres sites (4250)

• Merge commit '2170017a1cd033b6f28e16476921022712a522d8'

  13 avril 2017, par James Almer

  Merge commit '2170017a1cd033b6f28e16476921022712a522d8'
  * commit '2170017a1cd033b6f28e16476921022712a522d8' :
  
    avutil : fix data race in av_get_cpu_flags()
  This commit is a noop, see fed50c4304eecb352e29ce789cdb96ea84d6162f
  Merged-by : James Almer <jamrial@gmail.com>
  

  • [DH] libavutil/Makefile

• How to port signal() to sigaction() ?

  28 septembre 2016, par Shark

  due to recent problems discovered with NDK12 and NDK13b2, i’m thinking of ’porting’ libx264’s use of signal() (and missing bsd_signal() in ndk12) to use sigaction() instead.

  The problem is, I’m not quite sure what’s the simple&fastest way to replace signal() calls with sigaction() ones.

  For all i see, it’s mainly used in x264-snapshot/common/cpu.c in the following manner :

  using the following signal handler :

  static void sigill_handler( int sig )
  
  {
  
      if( !canjump )
  
      {
  
          signal( sig, SIG_DFL );
  
          raise( sig );
  
      }
  
  
  
      canjump = 0;
  
      siglongjmp( jmpbuf, 1 );
  
  }

  This is the problematic x264_cpu_detect function... currently, i’m guessing i only need to tackle the ARM version, but i’ ; ; still have to replace all occurances of signal() with sigaction() so i might just cover both of them to get the thing building...

  FYI - the NDK13 beta2 still has "unstable" libc and the build doesn’t fail on this part, but rather the first invocation of the rand() function somewhere else... So i’m out of luck and replacing the signal() calls might be better than just waiting for the official NDK13 release. I’m doing this to get rid of text-relocations so i can run the library (and doubango) on API 24 (Android N)

  the problematic part of function that invokes signal() :

  #elif SYS_LINUX
  
  
  
  uint32_t x264_cpu_detect( void )
  
  {
  
      static void (*oldsig)( int );
  
  
  
      oldsig = signal( SIGILL, sigill_handler );
  
      if( sigsetjmp( jmpbuf, 1 ) )
  
      {
  
          signal( SIGILL, oldsig );
  
          return 0;
  
      }
  
  
  
      canjump = 1;
  
      asm volatile( "mtspr 256, %0\n\t"
  
                    "vand 0, 0, 0\n\t"
  
                    :
  
                    : "r"(-1) );
  
      canjump = 0;
  
  
  
      signal( SIGILL, oldsig );
  
  
  
      return X264_CPU_ALTIVEC;
  
  }
  
  #endif
  
  
  
  #elif ARCH_ARM
  
  
  
  void x264_cpu_neon_test( void );
  
  int x264_cpu_fast_neon_mrc_test( void );
  
  
  
  uint32_t x264_cpu_detect( void )
  
  {
  
      int flags = 0;
  
  #if HAVE_ARMV6
  
      flags |= X264_CPU_ARMV6;
  
  
  
      // don't do this hack if compiled with -mfpu=neon
  
  #if !HAVE_NEON
  
      static void (* oldsig)( int );
  
      oldsig = signal( SIGILL, sigill_handler );
  
      if( sigsetjmp( jmpbuf, 1 ) )
  
      {
  
          signal( SIGILL, oldsig );
  
          return flags;
  
      }
  
  
  
      canjump = 1;
  
      x264_cpu_neon_test();
  
      canjump = 0;
  
      signal( SIGILL, oldsig );
  
  #endif
  
  
  
      flags |= X264_CPU_NEON;
  
  
  
      // fast neon -> arm (Cortex-A9) detection relies on user access to the
  
      // cycle counter; this assumes ARMv7 performance counters.
  
      // NEON requires at least ARMv7, ARMv8 may require changes here, but
  
      // hopefully this hacky detection method will have been replaced by then.
  
      // Note that there is potential for a race condition if another program or
  
      // x264 instance disables or reinits the counters while x264 is using them,
  
      // which may result in incorrect detection and the counters stuck enabled.
  
      // right now Apple does not seem to support performance counters for this test
  
  #ifndef __MACH__
  
      flags |= x264_cpu_fast_neon_mrc_test() ? X264_CPU_FAST_NEON_MRC : 0;
  
  #endif
  
      // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast      mrc)
  
  #endif
  
      return flags;
  
  }
  
  
  
  #else
  
  
  
  uint32_t x264_cpu_detect( void )
  
  {
  
      return 0;
  
  }

  So the question is really this : what would be the quickest/easiest//fastest way to replace the signal() calls with sigaction() ones while preserving the current functionality ?

  EDIT :
  The reason i’m trying to get rid of signal() are these build errors :

  /home/devshark/SCRATCH/doubango/thirdparties/android/armv5te/lib/dist/libx264.a(cpu.o):cpu.c:function sigill_handler: error: undefined reference to 'bsd_signal'
  
  
  
  /home/devshark/SCRATCH/doubango/thirdparties/android/armv5te/lib/dist/libx264.a(cpu.o):cpu.c:function x264_cpu_detect: error: undefined reference to 'bsd_signal'
  
  /home/devshark/SCRATCH/doubango/thirdparties/android/armv5te/lib/dist/libx264.a(cpu.o):cpu.c:function x264_cpu_detect: error: undefined reference to 'bsd_signal'
  
  
  
  /home/devshark/SCRATCH/doubango/thirdparties/android/armv5te/lib/dist/libx264.a(cpu.o):cpu.c:function x264_cpu_detect: error: undefined reference to 'bsd_signal'

  I already know that this is a known NDK12 problem, that might be solved by bringing bsd_signal back to the libc in NDK13. However, in it’ beta state with it’s unstable libc - it’s currently missing the rand() function and simply waiting for it might not do the trick. But in the worst-case scenario, i guess i’ll just have to wait for it and retry after it’s release.

  But as it currently is, the prebuilt version of the library i want to use has text-relocations and is being rejected by phones running newer API / version of the android OS.

  EDIT2 :
  I also know that signal() usually works by using sigaction() under the hood, but maybe i won’t get bsd_signal related build-errors... since i’m suspecting that this one isn’t using it. It’s obviously using bsd_signal, which may or may not be the same underlying thing :/

• pthread_frame : save the FF_DEBUG_THREADS option in PerThreadContext.

  10 juillet 2017, par Wan-Teh Chang

  pthread_frame : save the FF_DEBUG_THREADS option in PerThreadContext.
  Add the debug_threads boolean field to PerThreadContext. For
  
  PerThreadContext *p, p->debug_threads records whether the
  
  FF_DEBUG_THREADS bit is set in p->avctx->debug, and p->debug_threads and
  
  p->avctx->debug are kept in sync. The debug_threads field is defined as
  
  an atomic_int to allow atomic read by another thread in
  
  ff_thread_await_progress().
  This fixes the tsan warning that
  
  2e664b9c1e73c80aab91070c1eb7676f04bdd12d attempted to fix :
  WARNING : ThreadSanitizer : data race (pid=452658)
  
    Write of size 4 at 0x7b640003f4fc by main thread (mutexes : write M248499) :
  
      #0 update_context_from_user [..]/libavcodec/pthread_frame.c:335:19 (5ab42bb1a6f4b068d7863dabe9b2bacc+0xe73859)
  
  [..]
  
    Previous read of size 4 at 0x7b640003f4fc by thread T130 (mutexes : write M248502, write M248500) :
  
      #0 ff_thread_await_progress [..]/libavcodec/pthread_frame.c:591:26 (5ab42bb1a6f4b068d7863dabe9b2bacc+0xe749a1)
  Signed-off-by : Wan-Teh Chang <wtc@google.com>
  
  Signed-off-by : Ronald S. Bultje <rsbultje@gmail.com>
  

  • [DH] libavcodec/pthread_frame.c