From 9511ab003a38b43356daa99c802feb7117f85f8c Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 25 Jul 2022 23:32:25 -0700
Subject: [PATCH] [iwyu] Add test/core/memory_usage (#30408)

* include-fix

* include-fix

* iwyu headers

* clang-fmt

* fix
---
 test/core/memory_usage/callback_client.cc   | 33 ++++-----------------
 test/core/memory_usage/callback_server.cc   | 32 ++++++--------------
 test/core/memory_usage/client.cc            | 13 ++++++--
 test/core/memory_usage/memory_usage_test.cc | 10 ++++---
 test/core/memory_usage/memstats.h           |  3 +-
 test/core/memory_usage/server.cc            | 11 +++++--
 tools/dockerfile/grpc_iwyu/iwyu.sh          |  1 +
 7 files changed, 42 insertions(+), 61 deletions(-)

diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc
index e16b10932a8..fa2dd1e1f4b 100644
--- a/test/core/memory_usage/callback_client.cc
+++ b/test/core/memory_usage/callback_client.cc
@@ -16,41 +16,20 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <memory>
+#include <string>
 
-#include <gtest/gtest.h>
-
-#include "absl/algorithm/container.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
-#include "util/logging.h"
+#include "absl/strings/string_view.h"
 
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/time.h>
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/client_callback.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/status.h>
 
-#include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/env.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/iomgr/sockaddr.h"
-#include "src/core/lib/iomgr/socket_utils.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
-#include "test/core/memory_usage/memstats.h"
-#include "test/core/util/port.h"
-#include "test/core/util/subprocess.h"
+#include "src/proto/grpc/testing/messages.pb.h"
 #include "test/core/util/test_config.h"
 
 ABSL_FLAG(std::string, target, "", "Target host:port");
diff --git a/test/core/memory_usage/callback_server.cc b/test/core/memory_usage/callback_server.cc
index a8b63bdcbf2..98934f96ea8 100644
--- a/test/core/memory_usage/callback_server.cc
+++ b/test/core/memory_usage/callback_server.cc
@@ -16,38 +16,24 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <signal.h>
+#include <unistd.h>
 
-#include <thread>
+#include <memory>
+#include <string>
 
-#include <gtest/gtest.h>
-
-#include "absl/algorithm/container.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
-#include "util/logging.h"
+#include "absl/strings/string_view.h"
 
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/time.h>
 #include <grpcpp/grpcpp.h>
-#include <grpcpp/support/client_callback.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/support/status.h>
 
-#include "src/core/lib/address_utils/sockaddr_utils.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/env.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
-#include "src/core/lib/gprpp/host_port.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
-#include "test/core/memory_usage/memstats.h"
-#include "test/core/util/port.h"
-#include "test/core/util/subprocess.h"
+#include "src/proto/grpc/testing/messages.pb.h"
 #include "test/core/util/test_config.h"
 
 class ServerCallbackImpl final
diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc
index e53b7c1bd07..9c76689f217 100644
--- a/test/core/memory_usage/client.cc
+++ b/test/core/memory_usage/client.cc
@@ -16,23 +16,30 @@
  *
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/strings/string_view.h"
 
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
+#include <grpc/impl/codegen/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/env.h"
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 #include "test/core/memory_usage/memstats.h"
 #include "test/core/util/test_config.h"
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc
index 4c66f34754f..d266a6ac973 100644
--- a/test/core/memory_usage/memory_usage_test.cc
+++ b/test/core/memory_usage/memory_usage_test.cc
@@ -19,21 +19,23 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <algorithm>
+#include <iterator>
 #include <map>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
-#include "util/logging.h"
+#include "absl/strings/string_view.h"
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "test/core/util/port.h"
 #include "test/core/util/subprocess.h"
diff --git a/test/core/memory_usage/memstats.h b/test/core/memory_usage/memstats.h
index 615ea17f222..47da40946b1 100644
--- a/test/core/memory_usage/memstats.h
+++ b/test/core/memory_usage/memstats.h
@@ -17,7 +17,8 @@
 
 #include <stdlib.h>
 #include <sys/resource.h>
-#include <sys/time.h>
+
+// IWYU pragma: no_include <bits/types/struct_rusage.h>
 
 struct MemStats {
   long rss;  // Resident set size, in kb
diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc
index 7cc68d157e5..4b4b28309e1 100644
--- a/test/core/memory_usage/server.cc
+++ b/test/core/memory_usage/server.cc
@@ -17,18 +17,24 @@
  */
 
 #include <signal.h>
-#include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <time.h>
 
+#include <algorithm>
 #include <string>
+#include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/strings/string_view.h"
 
+#include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 
 #include "test/core/memory_usage/memstats.h"
 #ifndef _WIN32
@@ -43,7 +49,6 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/host_port.h"
 #include "test/core/end2end/data/ssl_test_data.h"
-#include "test/core/memory_usage/memstats.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"
 
diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh
index 3c5d8fb8446..d464dd29941 100755
--- a/tools/dockerfile/grpc_iwyu/iwyu.sh
+++ b/tools/dockerfile/grpc_iwyu/iwyu.sh
@@ -47,6 +47,7 @@ export ENABLED_MODULES='
   src/core/lib
   src/cpp
   test/core/end2end
+  test/core/memory_usage
   test/core/promise
   test/core/resource_quota
   test/core/uri