commit 43e72433fd2115b4213b5db06568ebd1c550e7d1
author Andreas Gampe <agampe@google.com> Tue May 14 16:15:24 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu May 16 01:00:21 2019 +0000
tree 32b71a387354aaa09cbc07a146fc6f16a0eb6882
parent 391be3ab96ebe8d9cc00849a3bb8058708416000

ART: Remove file_utils' ReadFileToString

Replace with libbase.

Test: mmma art
Change-Id: Id042f4879485e743e3dc7548434be1634370ee66

runtime/native_stack_dump.cc

diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index 150fa78..ba5d141 100644
--- a/runtime/native_stack_dump.cc
+++ b/runtime/native_stack_dump.cc
@@ -39,6 +39,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include "android-base/file.h"
 #include "android-base/stringprintf.h"
 #include "android-base/strings.h"
 
@@ -418,7 +419,7 @@
 
   std::string kernel_stack_filename(StringPrintf("/proc/self/task/%d/stack", tid));
   std::string kernel_stack;
-  if (!ReadFileToString(kernel_stack_filename, &kernel_stack)) {
+  if (!android::base::ReadFileToString(kernel_stack_filename, &kernel_stack)) {
     os << prefix << "(couldn't read " << kernel_stack_filename << ")\n";
     return;
   }

runtime/signal_catcher.cc

diff --git a/runtime/signal_catcher.cc b/runtime/signal_catcher.cc
index 8da5fee..9b3de2a 100644
--- a/runtime/signal_catcher.cc
+++ b/runtime/signal_catcher.cc
@@ -27,6 +27,7 @@
 
 #include <sstream>
 
+#include <android-base/file.h>
 #include <android-base/stringprintf.h>
 
 #include "arch/instruction_set.h"
@@ -52,7 +53,7 @@
   // On Android, /proc/self/cmdline will have been rewritten to something like "system_server".
   // Note: The string "Cmd line:" is chosen to match the format used by debuggerd.
   std::string current_cmd_line;
-  if (ReadFileToString("/proc/self/cmdline", &current_cmd_line)) {
+  if (android::base::ReadFileToString("/proc/self/cmdline", &current_cmd_line)) {
     current_cmd_line.resize(current_cmd_line.find_last_not_of('\0') + 1);  // trim trailing '\0's
     std::replace(current_cmd_line.begin(), current_cmd_line.end(), '\0', ' ');
 
@@ -133,7 +134,7 @@
 
   if ((false)) {
     std::string maps;
-    if (ReadFileToString("/proc/self/maps", &maps)) {
+    if (android::base::ReadFileToString("/proc/self/maps", &maps)) {
       os << "/proc/self/maps:\n" << maps;
     }
   }

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index d6fce6a..1ad5b7e 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -35,6 +35,7 @@
 #include <list>
 #include <sstream>
 
+#include "android-base/file.h"
 #include "android-base/stringprintf.h"
 #include "android-base/strings.h"
 
@@ -1773,7 +1774,8 @@
   // 1:cpuacct,cpu:/
   // We want the third field from the line whose second field contains the "cpu" token.
   std::string cgroup_file;
-  if (!ReadFileToString(StringPrintf("/proc/self/task/%d/cgroup", tid), &cgroup_file)) {
+  if (!android::base::ReadFileToString(StringPrintf("/proc/self/task/%d/cgroup", tid),
+                                       &cgroup_file)) {
     return "";
   }
   std::vector<std::string> cgroup_lines;
@@ -1898,7 +1900,8 @@
 
   // Grab the scheduler stats for this thread.
   std::string scheduler_stats;
-  if (ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid), &scheduler_stats)
+  if (android::base::ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid),
+                                      &scheduler_stats)
       && !scheduler_stats.empty()) {
     scheduler_stats = android::base::Trim(scheduler_stats);  // Lose the trailing '\n'.
   } else {