mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 22:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[host] correct reinit logic when LGMP corruption is detected

Browse source
This commit is contained in:
Geoffrey McRae 2021-12-30 14:34:45 +11:00
parent 9b202d5566
commit 6f39434bdc
1 changed files with 31 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
host/src/app.c
View file

@ -326,7 +326,8 @@ bool startThreads(void)
bool stopThreads(void) bool stopThreads(void)
{ {
app.iface->stop(); app.iface->stop();
if (app.state != APP_STATE_SHUTDOWN) if (app.state != APP_STATE_SHUTDOWN &&
app.state != APP_STATE_REINIT)
app.state = APP_STATE_IDLE; app.state = APP_STATE_IDLE;
if (!app.iface->asyncCapture) if (!app.iface->asyncCapture)
@ -512,6 +513,8 @@ static void lgmpShutdown()
for(int i = 0; i < POINTER_SHAPE_BUFFERS; ++i) for(int i = 0; i < POINTER_SHAPE_BUFFERS; ++i)
lgmpHostMemFree(&app.pointerShapeMemory[i]); lgmpHostMemFree(&app.pointerShapeMemory[i]);
lgmpHostFree(&app.lgmp); lgmpHostFree(&app.lgmp);
app.pointerShapeValid = false;
} }
static bool lgmpSetup(struct IVSHMEM * shmDev) static bool lgmpSetup(struct IVSHMEM * shmDev)
@ -671,11 +674,11 @@ int app_main(int argc, char * argv[])
app.frameValid = false; app.frameValid = false;
app.pointerShapeValid = false; app.pointerShapeValid = false;
if (!lgmpSetup(&shmDev)) if (!lgmpSetup(&shmDev))
{ {
exitcode = LG_HOST_EXIT_FATAL; exitcode = LG_HOST_EXIT_FATAL;
goto fail_ivshmem; goto fail_ivshmem;
} }
int throttleFps = option_get_int("app", "throttleFPS"); int throttleFps = option_get_int("app", "throttleFPS");
int throttleUs = throttleFps ? 1000000 / throttleFps : 0; int throttleUs = throttleFps ? 1000000 / throttleFps : 0;
@ -725,52 +728,20 @@ int app_main(int argc, char * argv[])
while(app.state != APP_STATE_SHUTDOWN) while(app.state != APP_STATE_SHUTDOWN)
{ {
if(lgmpHostQueueHasSubs(app.pointerQueue) || if (app.state == APP_STATE_REINIT)
lgmpHostQueueHasSubs(app.frameQueue))
{ {
if (!captureStart()) DEBUG_INFO("Performing LGMP reinitialization");
{ lgmpShutdown();
exitcode = LG_HOST_EXIT_FAILED; if (!lgmpSetup(&shmDev))
goto fail_capture; goto fail_lgmp;
} app.state = APP_STATE_RUNNING;
if (!startThreads())
{
exitcode = LG_HOST_EXIT_FAILED;
goto fail_threads;
}
}
else
{
usleep(100000);
continue;
} }
while(app.state != APP_STATE_SHUTDOWN && ( if (app.state == APP_STATE_IDLE)
lgmpHostQueueHasSubs(app.pointerQueue) ||
lgmpHostQueueHasSubs(app.frameQueue)))
{ {
if (app.state == APP_STATE_RESTART || app.state == APP_STATE_REINIT) if(lgmpHostQueueHasSubs(app.pointerQueue) ||
lgmpHostQueueHasSubs(app.frameQueue))
{ {
if (!stopThreads())
{
exitcode = LG_HOST_EXIT_FAILED;
goto fail_threads;
}
if (!captureStop())
{
exitcode = LG_HOST_EXIT_FAILED;
goto fail_capture;
}
if (app.state == APP_STATE_REINIT)
{
lgmpShutdown();
if (!lgmpSetup(&shmDev))
goto fail_lgmp;
}
if (!captureStart()) if (!captureStart())
{ {
exitcode = LG_HOST_EXIT_FAILED; exitcode = LG_HOST_EXIT_FAILED;
@ -782,9 +753,20 @@ int app_main(int argc, char * argv[])
exitcode = LG_HOST_EXIT_FAILED; exitcode = LG_HOST_EXIT_FAILED;
goto fail_threads; goto fail_threads;
} }
app.state = APP_STATE_RUNNING;
} }
else
{
usleep(100000);
continue;
}
}
while(app.state != APP_STATE_SHUTDOWN && (
lgmpHostQueueHasSubs(app.pointerQueue) ||
lgmpHostQueueHasSubs(app.frameQueue)))
{
if (app.state == APP_STATE_RESTART || app.state == APP_STATE_REINIT)
break;
if (lgmpHostQueueNewSubs(app.pointerQueue) > 0) if (lgmpHostQueueNewSubs(app.pointerQueue) > 0)
{ {
@ -836,8 +818,6 @@ int app_main(int argc, char * argv[])
if (app.state != APP_STATE_SHUTDOWN) if (app.state != APP_STATE_SHUTDOWN)
{ {
DEBUG_INFO("No subscribers, going to sleep...");
if (!stopThreads()) if (!stopThreads())
{ {
exitcode = LG_HOST_EXIT_FAILED; exitcode = LG_HOST_EXIT_FAILED;