centralize logic

Author: lind

extension/data_loader/file_data_loader.cpp

@@ -102,30 +102,18 @@ Result<int> getFDFromUri(const char* file_descriptor_uri) {
   return fd;
 }
 
-Result<FileDataLoader> FileDataLoader::fromFileDescriptorUri(
-    const char* file_descriptor_uri,
+Result<FileDataLoader> FileDataLoader::fromFileDescriptor(
+    const char* file_name,
+    const int fd,
     size_t alignment) {
-  ET_CHECK_OR_RETURN_ERROR(
-      is_power_of_2(alignment),
-      InvalidArgument,
-      "Alignment %zu is not a power of 2",
-      alignment);
-
-  auto parsed_fd = getFDFromUri(file_descriptor_uri);
-  if (!parsed_fd.ok()) {
-    return parsed_fd.error();
-  }
-
-  int fd = parsed_fd.get();
-
   // Cache the file size.
   struct stat st;
   int err = ::fstat(fd, &st);
   if (err < 0) {
     ET_LOG(
         Error,
         "Could not get length of %s: %s (%d)",
-        file_descriptor_uri,
+        file_name,
         ::strerror(errno),
         errno);
     ::close(fd);
@@ -134,16 +122,35 @@ Result<FileDataLoader> FileDataLoader::fromFileDescriptorUri(
   size_t file_size = st.st_size;
 
   // Copy the filename so we can print better debug messages if reads fail.
-  const char* file_name_copy = ::strdup(file_descriptor_uri);
+  const char* file_name_copy = ::strdup(file_name);
   if (file_name_copy == nullptr) {
-    ET_LOG(Error, "strdup(%s) failed", file_descriptor_uri);
+    ET_LOG(Error, "strdup(%s) failed", file_name);
     ::close(fd);
     return Error::MemoryAllocationFailed;
   }
 
   return FileDataLoader(fd, file_size, alignment, file_name_copy);
 }
 
+Result<FileDataLoader> FileDataLoader::fromFileDescriptorUri(
+    const char* file_descriptor_uri,
+    size_t alignment) {
+  ET_CHECK_OR_RETURN_ERROR(
+      is_power_of_2(alignment),
+      InvalidArgument,
+      "Alignment %zu is not a power of 2",
+      alignment);
+
+  auto parsed_fd = getFDFromUri(file_descriptor_uri);
+  if (!parsed_fd.ok()) {
+    return parsed_fd.error();
+  }
+
+  int fd = parsed_fd.get();
+
+  return fromFileDescriptor(file_descriptor_uri, fd, alignment);
+}
+
 Result<FileDataLoader> FileDataLoader::from(
     const char* file_name,
     size_t alignment) {
@@ -163,30 +170,7 @@ Result<FileDataLoader> FileDataLoader::from(
     return Error::AccessFailed;
   }
 
-  // Cache the file size.
-  struct stat st;
-  int err = ::fstat(fd, &st);
-  if (err < 0) {
-    ET_LOG(
-        Error,
-        "Could not get length of %s: %s (%d)",
-        file_name,
-        ::strerror(errno),
-        errno);
-    ::close(fd);
-    return Error::AccessFailed;
-  }
-  size_t file_size = st.st_size;
-
-  // Copy the filename so we can print better debug messages if reads fail.
-  const char* file_name_copy = ::strdup(file_name);
-  if (file_name_copy == nullptr) {
-    ET_LOG(Error, "strdup(%s) failed", file_name);
-    ::close(fd);
-    return Error::MemoryAllocationFailed;
-  }
-
-  return FileDataLoader(fd, file_size, alignment, file_name_copy);
+  return fromFileDescriptor(file_name, fd, alignment);
 }
 
 namespace {

extension/data_loader/file_data_loader.h

@@ -100,6 +100,11 @@ class FileDataLoader final : public executorch::runtime::DataLoader {
       void* buffer) const override;
 
  private:
+  static executorch::runtime::Result<FileDataLoader> fromFileDescriptor(
+      const char* file_name,
+      const int fd,
+      size_t alignment = alignof(std::max_align_t));
+
   FileDataLoader(
       int fd,
       size_t file_size,