Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-26 07:17:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] more polling improvements

Browse Source
This commit is contained in:
Geoffrey McRae 2017-12-07 04:51:54 +11:00
parent 32c6989654
commit 852309464f
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/ivshmem/ivshmem.c
View File

@ -489,8 +489,8 @@ enum IVSHMEMWaitResult ivshmem_wait_irq(uint16_t vector, unsigned int timeout)
FD_SET(fd, &fds); FD_SET(fd, &fds);
struct timeval tv; struct timeval tv;
tv.tv_sec = timeout / 1000; tv.tv_sec = timeout / 1000000L;
tv.tv_usec = (timeout - tv.tv_sec * 1000) * 1000; tv.tv_usec = timeout % 1000000L;
while(true) while(true)
{ {

50
client/main.c
View File

@ -43,8 +43,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "lg-renderers.h" #include "lg-renderers.h"
#define VBO_BUFFERS 2
struct AppState struct AppState
{ {
bool hasBufferStorage; bool hasBufferStorage;
@ -194,37 +192,47 @@ int renderThread(void * unused)
const uint64_t presentTime = detectPresentTime(); const uint64_t presentTime = detectPresentTime();
uint64_t pollDelay = 0; uint64_t pollDelay = 0;
uint64_t pollStep = 0;
uint64_t drawStart = 0; uint64_t drawStart = 0;
uint64_t drawTime = 0; uint64_t drawTime = 0;
uint64_t fpsStart = 0; uint64_t fpsStart = 0;
uint64_t fpsTime = 0; uint64_t fpsTime = 0;
#define SYNC_WINDOW 2000
while(state.running) while(state.running)
{ {
// wait for a frame
if (pollDelay > SYNC_WINDOW)
usleep(pollDelay - SYNC_WINDOW);
else
usleep(pollDelay); usleep(pollDelay);
if(header.dataPos == state.shm->dataPos)
{
pollStep = 0;
do
{
++pollStep;
if (pollDelay + pollStep < 30000)
pollDelay += pollStep;
usleep(1);
}
while(header.dataPos == state.shm->dataPos && state.running);
if (!state.running) // we shouldn't have a frame yet, retard the timing a bit
break; if (header.dataPos != state.shm->dataPos)
{
if (pollDelay >= SYNC_WINDOW / 2)
pollDelay -= SYNC_WINDOW / 2;
else
pollDelay = 0;
} }
else else
{ {
// we were late, step back a chunk const uint64_t loopStart = microtime();
pollStep += 100; while(header.dataPos == state.shm->dataPos && state.running)
if (pollDelay > pollStep) {
pollDelay -= pollStep; // if we timed out, wait for an interrupt or a timeout
if (microtime() - loopStart > SYNC_WINDOW)
{
ivshmem_wait_irq(0, 1000000/30);
break;
}
}
pollDelay += microtime() - loopStart;
pollDelay -= SYNC_WINDOW / 2;
if (pollDelay > (1000000/30))
pollDelay = presentTime;
} }
if (!state.running) if (!state.running)
@ -386,7 +394,7 @@ int renderThread(void * unused)
char str[32]; char str[32];
const float avgFPS = 1000.0f / (((float)fpsTime / frameCount) / 1000.0f); const float avgFPS = 1000.0f / (((float)fpsTime / frameCount) / 1000.0f);
snprintf(str, sizeof(str), "FPS: %8.4f", avgFPS); snprintf(str, sizeof(str), "FPS: %8.4f, Sync: %5lu", avgFPS, pollDelay);
SDL_Color color = {0xff, 0xff, 0xff}; SDL_Color color = {0xff, 0xff, 0xff};
if (!(textSurface = TTF_RenderText_Blended(state.font, str, color))) if (!(textSurface = TTF_RenderText_Blended(state.font, str, color)))
{ {