diff options
author | btolsch <btolsch@chromium.org> | 2021-03-31 17:28:06 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-04-01 05:39:53 +0000 |
commit | 207f3b2b5814bbbe2530b3d0f8fb4da1665a02ce (patch) | |
tree | d7db89ed9d5966e338ace0a8c3b21b719ece81b1 /cast | |
parent | fc203961115e4e9a0e2216c7abc6f46191e99105 (diff) | |
download | openscreen-207f3b2b5814bbbe2530b3d0f8fb4da1665a02ce.tar.gz |
Remove OperationLoop
This change removes OperationLoop because it's only used in one place
and is arguably confusing. OperationLoop mixes sleep() and select()
usage, with separate timeouts, which has resulted in some "tuning" bugs
in the past. Since there's no benefit to the sleep portion and it is
also what causes the confusion, this change removes it and thing
directly uses SocketHandleWaiter in PlatformClientPosix.
Bug: None
Change-Id: I9f62c9253bee7d29b26d1838d34c1399f4d472b5
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2798852
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'cast')
-rw-r--r-- | cast/common/discovery/e2e_test/tests.cc | 2 | ||||
-rw-r--r-- | cast/standalone_receiver/main.cc | 4 | ||||
-rw-r--r-- | cast/standalone_sender/main.cc | 4 | ||||
-rw-r--r-- | cast/test/cast_socket_e2e_test.cc | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/cast/common/discovery/e2e_test/tests.cc b/cast/common/discovery/e2e_test/tests.cc index 9a02053b..7c294418 100644 --- a/cast/common/discovery/e2e_test/tests.cc +++ b/cast/common/discovery/e2e_test/tests.cc @@ -143,7 +143,7 @@ class DiscoveryE2ETest : public testing::Test { // Sleep to let any packets clear off the network before further tests. std::this_thread::sleep_for(milliseconds(500)); - PlatformClientPosix::Create(milliseconds(50), milliseconds(50)); + PlatformClientPosix::Create(milliseconds(50)); task_runner_ = PlatformClientPosix::GetInstance()->GetTaskRunner(); } diff --git a/cast/standalone_receiver/main.cc b/cast/standalone_receiver/main.cc index 9faee412..9e305c8b 100644 --- a/cast/standalone_receiver/main.cc +++ b/cast/standalone_receiver/main.cc @@ -230,9 +230,7 @@ int RunStandaloneReceiver(int argc, char* argv[]) { } auto* const task_runner = new TaskRunnerImpl(&Clock::now); - // Cast has high networking demands--network operation timing and timeout must - // be kept extremely small. - PlatformClientPosix::Create(microseconds(50), microseconds(50), + PlatformClientPosix::Create(milliseconds(50), std::unique_ptr<TaskRunnerImpl>(task_runner)); RunCastService(task_runner, interface, std::move(creds.value()), friendly_name, model_name, discovery_enabled); diff --git a/cast/standalone_sender/main.cc b/cast/standalone_sender/main.cc index 7479adc1..75b50553 100644 --- a/cast/standalone_sender/main.cc +++ b/cast/standalone_sender/main.cc @@ -174,9 +174,7 @@ int StandaloneSenderMain(int argc, char* argv[]) { #endif auto* const task_runner = new TaskRunnerImpl(&Clock::now); - // Cast has high networking demands--network operation timing and timeout must - // be kept extremely small. - PlatformClientPosix::Create(microseconds(50), microseconds(50), + PlatformClientPosix::Create(milliseconds(50), std::unique_ptr<TaskRunnerImpl>(task_runner)); IPEndpoint remote_endpoint = ParseAsEndpoint(iface_or_endpoint); diff --git a/cast/test/cast_socket_e2e_test.cc b/cast/test/cast_socket_e2e_test.cc index 1f3273fa..446a880c 100644 --- a/cast/test/cast_socket_e2e_test.cc +++ b/cast/test/cast_socket_e2e_test.cc @@ -136,8 +136,7 @@ class ReceiverSocketsClient class CastSocketE2ETest : public ::testing::Test { public: void SetUp() override { - PlatformClientPosix::Create(std::chrono::milliseconds(10), - std::chrono::milliseconds(0)); + PlatformClientPosix::Create(std::chrono::milliseconds(10)); task_runner_ = PlatformClientPosix::GetInstance()->GetTaskRunner(); sender_router_ = MakeSerialDelete<VirtualConnectionRouter>(task_runner_); |