Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Unified Diff: mojo/edk/util/waitable_event_unittest.cc

Issue 1639093002: Add //mojo/edk/platform/thread_utils.* containing "yield" and "sleep". (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/util/mutex_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/util/waitable_event_unittest.cc
diff --git a/mojo/edk/util/waitable_event_unittest.cc b/mojo/edk/util/waitable_event_unittest.cc
index 4db285ca452620d705877ee9a2cd408ba06d77cf..37776138f4f1e89f54c6b75111f33f53c574328b 100644
--- a/mojo/edk/util/waitable_event_unittest.cc
+++ b/mojo/edk/util/waitable_event_unittest.cc
@@ -12,17 +12,16 @@
#include <type_traits>
#include <vector>
-#include "mojo/edk/system/test/sleep.h"
+#include "mojo/edk/platform/thread_utils.h"
#include "mojo/edk/system/test/stopwatch.h"
#include "mojo/edk/system/test/timeouts.h"
#include "mojo/public/cpp/system/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
+using mojo::platform::ThreadSleep;
using mojo::system::test::ActionTimeout;
using mojo::system::test::DeadlineFromMilliseconds;
using mojo::system::test::EpsilonTimeout;
-using mojo::system::test::Sleep;
-using mojo::system::test::SleepMilliseconds;
using mojo::system::test::Stopwatch;
using mojo::system::test::TinyTimeout;
@@ -32,7 +31,7 @@ namespace {
// Sleeps for a "very small" amount of time.
void EpsilonRandomSleep() {
- SleepMilliseconds(static_cast<unsigned>(rand()) % 20u);
+ ThreadSleep(DeadlineFromMilliseconds(static_cast<unsigned>(rand()) % 20u));
}
// We'll use |MojoDeadline| with |uint64_t| (for |WaitWithTimeout()|'s timeout
@@ -92,7 +91,7 @@ TEST(AutoResetWaitableEventTest, MultipleWaiters) {
// Unfortunately, we can't really wait for the threads to be waiting, so we
// just sleep for a bit, and count on them having started and advanced to
// waiting.
- Sleep(2 * TinyTimeout());
+ ThreadSleep(2 * TinyTimeout());
for (size_t j = 0u; j < threads.size(); j++) {
unsigned old_wake_count = wake_count.load();
@@ -103,13 +102,13 @@ TEST(AutoResetWaitableEventTest, MultipleWaiters) {
// Poll for |wake_count| to change.
while (wake_count.load() == old_wake_count)
- Sleep(EpsilonTimeout());
+ ThreadSleep(EpsilonTimeout());
EXPECT_FALSE(ev.IsSignaledForTest());
// And once it's changed, wait a little longer, to see if any other
// threads are awoken (they shouldn't be).
- Sleep(EpsilonTimeout());
+ ThreadSleep(EpsilonTimeout());
EXPECT_EQ(old_wake_count + 1u, wake_count.load());
@@ -118,7 +117,7 @@ TEST(AutoResetWaitableEventTest, MultipleWaiters) {
// Having done that, if we signal |ev| now, it should stay signaled.
ev.Signal();
- Sleep(EpsilonTimeout());
+ ThreadSleep(EpsilonTimeout());
EXPECT_TRUE(ev.IsSignaledForTest());
for (auto& thread : threads)
@@ -223,7 +222,7 @@ TEST(ManualResetWaitableEventTest, SignalMultipleWaitReset) {
// Unfortunately, we can't really wait for the threads to be waiting, so we
// just sleep for a bit, and count on them having started and advanced to
// waiting.
- Sleep(2 * TinyTimeout());
+ ThreadSleep(2 * TinyTimeout());
ev.Signal();
« no previous file with comments | « mojo/edk/util/mutex_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698