Skip to content

Fix RuntimeFromNonWorkerThreads #7746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 5 commits into from
Jul 29, 2019
Merged

Fix RuntimeFromNonWorkerThreads #7746

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05c2017
Fix RuntimeFromNonWorkerThreads
Jul 28, 2019
e0804a9
Check wait condition before/around wait() call
Jul 28, 2019
ccad72f
Fix format
Jul 29, 2019
6f00dc4
Address review
Jul 29, 2019
9143800
Kick CI
Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions test/common/runtime/runtime_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,25 +623,42 @@ TEST_F(StaticLoaderImplTest, RuntimeFromNonWorkerThreads) {
// Now set up a test thread which verifies foo -> bar
//
// Then change foo and make sure the test thread picks up the change.
bool read_bar = false;
bool updated_eep = false;
Thread::MutexBasicLockable mutex;
Thread::CondVar foo_read;
Thread::CondVar foo_changed;
const Snapshot* original_thread_snapshot_pointer = nullptr;
auto thread = Thread::threadFactoryForTest().createThread([&]() {
Thread::LockGuard lock(mutex);
EXPECT_EQ("bar", loader_->threadsafeSnapshot()->get("foo"));
original_thread_snapshot_pointer = loader_->threadsafeSnapshot().get();
EXPECT_EQ(original_thread_snapshot_pointer, loader_->threadsafeSnapshot().get());
foo_read.notifyOne();
{
Thread::LockGuard lock(mutex);
EXPECT_EQ("bar", loader_->threadsafeSnapshot()->get("foo"));
read_bar = true;
original_thread_snapshot_pointer = loader_->threadsafeSnapshot().get();
EXPECT_EQ(original_thread_snapshot_pointer, loader_->threadsafeSnapshot().get());
foo_read.notifyOne();
}

foo_changed.wait(mutex);
EXPECT_EQ("eep", loader_->threadsafeSnapshot()->get("foo"));
{
Thread::LockGuard lock(mutex);
if (!updated_eep) {
foo_changed.wait(mutex);
}
EXPECT_EQ("eep", loader_->threadsafeSnapshot()->get("foo"));
}
});

{
Thread::LockGuard lock(mutex);
foo_read.wait(mutex);
if (!read_bar) {
foo_read.wait(mutex);
}
loader_->mergeValues({{"foo", "eep"}});
updated_eep = true;
}

{
Thread::LockGuard lock(mutex);
foo_changed.notifyOne();
EXPECT_EQ("eep", loader_->threadsafeSnapshot()->get("foo"));
}
Expand Down