simpleperf: report symbols of native libraries in apk file.

[android-x86/system-extras.git] / simpleperf / utils.cpp

diff --git a/simpleperf/utils.cpp b/simpleperf/utils.cpp
index ccb10f5..2e68767 100644 (file)
--- a/simpleperf/utils.cpp
+++ b/simpleperf/utils.cpp
@@ -18,6 +18,7 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/stat.h>
@@ -26,6 +27,7 @@
 #include <algorithm>
 #include <string>
 
+#include <android-base/file.h>
 #include <android-base/logging.h>
 
 void OneTimeFreeAllocator::Clear() {
@@ -52,6 +54,19 @@ const char* OneTimeFreeAllocator::AllocateString(const std::string& s) {
   return result;
 }
 
+FileHelper::FileHelper() : fd_(-1) {
+}
+
+FileHelper::FileHelper(const std::string& filename) {
+  fd_ = TEMP_FAILURE_RETRY(open(filename.c_str(), O_RDONLY | O_BINARY));
+}
+
+FileHelper::~FileHelper() {
+  if (fd_ != -1) {
+    close(fd_);
+  }
+}
+
 void PrintIndented(size_t indent, const char* fmt, ...) {
   va_list ap;
   va_start(ap, fmt);
@@ -82,7 +97,7 @@ void GetEntriesInDir(const std::string& dirpath, std::vector<std::string>* files
     if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
       continue;
     }
-    if (entry->d_type == DT_DIR) {
+    if (IsDir(dirpath + std::string("/") + entry->d_name)) {
       if (subdirs != nullptr) {
         subdirs->push_back(entry->d_name);
       }
@@ -115,23 +130,10 @@ bool IsRegularFile(const std::string& filename) {
   return false;
 }
 
-bool RemovePossibleFile(const std::string& filename) {
+uint64_t GetFileSize(const std::string& filename) {
   struct stat st;
   if (stat(filename.c_str(), &st) == 0) {
-    if (!S_ISREG(st.st_mode)) {
-      LOG(ERROR) << filename << " is not a file.";
-      return false;
-    }
-    if (unlink(filename.c_str()) == -1) {
-      PLOG(ERROR) << "unlink(" << filename << ") failed";
-      return false;
-    }
+    return static_cast<uint64_t>(st.st_size);
   }
-  return true;
-}
-
-bool StringToPid(const std::string& s, int* pid) {
-  char* endptr;
-  *pid = static_cast<int>(strtol(s.c_str(), &endptr, 10));
-  return *endptr == '\0';
+  return 0;
 }