#include "quakedef.h"
#ifdef WIN32
+#include <windows.h>
+#include <mmsystem.h>
#include <io.h>
#include "conio.h"
#else
#include <unistd.h>
#include <fcntl.h>
#include <sys/time.h>
+#include <time.h>
#endif
#include <signal.h>
+cvar_t sys_usenoclockbutbenchmark = {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."};
+static unsigned long benchmark_time;
+
#ifdef WIN32
cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
+#else
+# ifndef MACOSX
+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)"};
+# endif
#endif
// =======================================================================
void Sys_Shutdown (void)
{
-#ifndef WIN32
+#ifdef FNDELAY
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
fflush(stdout);
char string[MAX_INPUTLINE];
// change stdin to non blocking
-#ifndef WIN32
+#ifdef FNDELAY
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
void Sys_PrintToTerminal(const char *text)
{
-#ifndef WIN32
+#ifdef FNDELAY
// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
int origflags = fcntl (1, F_GETFL, 0);
fcntl (1, F_SETFL, origflags & ~FNDELAY);
+#endif
+#ifdef WIN32
+#define write _write
#endif
while(*text)
{
- int written = (int)write(1, text, (int)strlen(text));
+ fs_offset_t written = (fs_offset_t)write(1, text, strlen(text));
if(written <= 0)
break; // sorry, I cannot do anything about this error - without an output
text += written;
}
-#ifndef WIN32
+#ifdef FNDELAY
fcntl (1, F_SETFL, origflags);
#endif
//fprintf(stdout, "%s", text);
static int first = true;
static double oldtime = 0.0, curtime = 0.0;
double newtime;
+ if(sys_usenoclockbutbenchmark.integer)
+ {
+ benchmark_time += 1;
+ return ((double) benchmark_time) / 1e6;
+ }
#ifdef WIN32
-#include <mmsystem.h>
// LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
if (sys_usetimegettime.integer)
{
#endif
}
#else
- struct timeval tp;
- gettimeofday(&tp, NULL);
- newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+# ifndef MACOSX
+ if (sys_useclockgettime.integer)
+ {
+ struct timespec ts;
+# ifdef SUNOS
+ clock_gettime(CLOCK_HIGHRES, &ts);
+# else
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+# endif
+ newtime = (double) ts.tv_sec + ts.tv_nsec / 1000000000.0;
+ }
+ else
+# endif
+ {
+ struct timeval tp;
+ gettimeofday(&tp, NULL);
+ newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+ }
#endif
if (first)
if (newtime - oldtime < -0.01)
Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
}
+ else if (newtime > oldtime + 1800)
+ {
+ Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
+ }
else
curtime += newtime - oldtime;
oldtime = newtime;
char *Sys_ConsoleInput(void)
{
- if (cls.state == ca_dedicated)
+ //if (cls.state == ca_dedicated)
{
static char text[MAX_INPUTLINE];
static unsigned int len = 0;
if (c == '\r')
{
text[len] = '\0';
- putch ('\n');
+ _putch ('\n');
len = 0;
return text;
}
{
if (len)
{
- putch (c);
- putch (' ');
- putch (c);
+ _putch (c);
+ _putch (' ');
+ _putch (c);
len--;
}
continue;
}
if (len < sizeof (text) - 1)
{
- putch (c);
+ _putch (c);
text[len] = c;
len++;
}
timeout.tv_usec = 0;
if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
{
- len = read (0, text, sizeof(text));
+ len = read (0, text, sizeof(text) - 1);
if (len >= 1)
{
// rip off the \n and terminate
- text[len-1] = 0;
+ // div0: WHY? console code can deal with \n just fine
+ // this caused problems with pasting stuff into a terminal window
+ // so, not ripping off the \n, but STILL keeping a NUL terminator
+ text[len] = 0;
return text;
}
}
void Sys_Sleep(int microseconds)
{
+ if(sys_usenoclockbutbenchmark.integer)
+ {
+ benchmark_time += microseconds;
+ return;
+ }
#ifdef WIN32
- if (microseconds < 1000)
- microseconds = 1000;
Sleep(microseconds / 1000);
#else
- if (microseconds < 1)
- microseconds = 1;
usleep(microseconds);
#endif
}
void Sys_Init_Commands (void)
{
+ Cvar_RegisterVariable(&sys_usenoclockbutbenchmark);
+#ifdef WIN32
+ Cvar_RegisterVariable(&sys_usetimegettime);
+#else
+# ifndef MACOSX
+ Cvar_RegisterVariable(&sys_useclockgettime);
+# endif
+#endif
}
int main (int argc, char **argv)
com_argc = argc;
com_argv = (const char **)argv;
-#ifndef WIN32
+#ifdef FNDELAY
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif
projects / xonotic / darkplaces.git / blobdiff