commit c9766a24523efe860d71638223377f0c5450e9ef
author Florian Mayer <fmayer@google.com> Tue May 11 12:15:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 11 12:15:42 2021 +0000
tree 15f09c461a5c2ba0bf5e018e1de1575fb05b2499
parent 8e75f9753c57506bb0022214f3f0a358ac177efd
parent 120e4062a6743891f75f383a519785968b29a886

Do not try to connect to heapprofd. am: 120e4062a6

Original change: https://android-review.googlesource.com/c/platform/art/+/1703006

Change-Id: Ib347558e6d43678cab4e7190dede57312da779a3

perfetto_hprof/perfetto_hprof.cc

diff --git a/perfetto_hprof/perfetto_hprof.cc b/perfetto_hprof/perfetto_hprof.cc
index c718cc0..a5ed2da 100644
--- a/perfetto_hprof/perfetto_hprof.cc
+++ b/perfetto_hprof/perfetto_hprof.cc
@@ -152,20 +152,6 @@
   return false;
 }
 
-bool CanConnectToSocket(const char* name) {
-  struct sockaddr_un addr = {};
-  addr.sun_family = AF_UNIX;
-  strncpy(addr.sun_path, name, sizeof(addr.sun_path) - 1);
-  int fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-  if (fd == -1) {
-    PLOG(ERROR) << "failed to create socket";
-    return false;
-  }
-  bool connected = connect(fd, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == 0;
-  close(fd);
-  return connected;
-}
-
 constexpr size_t kMaxCmdlineSize = 512;
 
 class JavaHprofDataSource : public perfetto::DataSource<JavaHprofDataSource> {
@@ -188,12 +174,6 @@
         new perfetto::protos::pbzero::JavaHprofConfig::Decoder(
           args.config->java_hprof_config_raw()));
 
-    if (args.config->enable_extra_guardrails() && !CanConnectToSocket("/dev/socket/heapprofd")) {
-      LOG(ERROR) << "rejecting extra guardrails";
-      enabled_ = false;
-      return;
-    }
-
     dump_smaps_ = cfg->dump_smaps();
     for (auto it = cfg->ignored_types(); it; ++it) {
       std::string name = (*it).ToStdString();