Add a default value to the timeout in InstanceManager::StopInstanceGroup

Every caller was passing the same values.

Author: Databean

base/cvd/cuttlefish/host/commands/cvd/cli/commands/remove.cpp

@@ -16,7 +16,6 @@
 
 #include "cuttlefish/host/commands/cvd/cli/commands/remove.h"
 
-#include <chrono>
 #include <string>
 #include <vector>
 
@@ -94,7 +93,7 @@ Result<void> RemoveCvdCommandHandler::StopGroup(
     return {};
   }
   CF_EXPECT(instance_manager_.StopInstanceGroup(
-      group, std::chrono::seconds(5), InstanceDirActionOnStop::Clear));
+      group, InstanceDirActionOnStop::Clear));
   return {};
 }
 

base/cvd/cuttlefish/host/commands/cvd/cli/commands/start.cpp

@@ -24,7 +24,6 @@
 #include <unistd.h>
 
 #include <algorithm>
-#include <chrono>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -504,7 +503,7 @@ Result<void> CvdStartCommandHandler::Handle(const CommandRequest& request) {
 
     LOG(INFO) << "Stopping device...";
     CF_EXPECT(instance_manager_.StopInstanceGroup(
-        group, std::chrono::seconds(5), InstanceDirActionOnStop::Keep, {}));
+        group, InstanceDirActionOnStop::Keep));
     LOG(INFO) << "Device stopped.";
     return monitor_res;
   }

base/cvd/cuttlefish/host/commands/cvd/cli/commands/stop.cpp

@@ -41,10 +41,6 @@ namespace {
 
 constexpr char kSummaryHelpText[] = "Stop Cuttlefish instances";
 
-struct StopFlags {
-  size_t wait_for_launcher_secs = 5;
-  bool clear_instance_dirs = false;
-};
 }  // namespace
 
 CvdStopCommandHandler::CvdStopCommandHandler(InstanceManager& instance_manager)
@@ -80,10 +76,10 @@ Result<void> CvdStopCommandHandler::Handle(const CommandRequest& request) {
   }
 
   Result<void> stop_outcome = instance_manager_.StopInstanceGroup(
-      group, launcher_timeout,
+      group,
       flags_.clear_instance_dirs ? InstanceDirActionOnStop::Clear
                                  : InstanceDirActionOnStop::Keep,
-      instance_nums);
+      launcher_timeout.value_or(std::chrono::seconds(0)), instance_nums);
 
   GatherVmStopMetrics(group);
 

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.cpp

@@ -212,9 +212,8 @@ Result<void> InstanceManager::UpdateInstanceGroup(
 }
 
 Result<void> InstanceManager::StopInstanceGroup(
-    LocalInstanceGroup& group,
-    std::optional<std::chrono::seconds> launcher_timeout,
-    InstanceDirActionOnStop instance_dir_action,
+    LocalInstanceGroup& group, InstanceDirActionOnStop instance_dir_action,
+    std::chrono::seconds launcher_timeout,
     const std::vector<unsigned>& instance_nums) {
   // Validate that the requested instances actually belong to this group
   std::set<unsigned> valid_ids;
@@ -231,14 +230,10 @@ Result<void> InstanceManager::StopInstanceGroup(
 
   const auto stop_bin = CF_EXPECT(StopBin(group.HostArtifactsPath()));
   const auto stop_bin_path = group.HostArtifactsPath() + "/bin/" + stop_bin;
-  int wait_for_launcher_secs = 0;
-  if (launcher_timeout.has_value()) {
-    wait_for_launcher_secs = launcher_timeout->count();
-  }
   Result<void> cmd_result = RunStopCvd(StopCvdParams{
       .bin_path = stop_bin_path,
       .home_dir = group.HomeDir(),
-      .wait_for_launcher_secs = wait_for_launcher_secs,
+      .wait_for_launcher_secs = static_cast<int>(launcher_timeout.count()),
       .clear_runtime_dirs =
           instance_dir_action == InstanceDirActionOnStop::Clear,
       .instance_nums = instance_nums,
@@ -271,8 +266,8 @@ Result<void> InstanceManager::Clear() {
   for (auto& group : instance_groups) {
     // Only stop running instances.
     if (group.HasActiveInstances()) {
-      auto stop_result = StopInstanceGroup(group, std::chrono::seconds(5),
-                                           InstanceDirActionOnStop::Clear);
+      Result<void> stop_result =
+          StopInstanceGroup(group, InstanceDirActionOnStop::Clear);
       if (!stop_result.ok()) {
         LOG(ERROR) << stop_result.error();
       }

base/cvd/cuttlefish/host/commands/cvd/instances/instance_manager.h

@@ -83,9 +83,8 @@ class InstanceManager {
   // Stops the device by asking it over the control socket. If launcher_timeout
   // has a value, it will wait for at most that time before returning an error.
   Result<void> StopInstanceGroup(
-      LocalInstanceGroup& group,
-      std::optional<std::chrono::seconds> launcher_timeout,
-      InstanceDirActionOnStop instance_dir_action,
+      LocalInstanceGroup& group, InstanceDirActionOnStop instance_dir_action,
+      std::chrono::seconds launcher_timeout = std::chrono::seconds(5),
       const std::vector<unsigned>& instance_nums = {});
 
  private: