semaphore_test.cc: add TimedWaitSpuriousWakeupLinux#1037
Merged
Conversation
❌ Integration test FAILEDRequested by @dconeybe on commit 69b870d
Add flaky tests to go/fpl-cpp-flake-tracker |
… it is out-of-scope for this PR
jonsimantov
reviewed
Jul 21, 2022
app/tests/semaphore_test.cc
Outdated
| 0.20 * firebase::internal::kMillisecondsPerSecond); | ||
| } | ||
|
|
||
| #if SEMAPHORE_LINUX |
Contributor
There was a problem hiding this comment.
WDYT about just using #ifdef FIREBASE_ANDROID || FIREBASE_LINUX here and above? To me that's clearer, even though it's not the same as the check in semaphore.h.
app/tests/semaphore_test.cc
Outdated
|
|
||
| // Make sure that Semaphore::TimedWait() blocked for the entire timeout, and, | ||
| // specifically, did NOT return early as a result of the SIGUSR1 interruption. | ||
| ASSERT_LT(labs((finish_ms - start_ms) - |
Contributor
There was a problem hiding this comment.
Can we just use EXPECT_NEAR here?
Contributor
Author
There was a problem hiding this comment.
Yes, EXPECT_NEAR works perfectly. Done.
app/tests/semaphore_test.cc
Outdated
| // Call Semaphore::TimedWait() and keep track of how long it blocks for. | ||
| firebase::Semaphore sem(0); | ||
| int64_t start_ms = firebase::internal::GetTimestamp(); | ||
| EXPECT_FALSE(sem.TimedWait(2 * firebase::internal::kMillisecondsPerSecond)); |
Contributor
There was a problem hiding this comment.
2 * firebase::internal::kMillisecondsPerSecond should be in a constant in this function, for clarity
app/tests/semaphore_test.cc
Outdated
| TEST(SemaphoreTest, TimedWaitSpuriousWakeupLinux) { | ||
| // Register a dummy signal handler for SIGUSR1; otherwise, sending SIGUSR1 | ||
| // later on will crash the application. | ||
| signal(SIGUSR1, [](int signum) -> void {}); |
Contributor
There was a problem hiding this comment.
Does this actually need the trailing return type syntax?
Contributor
Author
There was a problem hiding this comment.
No it does not. I've removed the trailing return.
app/tests/semaphore_test.cc
Outdated
| // specifically, did NOT return early as a result of the SIGUSR1 interruption. | ||
| ASSERT_LT(labs((finish_ms - start_ms) - | ||
| (2 * firebase::internal::kMillisecondsPerSecond)), | ||
| 0.20 * firebase::internal::kMillisecondsPerSecond); |
Contributor
There was a problem hiding this comment.
The allowed delta should probably also be in a constant
jonsimantov
approved these changes
Jul 25, 2022
Contributor
jonsimantov
left a comment
There was a problem hiding this comment.
Approved with one nit
app/tests/semaphore_test.cc
Outdated
| // Call Semaphore::TimedWait() and keep track of how long it blocks for. | ||
| firebase::Semaphore sem(0); | ||
| auto start_ms = firebase::internal::GetTimestamp(); | ||
| const int timed_wait_timeout = 2 * firebase::internal::kMillisecondsPerSecond; |
Contributor
There was a problem hiding this comment.
I think the constants should probably follow the kConstantNaming syntax
Contributor
Author
|
@jonsimantov Please re-approve, as your previous approval was dismissed as being "stale". |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a unit test for the Semaphore::TimedWait() spurious wakeup fix in #1021.