X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_shared.c;h=3c6b0356698b63bb9bf8007ff6c5c9e8820739da;hp=d6081605f701b596ac716b65750cd70d1afc74f9;hb=4d34e0a632cbc401712f46e10bb9864438b0881f;hpb=d1c3f1065fde02ed39b7eecc2d9b9a637388d091 diff --git a/sys_shared.c b/sys_shared.c index d6081605..3c6b0356 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -48,14 +48,12 @@ 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) - Cbuf_Unlock(&cmd_client); - if (cmd_server.text_lock) - Cbuf_Unlock(&cmd_server); + if ((cmd_local)->cbuf->lock) + Cbuf_Unlock((cmd_local)->cbuf); SV_UnlockThreadMutex(); TaskQueue_Frame(true); - if (COM_CheckParm("-profilegameonly")) + if (Sys_CheckParm("-profilegameonly")) Sys_AllowProfiling(false); host.state = host_shutdown; Host_Shutdown(); @@ -65,7 +63,7 @@ void Sys_Quit (int returnvalue) #ifdef __cplusplus extern "C" #endif -void Sys_AllowProfiling(qboolean enable) +void Sys_AllowProfiling(qbool enable) { #ifdef __ANDROID__ #ifdef USE_PROFILER @@ -91,7 +89,7 @@ DLL MANAGEMENT =============================================================================== */ -static qboolean Sys_LoadLibraryFunctions(dllhandle_t dllhandle, const dllfunction_t *fcts, qboolean complain, qboolean has_next) +static qbool Sys_LoadDependencyFunctions(dllhandle_t dllhandle, const dllfunction_t *fcts, qbool complain, qbool has_next) { const dllfunction_t *func; if(dllhandle) @@ -116,7 +114,22 @@ static qboolean Sys_LoadLibraryFunctions(dllhandle_t dllhandle, const dllfunctio return false; } -qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllfunction_t *fcts) +qbool Sys_LoadSelf(dllhandle_t *handle) +{ + dllhandle_t dllhandle = 0; + + if (handle == NULL) + return false; +#ifdef WIN32 + dllhandle = LoadLibrary (NULL); +#else + dllhandle = dlopen (NULL, RTLD_NOW | RTLD_GLOBAL); +#endif + *handle = dllhandle; + return true; +} + +qbool Sys_LoadDependency (const char** dllnames, dllhandle_t* handle, const dllfunction_t *fcts) { #ifdef SUPPORTDLL const dllfunction_t *func; @@ -129,14 +142,14 @@ qboolean Sys_LoadLibrary (const char** dllnames, dllhandle_t* handle, const dllf #ifndef WIN32 #ifdef PREFER_PRELOAD dllhandle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL); - if(Sys_LoadLibraryFunctions(dllhandle, fcts, false, false)) + if(Sys_LoadDependencyFunctions(dllhandle, fcts, false, false)) { Con_DPrintf ("All of %s's functions were already linked in! Not loading dynamically...\n", dllnames[0]); *handle = dllhandle; return true; } else - Sys_UnloadLibrary(&dllhandle); + Sys_FreeLibrary(&dllhandle); notfound: #endif #endif @@ -158,15 +171,14 @@ notfound: SetDllDirectory("bin32"); # endif # endif - dllhandle = LoadLibrary (dllnames[i]); - // no need to unset this - we want ALL dlls to be loaded from there, anyway -#else - dllhandle = dlopen (dllnames[i], RTLD_LAZY | RTLD_GLOBAL); #endif - if (Sys_LoadLibraryFunctions(dllhandle, fcts, true, (dllnames[i+1] != NULL) || (strrchr(sys.argv[0], '/')))) - break; - else - Sys_UnloadLibrary (&dllhandle); + if(Sys_LoadLibrary(dllnames[i], &dllhandle)) + { + if (Sys_LoadDependencyFunctions(dllhandle, fcts, true, (dllnames[i+1] != NULL) || (strrchr(sys.argv[0], '/')))) + break; + else + Sys_FreeLibrary (&dllhandle); + } } // see if the names can be loaded relative to the executable path @@ -182,15 +194,14 @@ notfound: strlcpy(temp, path, sizeof(temp)); strlcat(temp, dllnames[i], sizeof(temp)); Con_DPrintf (" \"%s\"", temp); -#ifdef WIN32 - dllhandle = LoadLibrary (temp); -#else - dllhandle = dlopen (temp, RTLD_LAZY | RTLD_GLOBAL); -#endif - if (Sys_LoadLibraryFunctions(dllhandle, fcts, true, dllnames[i+1] != NULL)) - break; - else - Sys_UnloadLibrary (&dllhandle); + + if(Sys_LoadLibrary(temp, &dllhandle)) + { + if (Sys_LoadDependencyFunctions(dllhandle, fcts, true, (dllnames[i+1] != NULL) || (strrchr(sys.argv[0], '/')))) + break; + else + Sys_FreeLibrary (&dllhandle); + } } } @@ -202,6 +213,7 @@ notfound: } Con_DPrintf(" - loaded.\n"); + Con_Printf("Loaded library \"%s\"\n", dllnames[i]); *handle = dllhandle; return true; @@ -210,7 +222,28 @@ notfound: #endif } -void Sys_UnloadLibrary (dllhandle_t* handle) +qbool Sys_LoadLibrary(const char *name, dllhandle_t *handle) +{ + dllhandle_t dllhandle = 0; + + if(handle == NULL) + return false; + +#ifdef SUPPORTDLL +# ifdef WIN32 + dllhandle = LoadLibrary (name); +# else + dllhandle = dlopen (name, RTLD_LAZY | RTLD_GLOBAL); +# endif +#endif + if(!dllhandle) + return false; + + *handle = dllhandle; + return true; +} + +void Sys_FreeLibrary (dllhandle_t* handle) { #ifdef SUPPORTDLL if (handle == NULL || *handle == NULL) @@ -266,26 +299,51 @@ void* Sys_GetProcAddress (dllhandle_t handle, const char* name) # define HAVE_USLEEP 1 #endif -// this one is referenced elsewhere -cvar_t sys_usenoclockbutbenchmark = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "sys_usenoclockbutbenchmark", "0", "don't use ANY real timing, and simulate a clock (for benchmarking); the game then runs as fast as possible. Run a QC mod with bots that does some stuff, then does a quit at the end, to benchmark a server. NEVER do this on a public server."}; +// these are referenced elsewhere +cvar_t sys_usenoclockbutbenchmark = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sys_usenoclockbutbenchmark", "0", "don't use ANY real timing, and simulate a clock (for benchmarking); the game then runs as fast as possible. Run a QC mod with bots that does some stuff, then does a quit at the end, to benchmark a server. NEVER do this on a public server."}; +cvar_t sys_libdir = {CF_READONLY | CF_CLIENT | CF_SERVER, "sys_libdir", "", "Default engine library directory"}; // these are not -static cvar_t sys_debugsleep = {CVAR_CLIENT | CVAR_SERVER, "sys_debugsleep", "0", "write requested and attained sleep times to standard output, to be used with gnuplot"}; -static cvar_t sys_usesdlgetticks = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "sys_usesdlgetticks", "0", "use SDL_GetTicks() timer (less accurate, for debugging)"}; -static cvar_t sys_usesdldelay = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "sys_usesdldelay", "0", "use SDL_Delay() (less accurate, for debugging)"}; +static cvar_t sys_debugsleep = {CF_CLIENT | CF_SERVER, "sys_debugsleep", "0", "write requested and attained sleep times to standard output, to be used with gnuplot"}; +static cvar_t sys_usesdlgetticks = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sys_usesdlgetticks", "0", "use SDL_GetTicks() timer (less accurate, for debugging)"}; +static cvar_t sys_usesdldelay = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "sys_usesdldelay", "0", "use SDL_Delay() (less accurate, for debugging)"}; #if HAVE_QUERYPERFORMANCECOUNTER -static cvar_t sys_usequeryperformancecounter = {CVAR_CLIENT | CVAR_SERVER | 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)"}; +static cvar_t sys_usequeryperformancecounter = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "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_CLIENT | CVAR_SERVER | 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)"}; +static cvar_t sys_useclockgettime = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "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" +/* +================ +Sys_CheckParm + +Returns the position (1 to argc-1) in the program's argument list +where the given parameter apears, or 0 if not present +================ +*/ +int Sys_CheckParm (const char *parm) +{ + int i; + + for (i=1 ; i