commit 0ad1dd237e3bfc8874335b58e1a937f57752f924
author Abdulla Kamar <abdulla@google.com> Mon Nov 16 02:13:35 2020 +0000
committer CQ Bot <commit-bot@chromium.org> Mon Nov 16 02:13:35 2020 +0000
tree 1f94767c934ed3454290b175017bd1b2a730b2b7
parent 68285f5315f55c6941d301a10c2cdbc646878c10

[virtualization] Small cleanup to EnclosedGuest

Put the async::Loop behind a function, and change pre-fix increment to
post-fix increment to mirror existing style.

Change-Id: I63dfb0f0b862226d90cb112fbe45b06c945bb2e0
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/450659
Testability-Review: Abdulla Kamar <abdulla@google.com>
Fuchsia-Auto-Submit: Abdulla Kamar <abdulla@google.com>
Reviewed-by: Alex Legg <alexlegg@google.com>
Commit-Queue: Abdulla Kamar <abdulla@google.com>

src/virtualization/tests/enclosed_guest.cc

diff --git a/src/virtualization/tests/enclosed_guest.cc b/src/virtualization/tests/enclosed_guest.cc
index 8e02a83..104e432 100644
--- a/src/virtualization/tests/enclosed_guest.cc
+++ b/src/virtualization/tests/enclosed_guest.cc
@@ -121,7 +121,7 @@
   enclosing_environment_ =
       sys::testing::EnclosingEnvironment::Create(kRealm, real_env_, std::move(services));
   bool environment_running = RunLoopUntil(
-      &loop_, [this] { return enclosing_environment_->is_running(); },
+      GetLoop(), [this] { return enclosing_environment_->is_running(); },
       PeriodicLogger("Creating guest sandbox", zx::sec(10)));
   if (!environment_running) {
     FX_LOGS(ERROR) << "Timed out waiting for guest sandbox environment to become ready.";
@@ -156,13 +156,13 @@
                            launch_complete = true;
                          });
   RunLoopUntil(
-      &loop_, [&launch_complete]() { return launch_complete; },
+      GetLoop(), [&launch_complete]() { return launch_complete; },
       PeriodicLogger("Launching guest", zx::sec(10)));
 
   zx::socket serial_socket;
   guest_->GetSerial([&serial_socket](zx::socket s) { serial_socket = std::move(s); });
   bool socket_valid = RunLoopUntil(
-      &loop_, [&serial_socket] { return serial_socket.is_valid(); },
+      GetLoop(), [&serial_socket] { return serial_socket.is_valid(); },
       PeriodicLogger("Connecting to guest serial", zx::sec(10)));
   if (!socket_valid) {
     FX_LOGS(ERROR) << "Timed out waiting to connect to guest's serial.";
@@ -210,7 +210,7 @@
 zx_status_t ZirconEnclosedGuest::WaitForSystemReady() {
   PeriodicLogger logger{"Waiting for guest system shell", zx::sec(10)};
   std::string ps;
-  for (size_t i = 0; i != kNumRetries; ++i) {
+  for (size_t i = 0; i != kNumRetries; i++) {
     logger.LogIfRequired();
     zx_status_t status = Execute({"ps"}, {}, &ps);
     if (status != ZX_OK) {
@@ -261,7 +261,7 @@
 
 zx_status_t DebianEnclosedGuest::WaitForSystemReady() {
   PeriodicLogger logger{"Waiting for guest system shell", zx::sec(10)};
-  for (size_t i = 0; i != kNumRetries; ++i) {
+  for (size_t i = 0; i != kNumRetries; i++) {
     logger.LogIfRequired();
     std::string response;
     zx_status_t status = Execute({"echo", "guest ready"}, {}, &response);
@@ -349,7 +349,7 @@
         server_ = std::move(result);
         return fit::ok();
       }));
-  if (!RunLoopUntil(&loop_, [this] { return server_ != nullptr; })) {
+  if (!RunLoopUntil(GetLoop(), [this] { return server_ != nullptr; })) {
     return ZX_ERR_TIMED_OUT;
   }
 
@@ -373,7 +373,7 @@
   // The VM will connect to the StartupListener port when it's ready and we'll
   // create the maitred stub in |VmReady|.
   if (!RunLoopUntil(
-          &loop_, [this] { return maitred_ != nullptr; },
+          GetLoop(), [this] { return maitred_ != nullptr; },
           PeriodicLogger("Wait for maitred", zx::sec(1)))) {
     return ZX_ERR_TIMED_OUT;
   }

src/virtualization/tests/enclosed_guest.h

diff --git a/src/virtualization/tests/enclosed_guest.h b/src/virtualization/tests/enclosed_guest.h
index deb38f1..96043a6 100644
--- a/src/virtualization/tests/enclosed_guest.h
+++ b/src/virtualization/tests/enclosed_guest.h
@@ -106,10 +106,10 @@
   // accept connections before the guest attempts to connect to them.
   virtual zx_status_t SetupVsockServices() { return ZX_OK; }
 
- protected:
-  async::Loop loop_;
+  async::Loop* GetLoop() { return &loop_; }
 
  private:
+  async::Loop loop_;
   std::shared_ptr<sys::ServiceDirectory> real_services_;
   fuchsia::sys::EnvironmentPtr real_env_;
   std::unique_ptr<sys::testing::EnclosingEnvironment> enclosing_environment_;