commit 71cb0b83ae674f5f51784fa718a6aa8dbc5c3862
author David Gilhooley <dgilhooley@google.com> Wed Nov 11 16:15:08 2020 +0000
committer CQ Bot <commit-bot@chromium.org> Wed Nov 11 16:15:08 2020 +0000
tree 996ae458a9c57df4444c0d0ac5fed6246163d829
parent a7bc347700b18d6abd6495ac18152c24024f8aa1

[virtcon] Fix keep-log-visible

Fix a change where the virtcon log was not visible if other
components passed virtcon shells over the virtualconsole
FIDL.

This is tested in the second CL in this set.

Bug: b/172013247

Change-Id: I9282d7e671e661312d97c0c8296d046f5a521507
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/449240
Reviewed-by: Suraj Malhotra <surajmalhotra@google.com>
Testability-Review: Suraj Malhotra <surajmalhotra@google.com>
Commit-Queue: David Gilhooley <dgilhooley@google.com>

src/bringup/bin/virtcon/main.cc

diff --git a/src/bringup/bin/virtcon/main.cc b/src/bringup/bin/virtcon/main.cc
index 96baa75..ccbb260 100644
--- a/src/bringup/bin/virtcon/main.cc
+++ b/src/bringup/bin/virtcon/main.cc
@@ -49,8 +49,6 @@
 
 namespace fpty = ::llcpp::fuchsia::hardware::pty;
 
-static bool keep_log;
-
 static zx_status_t launch_shell(vc_t* vc, int fd, const char* cmd) {
   const char* argv[] = {ZX_SHELL_DEFAULT, nullptr, nullptr, nullptr};
 
@@ -246,7 +244,8 @@
 
 class VirtconImpl final : public llcpp::fuchsia::virtualconsole::SessionManager::Interface {
  public:
-  VirtconImpl(async_dispatcher_t* dispatcher) : dispatcher_(dispatcher) {}
+  VirtconImpl(async_dispatcher_t* dispatcher, bool keep_log)
+      : dispatcher_(dispatcher), keep_log_(keep_log) {}
 
   zx_status_t Bind(zx::channel request) {
     auto result = fidl::BindServer(dispatcher_, std::move(request), this);
@@ -257,7 +256,7 @@
   }
 
   void CreateSession(::zx::channel session, CreateSessionCompleter::Sync& completer) override {
-    bool make_active = !(keep_log && g_active_vc && g_active_vc == g_log_vc && g_active_vc);
+    bool make_active = !(keep_log_ && g_active_vc && g_active_vc == g_log_vc && g_active_vc);
     vc_t* vc = nullptr;
     if (remote_session_create(&vc, std::move(session), make_active,
                               &color_schemes[kDefaultColorScheme]) < 0) {
@@ -275,6 +274,7 @@
 
  private:
   async_dispatcher_t* dispatcher_;
+  bool keep_log_;
 };
 
 int main(int argc, char** argv) {
@@ -318,7 +318,7 @@
 
   async::Loop loop = async::Loop(&kAsyncLoopConfigNeverAttachToThread);
 
-  VirtconImpl virtcon_server = VirtconImpl(loop.dispatcher());
+  VirtconImpl virtcon_server = VirtconImpl(loop.dispatcher(), args.keep_log_visible);
 
   svc::Outgoing outgoing(loop.dispatcher());
   status = outgoing.ServeFromStartupInfo();