nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace fixes on 13291 fix

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-29 09:39:21 -04:00
parent 0a985af072
commit 15b0bf0aad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_util.c
View File

@ -2856,7 +2856,7 @@ test_util_fgets_eagain(void *ptr)
#define MATCH_PROCESS_STATUS(s1,s2) ((s1) == (s2)) #define MATCH_PROCESS_STATUS(s1,s2) ((s1) == (s2))
#else #else
/* work around a race condition of the timing of SIGCHLD handler updates /* work around a race condition of the timing of SIGCHLD handler updates
* to the process_handle's fields, and checks of those fields * to the process_handle's fields, and checks of those fields
* *
* TODO: Once we can signal failure to exec, change PROCESS_STATUS_RUNNING to * TODO: Once we can signal failure to exec, change PROCESS_STATUS_RUNNING to
@ -2909,11 +2909,11 @@ run_util_spawn_background(const char *argv[], const char *expected_out,
/* When a spawned process forks, fails, then exits very quickly, /* When a spawned process forks, fails, then exits very quickly,
* (this typically occurs when exec fails) * (this typically occurs when exec fails)
* there is a race condition between the SIGCHLD handler * there is a race condition between the SIGCHLD handler
* updating the process_handle's fields, and this test * updating the process_handle's fields, and this test
* checking the process status in those fields. * checking the process status in those fields.
* The SIGCHLD update can occur before or after the code below executes. * The SIGCHLD update can occur before or after the code below executes.
* This causes intermittent failures in spawn_background_fail(), * This causes intermittent failures in spawn_background_fail(),
* typically when the machine is under load. * typically when the machine is under load.
* We use PROCESS_STATUS_RUNNING_OR_NOTRUNNING to avoid this issue. */ * We use PROCESS_STATUS_RUNNING_OR_NOTRUNNING to avoid this issue. */
/* the race condition affects the change in /* the race condition affects the change in
@ -2924,7 +2924,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out,
notify_pending_waitpid_callbacks(); notify_pending_waitpid_callbacks();
/* the race condition affects the change in /* the race condition affects the change in
* process_handle->waitpid_cb to NULL, * process_handle->waitpid_cb to NULL,
* so we skip the check if expected_status is ambiguous, * so we skip the check if expected_status is ambiguous,
* that is, PROCESS_STATUS_RUNNING_OR_NOTRUNNING */ * that is, PROCESS_STATUS_RUNNING_OR_NOTRUNNING */
tt_assert(process_handle->waitpid_cb != NULL tt_assert(process_handle->waitpid_cb != NULL
|| expected_status == PROCESS_STATUS_RUNNING_OR_NOTRUNNING); || expected_status == PROCESS_STATUS_RUNNING_OR_NOTRUNNING);