test code cleanup

[vlc] / src / vlc.c

diff --git a/src/vlc.c b/src/vlc.c
index e9190c825b60eb8b8c4abf74fbc8a4c69031554c..55fed1d3c6d991a7c4c9879e066ccdeb8d180480 100644 (file)
--- a/src/vlc.c
+++ b/src/vlc.c
@@ -27,6 +27,10 @@
 
 #include "config.h"
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,10 +71,11 @@ int main( int i_argc, const char *ppsz_argv[] )
     int i_ret;
 
 #   ifdef __GLIBC__
-    if (dlsym (RTLD_NEXT, "sync_file_range") && !dlsym (RTLD_NEXT, "qsort_r"))
+    if (dlsym (RTLD_NEXT, "inet6_rth_add") && !dlsym (RTLD_NEXT, "qsort_r"))
     {
-        /* Way too many Linux users have glibc 2.6 that keeps crashing
+        /* Way too many Linux users have glibc 2.5-2.7 that keeps crashing
          * inside its non-thread-safe dcgettext(). */
+        /* Hopefully glibc 2.8 will eventually work, not sure though */
         fprintf (stderr,
 "***************************************************\n"
 "*** glibc version with broken libintl detected. ***\n"
@@ -87,9 +92,12 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
 
 #ifdef HAVE_PUTENV
-#   ifdef DEBUG
+#   ifndef NDEBUG
     /* Activate malloc checking routines to detect heap corruptions. */
     putenv( (char*)"MALLOC_CHECK_=2" );
+#       ifdef __APPLE__
+    putenv( (char*)"MallocErrorAbort=crash_my_baby_crash" );
+#       endif
 
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
@@ -269,24 +277,32 @@ static void *SigHandler (void *data)
          * signals to a libvlc structure having been destroyed */
 
         pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
-        if (abort_time == 0)
+        if (abort_time == 0 || time (NULL) > abort_time)
         {
             time (&abort_time);
             abort_time += 2;
 
             fprintf (stderr, "signal %d received, terminating vlc - do it "
-                            "again in case it gets stuck\n", i_signal);
+                            "again quickly in case it gets stuck\n", i_signal);
 
             /* Acknowledge the signal received */
             Kill ();
         }
-        else
-        if (time (NULL) <= abort_time)
+        else /* time (NULL) <= abort_time */
         {
             /* If user asks again more than 2 seconds later, die badly */
             pthread_sigmask (SIG_UNBLOCK, exitset, NULL);
             fprintf (stderr, "user insisted too much, dying badly\n");
+#ifdef __APPLE__
+            /* On Mac OS X, use exit(-1) as it doesn't trigger
+             * backtrace generation, whereas abort() does.
+             * The backtrace generation trigger a Crash Dialog
+             * And takes way too much time, which is not what
+             * we want. */
+            exit (-1);
+#else
             abort ();
+#endif
         }
         pthread_setcancelstate (state, NULL);
     }