marcel/gamemode
1
0
Fork 0
mirror of https://github.com/FeralInteractive/gamemode.git synced 2025-06-07 08:07:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement some error logging/checking and clean up some TODO comments

Browse Source
This commit is contained in:
Marc Di Luzio 2019-05-13 18:58:45 +01:00
parent ef29b35258
commit 0d018d91a8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
daemon/gamemode-tests.c
View File

@ -561,9 +561,14 @@ static void *fake_thread_wait(void *arg)
* First to sync that all threads have started * First to sync that all threads have started
* Second to sync all threads exiting * Second to sync all threads exiting
*/ */
/* TODO: Error handle */ int ret = 0;
pthread_barrier_wait(info->barrier); ret = pthread_barrier_wait(info->barrier);
pthread_barrier_wait(info->barrier); if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
FATAL_ERROR("pthread_barrier_wait failed in child with error %d!\n", ret);
ret = pthread_barrier_wait(info->barrier);
if (ret != 0 && ret != PTHREAD_BARRIER_SERIAL_THREAD)
FATAL_ERROR("pthread_barrier_wait failed in child with error %d!\n", ret);
return NULL; return NULL;
} }
@ -646,11 +651,13 @@ static pid_t run_tests_on_process_tree(int innactive, int active, int (*func)(pi
pthread_barrier_wait(&barrier); pthread_barrier_wait(&barrier);
/* Wait for threads to join */ /* Wait for threads to join */
/* TODO: Error check */
int ret = 0; int ret = 0;
for (unsigned int i = 0; i < numthreads; i++) for (unsigned int i = 0; i < numthreads; i++)
ret &= pthread_join(threads[i], NULL); ret &= pthread_join(threads[i], NULL);
if (ret != 0)
LOG_ERROR("Thread cleanup in multithreaded tests failed!\n");
/* We're done, so return the error code generated */ /* We're done, so return the error code generated */
exit(ret); exit(ret);
} }
@ -663,7 +670,6 @@ static pid_t run_tests_on_process_tree(int innactive, int active, int (*func)(pi
if (WIFEXITED(wstatus)) if (WIFEXITED(wstatus))
status = WEXITSTATUS(wstatus); status = WEXITSTATUS(wstatus);
else { else {
/* TODO: Gather some error information */
LOG_ERROR("Multithreaded child exited abnormally!\n"); LOG_ERROR("Multithreaded child exited abnormally!\n");
status = -1; status = -1;
} }
@ -993,7 +999,6 @@ int game_mode_run_client_tests(void)
return -1; return -1;
/* Controls whether we require a supervisor to actually make requests */ /* Controls whether we require a supervisor to actually make requests */
/* TODO: This effects all tests below */
if (config_get_require_supervisor(config) != 0) { if (config_get_require_supervisor(config) != 0) {
LOG_ERROR("Tests currently unsupported when require_supervisor is set\n"); LOG_ERROR("Tests currently unsupported when require_supervisor is set\n");
return -1; return -1;