sv_main: Rename sv_ratelimitlocalplayer to host_limitlocal. Old name still works

[xonotic/darkplaces.git] / sys_shared.c

diff --git a/sys_shared.c b/sys_shared.c
index 54707e5d4f22a20a717528bca4fbc269ecc8cc94..4898c82a02a1b0e8ea1315f1853f87b13b94a2dc 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -48,9 +48,9 @@ char *Sys_TimeString(const char *timeformat)
 void Sys_Quit (int returnvalue)
 {
        // Unlock mutexes because the quit command may jump directly here, causing a deadlock
-       if (cmd_client.text_lock)
+       if (cmd_client.text_mutex)
                Cbuf_Unlock(&cmd_client);
-       if (cmd_server.text_lock)
+       if (cmd_server.text_mutex)
                Cbuf_Unlock(&cmd_server);
        SV_UnlockThreadMutex();
        TaskQueue_Frame(true);
@@ -334,13 +334,8 @@ double Sys_DirtyTime(void)
                {
                        QueryPerformanceCounter (&PerformanceCount);
        
-                       #ifdef __BORLANDC__
-                       timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-                       return ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-                       #else
                        timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
                        return ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-                       #endif
                }
                else
                {
@@ -534,7 +529,7 @@ void Sys_ProvideSelfFD(void)
 static int CPUID_Features(void)
 {
        int features = 0;
-# if defined(__GNUC__) && defined(__i386__)
+# if defined((__GNUC__) || (__clang__) || (__TINYC__)) && defined(__i386__)
         __asm__ (
 "        movl    %%ebx,%%edi\n"
 "        xorl    %%eax,%%eax                                           \n"
@@ -600,17 +595,15 @@ qboolean Sys_HaveSSE2(void)
 #if defined(__linux__)
 #include <sys/resource.h>
 #include <errno.h>
-static int nicelevel;
-static qboolean nicepossible;
-static qboolean isnice;
+
 void Sys_InitProcessNice (void)
 {
        struct rlimit lim;
-       nicepossible = false;
+       sys.nicepossible = false;
        if(COM_CheckParm("-nonice"))
                return;
        errno = 0;
-       nicelevel = getpriority(PRIO_PROCESS, 0);
+       sys.nicelevel = getpriority(PRIO_PROCESS, 0);
        if(errno)
        {
                Con_Printf("Kernel does not support reading process priority - cannot use niceness\n");
@@ -621,35 +614,35 @@ void Sys_InitProcessNice (void)
                Con_Printf("Kernel does not support lowering nice level again - cannot use niceness\n");
                return;
        }
-       if(lim.rlim_cur != RLIM_INFINITY && nicelevel < (int) (20 - lim.rlim_cur))
+       if(lim.rlim_cur != RLIM_INFINITY && sys.nicelevel < (int) (20 - lim.rlim_cur))
        {
                Con_Printf("Current nice level is below the soft limit - cannot use niceness\n");
                return;
        }
-       nicepossible = true;
-       isnice = false;
+       sys.nicepossible = true;
+       sys.isnice = false;
 }
 void Sys_MakeProcessNice (void)
 {
-       if(!nicepossible)
+       if(!sys.nicepossible)
                return;
-       if(isnice)
+       if(sys.isnice)
                return;
        Con_DPrintf("Process is becoming 'nice'...\n");
        if(setpriority(PRIO_PROCESS, 0, 19))
-               Con_Errorf("Failed to raise nice level to %d\n", 19);
-       isnice = true;
+               Con_Printf(CON_ERROR "Failed to raise nice level to %d\n", 19);
+       sys.isnice = true;
 }
 void Sys_MakeProcessMean (void)
 {
-       if(!nicepossible)
+       if(!sys.nicepossible)
                return;
-       if(!isnice)
+       if(!sys.isnice)
                return;
        Con_DPrintf("Process is becoming 'mean'...\n");
-       if(setpriority(PRIO_PROCESS, 0, nicelevel))
-               Con_Errorf("Failed to lower nice level to %d\n", nicelevel);
-       isnice = false;
+       if(setpriority(PRIO_PROCESS, 0, sys.nicelevel))
+               Con_Printf(CON_ERROR "Failed to lower nice level to %d\n", sys.nicelevel);
+       sys.isnice = false;
 }
 #else
 void Sys_InitProcessNice (void)