vlc_clone(): abide by --rt-priority and --rt-offset

[vlc] / src / misc / cpu.c

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 26c5d2be68f467a08b5221617aa36ef722f98651..bfaf139ed4ffdfcaa7566681e30bb3acb84da0b4 100644 (file)
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -26,35 +26,33 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
-
-#ifdef HAVE_SIGNAL_H
-#   include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
-#   include <setjmp.h>                                    /* longjmp, setjmp */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
-#if defined(SYS_DARWIN) && (defined(__ppc__) || defined(__ppc64__))
+#include <vlc_common.h>
+
+#include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */
+#include <setjmp.h>                                    /* longjmp, setjmp */
+
+#include "libvlc.h"
+
+#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__))
 #include <sys/sysctl.h>
 #endif
 
-#include "vlc_cpu.h"
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-#ifdef HAVE_SIGNAL_H
 static void SigHandler   ( int );
-#endif
 
 /*****************************************************************************
  * Global variables - they're needed for signal handling
  *****************************************************************************/
-#ifdef HAVE_SIGNAL_H
 static jmp_buf env;
 static int     i_illegal;
 #if defined( __i386__ ) || defined( __x86_64__ )
-static char   *psz_capability;
-#endif
+static const char *psz_capability;
 #endif
 
 /*****************************************************************************
@@ -66,7 +64,7 @@ uint32_t CPUCapabilities( void )
 {
     volatile uint32_t i_capabilities = CPU_CAPABILITY_NONE;
 
-#if defined(SYS_DARWIN) && (defined(__ppc__) || defined(__ppc64__))
+#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__))
     int selectors[2] = { CTL_HW, HW_VECTORUNIT };
     int i_has_altivec = 0;
     size_t i_length = sizeof( i_has_altivec );
@@ -81,7 +79,7 @@ uint32_t CPUCapabilities( void )
 
 #elif defined( __i386__ ) || defined( __x86_64__ )
     volatile unsigned int  i_eax, i_ebx, i_ecx, i_edx;
-    volatile vlc_bool_t    b_amd;
+    volatile bool    b_amd;
 
     /* Needed for x86 CPU capabilities detection */
 #   if defined( __x86_64__ )
@@ -108,8 +106,7 @@ uint32_t CPUCapabilities( void )
                          : "cc" );
 #   endif
 
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
     void (*pf_sigill) (int) = signal( SIGILL, SigHandler );
 #   endif
 
@@ -135,8 +132,7 @@ uint32_t CPUCapabilities( void )
 
     if( i_eax == i_ebx )
     {
-#       if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-            && defined( HAVE_SIGNAL_H )
+#       if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #       endif
         return i_capabilities;
@@ -152,8 +148,7 @@ uint32_t CPUCapabilities( void )
 
     if( !i_eax )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -171,8 +166,7 @@ uint32_t CPUCapabilities( void )
 
     if( ! (i_edx & 0x00800000) )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -227,8 +221,7 @@ uint32_t CPUCapabilities( void )
 
     if( i_eax < 0x80000001 )
     {
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
         signal( SIGILL, pf_sigill );
 #   endif
         return i_capabilities;
@@ -261,15 +254,14 @@ uint32_t CPUCapabilities( void )
         i_capabilities |= CPU_CAPABILITY_MMXEXT;
     }
 
-#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW ) \
-     && defined( HAVE_SIGNAL_H )
+#   if defined( CAN_COMPILE_SSE ) || defined ( CAN_COMPILE_3DNOW )
     signal( SIGILL, pf_sigill );
 #   endif
     return i_capabilities;
 
-#elif defined( __powerpc__ )
+#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
 
-#   ifdef CAN_COMPILE_ALTIVEC && defined( HAVE_SIGNAL_H )
+#   ifdef CAN_COMPILE_ALTIVEC
     void (*pf_sigill) (int) = signal( SIGILL, SigHandler );
 
     i_capabilities |= CPU_CAPABILITY_FPU;
@@ -290,6 +282,8 @@ uint32_t CPUCapabilities( void )
     }
 
     signal( SIGILL, pf_sigill );
+#   else
+    (void)SigHandler; /* Don't complain about dead code here */
 #   endif
 
     return i_capabilities;
@@ -316,7 +310,6 @@ uint32_t CPUCapabilities( void )
  * This function is called when an illegal instruction signal is received by
  * the program. We use this function to test OS and CPU capabilities
  *****************************************************************************/
-#if defined( HAVE_SIGNAL_H )
 static void SigHandler( int i_signal )
 {
     /* Acknowledge the signal received */
@@ -324,6 +317,8 @@ static void SigHandler( int i_signal )
 
 #ifdef HAVE_SIGRELSE
     sigrelse( i_signal );
+#else
+    VLC_UNUSED( i_signal );
 #endif
 
 #if defined( __i386__ )
@@ -331,12 +326,49 @@ static void SigHandler( int i_signal )
                      "operating system.\n", psz_capability );
     fprintf( stderr, "         some optimizations will be disabled unless "
                      "you upgrade your OS\n" );
-#   if defined( SYS_LINUX )
+#   if defined( __linux__ )
     fprintf( stderr, "         (for instance Linux kernel 2.4.x or later)\n" );
 #   endif
 #endif
 
     longjmp( env, 1 );
 }
-#endif
 
+
+uint32_t cpu_flags = 0;
+
+
+/*****************************************************************************
+ * vlc_CPU: get pre-computed CPU capability flags
+ ****************************************************************************/
+unsigned vlc_CPU (void)
+{
+    return cpu_flags;
+}
+
+static vlc_memcpy_t pf_vlc_memcpy = memcpy;
+static vlc_memset_t pf_vlc_memset = memset;
+
+void vlc_fastmem_register (vlc_memcpy_t cpy, vlc_memset_t set)
+{
+    if (cpy)
+        pf_vlc_memcpy = cpy;
+    if (set)
+        pf_vlc_memset = set;
+}
+
+/**
+ * vlc_memcpy: fast CPU-dependent memcpy
+ */
+void *vlc_memcpy (void *tgt, const void *src, size_t n)
+{
+    return pf_vlc_memcpy (tgt, src, n);
+}
+
+/**
+ * vlc_memset: fast CPU-dependent memset
+ */
+void *vlc_memset (void *tgt, int c, size_t n)
+{
+    return pf_vlc_memset (tgt, c, n);
+}