Fix a crash on Doombringer duel5.bsp where one of the lights has more than 32768...

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index bcbc727d902e04074befee164b481592563ea36d..c32e9d2390415f6ee633a1179a85eb578e3175f7 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -5,6 +5,7 @@
 #endif
 
 #include "quakedef.h"
+#include "thread.h"
 
 #define SUPPORTDLL
 
@@ -43,6 +44,10 @@ char *Sys_TimeString(const char *timeformat)
 extern qboolean host_shuttingdown;
 void Sys_Quit (int returnvalue)
 {
+       // Unlock mutexes because the quit command may jump directly here, causing a deadlock
+       Cbuf_UnlockThreadMutex();
+       SV_UnlockThreadMutex();
+
        if (COM_CheckParm("-profilegameonly"))
                Sys_AllowProfiling(false);
        host_shuttingdown = true;
@@ -50,16 +55,22 @@ void Sys_Quit (int returnvalue)
        exit(returnvalue);
 }
 
-#if defined(__linux__) || defined(__FreeBSD__)
 #ifdef __cplusplus
 extern "C"
 #endif
-int moncontrol(int);
-#endif
-
 void Sys_AllowProfiling(qboolean enable)
 {
-#if defined(__linux__) || defined(__FreeBSD__)
+#ifdef __ANDROID__
+#ifdef USE_PROFILER
+       extern void monstartup(const char *libname);
+       extern void moncleanup(void);
+       if (enable)
+               monstartup("libmain.so");
+       else
+               moncleanup();
+#endif
+#elif defined(__linux__) || defined(__FreeBSD__)
+       extern int moncontrol(int);
        moncontrol(enable);
 #endif
 }
@@ -227,11 +238,10 @@ void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
 # define HAVE_Sleep 1
 #endif
 
+#ifndef WIN32
 #if defined(CLOCK_MONOTONIC) || defined(CLOCK_HIRES)
 # define HAVE_CLOCKGETTIME 1
 #endif
-
-#ifndef WIN32
 // FIXME improve this check, manpage hints to DST_NONE
 # define HAVE_GETTIMEOFDAY 1
 #endif
@@ -260,7 +270,7 @@ static cvar_t sys_usesdldelay = {CVAR_SAVE, "sys_usesdldelay", "0", "use SDL_Del
 static cvar_t sys_usequeryperformancecounter = {CVAR_SAVE, "sys_usequeryperformancecounter", "0", "use windows QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power) for timing rather than timeGetTime function (which has issues on some motherboards)"};
 #endif
 #if HAVE_CLOCKGETTIME
-static cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "0", "use POSIX clock_gettime function (which has issues if the system clock speed is far off, as it can't get fixed by NTP) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"};
+static cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "1", "use POSIX clock_gettime function (not adjusted by NTP on some older Linux kernels) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"};
 #endif
 
 static double benchmark_time; // actually always contains an integer amount of milliseconds, will eventually "overflow"
@@ -450,6 +460,7 @@ void Sys_PrintfToTerminal(const char *fmt, ...)
        Sys_PrintToTerminal(msg);
 }
 
+#ifndef WIN32
 static const char *Sys_FindInPATH(const char *name, char namesep, const char *PATH, char pathsep, char *buf, size_t bufsize)
 {
        const char *p = PATH;
@@ -472,6 +483,7 @@ static const char *Sys_FindInPATH(const char *name, char namesep, const char *PA
        }
        return name;
 }
+#endif
 
 static const char *Sys_FindExecutableName(void)
 {
@@ -534,18 +546,24 @@ static int CPUID_Features(void)
 # endif
        return features;
 }
+#endif
 
+#ifdef SSE_POSSIBLE
 qboolean Sys_HaveSSE(void)
 {
        // COMMANDLINEOPTION: SSE: -nosse disables SSE support and detection
        if(COM_CheckParm("-nosse"))
                return false;
+#ifdef SSE_PRESENT
+       return true;
+#else
        // COMMANDLINEOPTION: SSE: -forcesse enables SSE support and disables detection
        if(COM_CheckParm("-forcesse") || COM_CheckParm("-forcesse2"))
                return true;
        if(CPUID_Features() & (1 << 25))
                return true;
        return false;
+#endif
 }
 
 qboolean Sys_HaveSSE2(void)
@@ -553,12 +571,16 @@ qboolean Sys_HaveSSE2(void)
        // COMMANDLINEOPTION: SSE2: -nosse2 disables SSE2 support and detection
        if(COM_CheckParm("-nosse") || COM_CheckParm("-nosse2"))
                return false;
+#ifdef SSE2_PRESENT
+       return true;
+#else
        // COMMANDLINEOPTION: SSE2: -forcesse2 enables SSE2 support and disables detection
        if(COM_CheckParm("-forcesse2"))
                return true;
        if((CPUID_Features() & (3 << 25)) == (3 << 25)) // SSE is 1<<25, SSE2 is 1<<26
                return true;
        return false;
+#endif
 }
 #endif