Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] service: introduce fatal errors for ivshmem failures

Browse Source 
Also for failure to parse command line. For these errors, restarting
with exponential backoff will not help: no amount of restarting the
service could possibly make the ivshmem device exist or larger, so
we shouldn't try.
This commit is contained in:
Quantum 2021-03-18 19:05:51 -04:00 committed by Geoffrey McRae
parent c12c6ea3c7
commit a089c4ea32
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/include/interface/platform.h
View File

@ -29,6 +29,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#define LG_HOST_EXIT_KILLED 0x30
// exit code for failed to start
#define LG_HOST_EXIT_FAILED 0x40
// exit code for failed to start, and no amount of restarting could help
#define LG_HOST_EXIT_FATAL 0x50
int app_main(int argc, char * argv[]);
bool app_init();

4
host/platform/Windows/src/service.c
View File

@ -717,6 +717,10 @@ VOID WINAPI SvcMain(DWORD dwArgc, LPTSTR *lpszArgv)
break;
}
case LG_HOST_EXIT_FATAL:
doLog("Host application failed to start with fatal error; will not restart\n");
goto stopped;
default:
doLog("Host application failed due to unknown error; restarting\n");
break;

24
host/src/app.c
View File

@ -440,7 +440,7 @@ int app_main(int argc, char * argv[])
{
option_free();
DEBUG_ERROR("Failed to get the application's data path");
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
}
const size_t len = strlen(dataPath) + sizeof(CONFIG_FILE) + 1;
@ -457,18 +457,18 @@ int app_main(int argc, char * argv[])
{
option_free();
DEBUG_ERROR("Failure to parse the command line");
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
}
if (!option_validate())
{
option_free();
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
}
// perform platform specific initialization
if (!app_init())
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
DEBUG_INFO("Looking Glass Host (%s)", BUILD_VERSION);
@ -476,13 +476,13 @@ int app_main(int argc, char * argv[])
if (!ivshmemInit(&shmDev))
{
DEBUG_ERROR("Failed to find the IVSHMEM device");
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
}
if (!ivshmemOpen(&shmDev))
{
DEBUG_ERROR("Failed to open the IVSHMEM device");
return LG_HOST_EXIT_FAILED;
return LG_HOST_EXIT_FATAL;
}
int exitcode = 0;
@ -502,21 +502,21 @@ int app_main(int argc, char * argv[])
sizeof(udata), (uint8_t *)&udata)) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostInit Failed: %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_ivshmem;
}
if ((status = lgmpHostQueueNew(app.lgmp, FRAME_QUEUE_CONFIG, &app.frameQueue)) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostQueueCreate Failed (Frame): %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_lgmp;
}
if ((status = lgmpHostQueueNew(app.lgmp, POINTER_QUEUE_CONFIG, &app.pointerQueue)) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostQueueNew Failed (Pointer): %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_lgmp;
}
@ -525,7 +525,7 @@ int app_main(int argc, char * argv[])
if ((status = lgmpHostMemAlloc(app.lgmp, MAX_POINTER_SIZE, &app.pointerMemory[i])) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostMemAlloc Failed (Pointer): %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_lgmp;
}
memset(lgmpHostMemPtr(app.pointerMemory[i]), 0, MAX_POINTER_SIZE);
@ -535,7 +535,7 @@ int app_main(int argc, char * argv[])
if ((status = lgmpHostMemAlloc(app.lgmp, MAX_POINTER_SIZE, &app.pointerShape)) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostMemAlloc Failed (Pointer Shape): %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_lgmp;
}
@ -550,7 +550,7 @@ int app_main(int argc, char * argv[])
if ((status = lgmpHostMemAllocAligned(app.lgmp, app.maxFrameSize, sz, &app.frameMemory[i])) != LGMP_OK)
{
DEBUG_ERROR("lgmpHostMemAlloc Failed (Frame): %s", lgmpStatusString(status));
exitcode = LG_HOST_EXIT_FAILED;
exitcode = LG_HOST_EXIT_FATAL;
goto fail_lgmp;
}
}