team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dont use CLOCK_MONOTONIC when not defined (should fix compile-time issue on non-posix macos, reported by rhoenie). 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5750 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-08-24 07:50:15 +00:00
parent 78c88547da
commit 244b0681ed
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
engine/client/sys_linux.c
View File

@ -702,30 +702,40 @@ static enum
static quint64_t Sys_GetClock(quint64_t *freq)
{
quint64_t t;
if (timer_clocktype == QCLOCK_MONOTONIC)
switch(timer_clocktype)
{
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
*freq = 1000000000;
t = (ts.tv_sec*(quint64_t)1000000000) + ts.tv_nsec;
}
else if (timer_clocktype == QCLOCK_REALTIME)
{
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
*freq = 1000000000;
t = (ts.tv_sec*(quint64_t)1000000000) + ts.tv_nsec;
#ifdef CLOCK_MONOTONIC
case QCLOCK_MONOTONIC:
{
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
*freq = 1000000000;
t = (ts.tv_sec*(quint64_t)1000000000) + ts.tv_nsec;
}
break;
#endif
#ifdef CLOCK_REALTIME
case QCLOCK_REALTIME:
{
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
*freq = 1000000000;
t = (ts.tv_sec*(quint64_t)1000000000) + ts.tv_nsec;
//WARNING t can go backwards
}
else //if (timer_clocktype == QCLOCK_GTOD)
{
struct timeval tp;
gettimeofday(&tp, NULL);
*freq = 1000000;
t = tp.tv_sec*(quint64_t)1000000 + tp.tv_usec;
//WARNING t can go backwards
}
break;
#endif
default: //QCLOCK_GTOD
{
struct timeval tp;
gettimeofday(&tp, NULL);
*freq = 1000000;
t = tp.tv_sec*(quint64_t)1000000 + tp.tv_usec;
//WARNING t can go backwards
//WARNING t can go backwards
}
break;
}
return t - timer_basetime;
}
@ -755,8 +765,12 @@ static void Sys_ClockType_Changed(cvar_t *var, char *oldval)
switch(timer_clocktype)
{
case QCLOCK_GTOD: clockname = "gettimeofday"; break;
#ifdef CLOCK_MONOTONIC
case QCLOCK_MONOTONIC: clockname = "monotonic"; break;
#endif
#ifdef CLOCK_REALTIME
case QCLOCK_REALTIME: clockname = "realtime"; break;
#endif
case QCLOCK_AUTO:
case QCLOCK_INVALID: break;
}