Split apart //cuttlefish/process:command_subprocess

base/cvd/allocd/BUILD.bazel

@@ -40,7 +40,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:network",
         "//cuttlefish/host/commands/cvd/utils:common",
         "//cuttlefish/host/libs/config:logging",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "@abseil-cpp//absl/base:no_destructor",
         "@abseil-cpp//absl/log",
@@ -55,7 +55,7 @@ cf_cc_library(
     hdrs = ["alloc_driver.h"],
     depend_on_what_you_use_enabled = False,
     deps = [
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
@@ -71,7 +71,7 @@ cf_cc_library(
     deps = [
         "//allocd/net:netlink",
         "//cuttlefish/common/libs/fs",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",

base/cvd/allocd/alloc_iproute2.cpp

@@ -19,7 +19,7 @@
 #include "absl/strings/str_cat.h"
 
 #include "allocd/alloc_driver.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {

base/cvd/allocd/alloc_netlink.cpp

@@ -43,7 +43,7 @@
 #include "allocd/net/netlink_client.h"
 #include "allocd/net/netlink_request.h"
 #include "cuttlefish/common/libs/fs/shared_fd.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {

base/cvd/allocd/alloc_utils.cpp

@@ -37,7 +37,7 @@
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/network.h"
 #include "cuttlefish/host/commands/cvd/utils/common.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 #ifdef __linux__

base/cvd/cuttlefish/common/libs/utils/BUILD.bazel

@@ -10,7 +10,7 @@ cf_cc_library(
     hdrs = ["archive.h"],
     depend_on_what_you_use_enabled = False,
     deps = [
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -75,7 +75,7 @@ cf_cc_library(
     hdrs = ["disk_usage.h"],
     depend_on_what_you_use_enabled = False,
     deps = [
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -249,33 +249,6 @@ cf_cc_test(
     deps = [":network"],
 )
 
-cf_cc_library(
-    name = "proc_file_utils",
-    srcs = ["proc_file_utils.cpp"],
-    hdrs = ["proc_file_utils.h"],
-    deps = [
-        "//cuttlefish/common/libs/fs",
-        "//cuttlefish/common/libs/utils:files",
-        "//cuttlefish/posix:readlink",
-        "//cuttlefish/result",
-        "//libbase",
-        "@abseil-cpp//absl/log",
-        "@abseil-cpp//absl/strings",
-        "@fmt",
-    ],
-)
-
-cf_cc_test(
-    name = "proc_file_utils_test",
-    srcs = ["proc_file_utils_test.cpp"],
-    depend_on_what_you_use_enabled = False,
-    deps = [
-        "//cuttlefish/common/libs/utils:contains",
-        "//cuttlefish/common/libs/utils:proc_file_utils",
-        "//cuttlefish/result",
-    ],
-)
-
 cf_cc_library(
     name = "proto",
     hdrs = ["proto.h"],
@@ -359,7 +332,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/fs",
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:environment",
-        "//cuttlefish/common/libs/utils:proc_file_utils",
+        "//cuttlefish/process:proc_file_utils",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -466,7 +439,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:wait_for_file",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "@abseil-cpp//absl/log",

base/cvd/cuttlefish/common/libs/utils/archive.cpp

@@ -27,7 +27,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/strip.h"
 
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
 

base/cvd/cuttlefish/common/libs/utils/disk_usage.cpp

@@ -25,7 +25,7 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
 
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
 

base/cvd/cuttlefish/common/libs/utils/tee_logging.cpp

@@ -45,7 +45,7 @@
 
 #include "cuttlefish/common/libs/fs/shared_buf.h"
 #include "cuttlefish/common/libs/utils/environment.h"
-#include "cuttlefish/common/libs/utils/proc_file_utils.h"
+#include "cuttlefish/process/proc_file_utils.h"
 #include "cuttlefish/result/result.h"
 
 using absl::StrFormat;

base/cvd/cuttlefish/common/libs/utils/wait_for_unix_socket.cpp

@@ -24,7 +24,7 @@
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/wait_for_file.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
 

base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel

@@ -101,7 +101,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:kernel_args",
         "//cuttlefish/host/libs/config:mkenvimage_slim",
         "//cuttlefish/host/libs/vm_manager",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -138,7 +138,8 @@ cf_cc_library(
         "//cuttlefish/io:shared_fd",
         "//cuttlefish/io:string",
         "//cuttlefish/io:write_exact",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -172,9 +173,9 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:in_sandbox",
-        "//cuttlefish/common/libs/utils:proc_file_utils",
         "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/posix:strerror",
+        "//cuttlefish/process:proc_file_utils",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -419,7 +420,7 @@ cf_cc_library(
         "//cuttlefish/pretty:optional",
         "//cuttlefish/pretty:string",
         "//cuttlefish/pretty:struct",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -448,7 +449,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:guest_hwui_renderer",
         "//cuttlefish/host/libs/config:guest_renderer_preload",
         "//cuttlefish/host/libs/config:vmm_mode",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -599,7 +600,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:fetcher_config",
         "//cuttlefish/host/libs/config:file_source",
         "//cuttlefish/host/libs/config:known_paths",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -640,7 +641,8 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:known_paths",
         "//cuttlefish/io:shared_fd",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",

base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc

@@ -49,7 +49,8 @@
 #include "cuttlefish/io/shared_fd.h"
 #include "cuttlefish/io/string.h"
 #include "cuttlefish/io/write_exact.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {
@@ -69,7 +70,7 @@ Result<void> RunMkBootFs(const std::string& input_dir,
 
   int success = Command(HostBinaryPath("mkbootfs"))
                     .AddParameter(input_dir)
-                    .RedirectStdIO(Subprocess::StdIOChannel::kStdOut, output_fd)
+                    .RedirectStdIO(Command::StdIoChannel::kStdOut, output_fd)
                     .Start()
                     .Wait();
   CF_EXPECT_EQ(success, 0, "`mkbootfs` failed.");
@@ -183,7 +184,7 @@ Result<void> UnpackRamdisk(const std::string& original_ramdisk_path,
   Command(CpioBinary())
       .AddParameter("-idu")
       .SetWorkingDirectory(ramdisk_stage_dir)
-      .RedirectStdIO(Subprocess::StdIOChannel::kStdIn, input)
+      .RedirectStdIO(Command::StdIoChannel::kStdIn, input)
       .Start()
       .Wait();
   return {};

base/cvd/cuttlefish/host/commands/assemble_cvd/clean.cc

@@ -28,9 +28,9 @@
 
 #include "cuttlefish/common/libs/utils/files.h"
 #include "cuttlefish/common/libs/utils/in_sandbox.h"
-#include "cuttlefish/common/libs/utils/proc_file_utils.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/posix/strerror.h"
+#include "cuttlefish/process/proc_file_utils.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc

@@ -40,7 +40,7 @@
 #include "cuttlefish/host/libs/config/guest_hwui_renderer.h"
 #include "cuttlefish/host/libs/config/guest_renderer_preload.h"
 #include "cuttlefish/host/libs/config/vmm_mode.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
 

base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc

@@ -47,7 +47,7 @@
 #include "cuttlefish/host/libs/config/gpu_mode.h"
 #include "cuttlefish/pretty/optional.h"
 #include "cuttlefish/pretty/string.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
 #include "cuttlefish/process/managed_stdio.h"
 #include "cuttlefish/result/result.h"
 

base/cvd/cuttlefish/host/commands/assemble_cvd/super_image_mixer.cc

@@ -39,7 +39,7 @@
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 #include "cuttlefish/host/libs/config/file_source.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/host/commands/assemble_cvd/vendor_dlkm_utils.cc

@@ -44,7 +44,8 @@
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/io/shared_fd.h"
-#include "cuttlefish/process/command_subprocess.h"
+#include "cuttlefish/process/command.h"
+#include "cuttlefish/process/execute.h"
 #include "cuttlefish/result/result.h"
 
 namespace cuttlefish {

base/cvd/cuttlefish/host/commands/cvd/BUILD.bazel

@@ -43,7 +43,7 @@ cf_cc_binary(
         "//cuttlefish/host/commands/cvd/version",
         "//cuttlefish/host/libs/vm_manager",
         "//cuttlefish/posix:strerror",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:envp_to_map",
         "//libbase",
         "@abseil-cpp//absl/cleanup",
         "@abseil-cpp//absl/log",

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

@@ -159,7 +159,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/metrics:device_metrics_orchestration",
         "//cuttlefish/posix:strerror",
         "//cuttlefish/posix:symlink",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -189,7 +189,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances:config_path",
         "//cuttlefish/host/commands/cvd/utils",
         "//cuttlefish/host/libs/config:config_constants",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",

base/cvd/cuttlefish/host/commands/cvd/cli/commands/BUILD.bazel

@@ -34,7 +34,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/log_names",
         "//cuttlefish/host/libs/zip:zip_file",
         "//cuttlefish/host/libs/zip/libzip_cc:archive",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -105,7 +105,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_manager",
         "//cuttlefish/host/commands/cvd/utils",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/result",
         "@abseil-cpp//absl/strings",
     ],
@@ -125,7 +125,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_manager",
         "//cuttlefish/host/commands/cvd/utils",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -200,7 +200,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/host/commands/cvd/utils",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -391,7 +391,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_manager",
         "//cuttlefish/host/commands/cvd/utils",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log",
@@ -429,7 +429,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/log_names",
         "//cuttlefish/host/libs/metrics:device_metrics_orchestration",
         "//cuttlefish/posix:symlink",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:command",
         "//cuttlefish/process:managed_stdio",
         "//cuttlefish/result",
         "//libbase",
@@ -511,7 +511,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/cvd/cli:help_format",
         "//cuttlefish/host/commands/cvd/cli/commands:command_handler",
         "//cuttlefish/host/libs/vm_manager",
-        "//cuttlefish/process:command_subprocess",
+        "//cuttlefish/process:execute",
         "//cuttlefish/result",
         "@abseil-cpp//absl/strings",
     ],