Refactor file size logic to fs_wrapper function

ddelnano · ddelnano · commit 9d48a38d7cb3 · 2025-05-12T05:17:39.000Z
Signed-off-by: Dom Del Nano &lt;ddelnano@gmail.com&gt;
diff --git a/src/common/fs/fs_wrapper.cc b/src/common/fs/fs_wrapper.cc
@@ -175,6 +175,15 @@ StatusOr<int64_t> SpaceAvailableInBytes(const std::filesystem::path& path) {
   return si.available;
 }
 
+StatusOr<std::uintmax_t> GetFileSize(const std::string& binary_path) {
+  PX_ASSIGN_OR_RETURN(const auto stat, fs::Stat(binary_path));
+  if (stat.st_size < 0) {
+    return error::Internal("stat() returned negative file size $0 for file $1", stat.st_size,
+                           binary_path);
+  }
+  return stat.st_size;
+}
+
 StatusOr<bool> IsEmpty(const std::filesystem::path& f) {
   std::error_code ec;
   bool val = std::filesystem::is_empty(f, ec);
diff --git a/src/common/fs/fs_wrapper.h b/src/common/fs/fs_wrapper.h
@@ -69,6 +69,8 @@ Status Chown(const std::filesystem::path& path, const uid_t uid, const gid_t gid
 StatusOr<struct stat> Stat(const std::filesystem::path& path);
 StatusOr<int64_t> SpaceAvailableInBytes(const std::filesystem::path& path);
 
+StatusOr<std::uintmax_t> GetFileSize(const std::string& binary_path);
+
 StatusOr<bool> IsEmpty(const std::filesystem::path& path);
 
 StatusOr<std::filesystem::path> Absolute(const std::filesystem::path& path);
diff --git a/src/stirling/obj_tools/elf_reader.cc b/src/stirling/obj_tools/elf_reader.cc
@@ -200,15 +200,11 @@ Status ElfReader::LocateDebugSymbols(const std::filesystem::path& debug_file_dir
 StatusOr<std::unique_ptr<ElfReader>> ElfReader::Create(
     const std::string& binary_path, const std::filesystem::path& debug_file_dir) {
   if (FLAGS_elf_reader_max_file_size != 0) {
-    PX_ASSIGN_OR_RETURN(const auto stat, fs::Stat(binary_path));
-    int64_t file_size = stat.st_size;
+    PX_ASSIGN_OR_RETURN(int64_t file_size, fs::GetFileSize(binary_path));
     if (file_size > FLAGS_elf_reader_max_file_size) {
       return error::Internal(
           "File size $0 exceeds ElfReader's max file size $1. Refusing to process file", file_size,
           FLAGS_elf_reader_max_file_size);
-    } else if (file_size < 0) {
-      return error::Internal("stat() returned negative file size $0 for file $1", file_size,
-                             binary_path);
     }
   }
   return CreateImpl(binary_path, debug_file_dir);
