[libc] Make close function of the internal File class cleanup the file object.

[sivachandra]

Summary

Before this change, a separate static method named cleanup was used to
cleanup the file. Instead, now the close method cleans up the full file
object using the platform's close function.

[lntue]

libc/src/__support/File/file.h

242–244

Aren't these equivalent to return result;? So I think you can simply change it to:

return platform_close(this);

[sivachandra]

Address comment.

libc/src/__support/File/file.h

#endif
   using UnlockFunc = void(File *);
 
   using WriteFunc = FileIOResult(File *, const void *, size_t);
   using ReadFunc = FileIOResult(File *, void *, size_t);
   // The SeekFunc is expected to return the current offset of the external
   // file position indicator.
   using SeekFunc = ErrorOr<long>(File *, long, int);
   using CloseFunc = int(File *);
-  // CleanupFunc is a function which does the equivalent of this:
-  //
-  // void my_file_cleanup(File *f) {
-  //   MyFile *file = reinterpret_cast<MyFile *>(f);
-  //   delete file;
-  // }
-  //
-  // Essentially, it a function which calls the delete operator on the
-  // platform file object to cleanup resources held by it.
-  using CleanupFunc = void(File *);
 
   using ModeFlags = uint32_t;
 
   // The three different types of flags below are to be used with '|' operator.
   // Their values correspond to mutually exclusive bits in a 32-bit unsigned
   // integer value. A flag set can include both READ and WRITE if the file
   // is opened in update mode (ie. if the file was opened with a '+' the mode
   // string.)
private:
 
   // Platfrom specific functions which create new file objects should initialize
   // these fields suitably via the constructor. Typically, they should be simple
   // syscall wrappers for the corresponding functionality.
   WriteFunc *platform_write;
   ReadFunc *platform_read;
   SeekFunc *platform_seek;
   CloseFunc *platform_close;
-  CleanupFunc *platform_cleanup;
 
   Mutex mutex;
 
   // For files which are readable, we should be able to support one ungetc
   // operation even if |buf| is nullptr. So, in the constructor of File, we
   // set |buf| to point to this buffer character.
   uint8_t ungetc_buf;
 
public:
     explicit FileLock(File *f) : file(f) { file->lock(); }
 
     ~FileLock() { file->unlock(); }
 
     FileLock(const FileLock &) = delete;
     FileLock(FileLock &&) = delete;
   };
 
-  // This is private function and is not to be called by the users of
-  // File and its derived classes. The correct way to close a file is
-  // to call the File::cleanup function.
-  int close() {
-    {
-      FileLock lock(this);
-      if (prev_op == FileOp::WRITE && pos > 0) {
-        auto buf_result = platform_write(this, buf, pos);
-        if (buf_result.has_error() || buf_result.value < pos) {
-          err = true;
-          return buf_result.error;
-        }
-      }
-      int result = platform_close(this);
-      if (result != 0)
-        return result;
-    }
-    return 0;
-  }
-
 protected:
   constexpr bool write_allowed() const {
     return mode & (static_cast<ModeFlags>(OpenMode::WRITE) |
                    static_cast<ModeFlags>(OpenMode::APPEND) |
                    static_cast<ModeFlags>(OpenMode::PLUS));
   }
 
   constexpr bool read_allowed() const {
public:
   // We want this constructor to be constexpr so that global file objects
   // like stdout do not require invocation of the constructor which can
   // potentially lead to static initialization order fiasco. Consequently,
   // we will assume that the |buffer| and |buffer_size| argument are
   // meaningful - that is, |buffer| is nullptr if and only if |buffer_size|
   // is zero. This way, we will not have to employ the semantics of
   // the set_buffer method and allocate a buffer.
   constexpr File(WriteFunc *wf, ReadFunc *rf, SeekFunc *sf, CloseFunc *cf,
-                 CleanupFunc *clf, uint8_t *buffer, size_t buffer_size,
-                 int buffer_mode, bool owned, ModeFlags modeflags)
+                 uint8_t *buffer, size_t buffer_size, int buffer_mode,
+                 bool owned, ModeFlags modeflags)
       : platform_write(wf), platform_read(rf), platform_seek(sf),
-        platform_close(cf), platform_cleanup(clf), mutex(false, false, false),
-        ungetc_buf(0), buf(buffer), bufsize(buffer_size), bufmode(buffer_mode),
-        own_buf(owned), mode(modeflags), pos(0), prev_op(FileOp::NONE),
-        read_limit(0), eof(false), err(false) {
+        platform_close(cf), mutex(false, false, false), ungetc_buf(0),
+        buf(buffer), bufsize(buffer_size), bufmode(buffer_mode), own_buf(owned),
+        mode(modeflags), pos(0), prev_op(FileOp::NONE), read_limit(0),
+        eof(false), err(false) {
     if constexpr (ENABLE_BUFFER)
       adjust_buf();
   }
 
-  // Close |f| and cleanup resources held by it.
-  // Returns the non-zero error value if an error occurs when closing the
-  // file.
-  static int cleanup(File *f) {
-    int close_result = f->close();
-    if (close_result != 0)
-      return close_result;
-    f->platform_cleanup(f);
-    return 0;
-  }
-
   // Buffered write of |len| bytes from |data| without the file lock.
   FileIOResult write_unlocked(const void *data, size_t len);
 
   // Buffered write of |len| bytes from |data| under the file lock.
   FileIOResult write(const void *data, size_t len) {
     FileLock l(this);
     return write_unlocked(data, len);
   }
public:
   // Returns EOF on error and keeps the file unchanged.
   int ungetc_unlocked(int c);
 
   int ungetc(int c) {
     FileLock lock(this);
     return ungetc_unlocked(c);
   }
 
+  // Does the following:
+  // 1. If in write mode, Write out any data present in the buffer.
+  // 2. Call platform_close.
+  // platform_close is expected to cleanup the complete file object.
+  int close() {
+    {
+      FileLock lock(this);
+      if (prev_op == FileOp::WRITE && pos > 0) {
+        auto buf_result = platform_write(this, buf, pos);
+        if (buf_result.has_error() || buf_result.value < pos) {
+          err = true;
+          return buf_result.error;
+        }
+      }
+    }
+    // Platform close is expected to cleanup the file data structure which
+    // includes the file mutex. Hence, we call platform_close after releasing
+    // the file lock. Another thread doing file operations while a thread is
+    // closing the file is undefined behavior as per POSIX.
+    return platform_close(this);
+  }
+
   // Sets the internal buffer to |buffer| with buffering mode |mode|.
   // |size| is the size of |buffer|. If |size| is non-zero, but |buffer|
   // is nullptr, then a buffer owned by this file will be allocated.
   // Else, |buffer| will not be owned by this file.
   //
   // Will return zero on success, or an error value on failure. Will fail
   // if:
   //   1. |buffer| is not a nullptr but |size| is zero.
   //   2. |buffer_mode| is not one of _IOLBF, IOFBF or _IONBF.
if (read_allowed() && (buf == nullptr || bufsize == 0)) {
       // affect the behavior experienced by the user.
       buf = &ungetc_buf;
       bufsize = 1;
       own_buf = false; // We shouldn't call free on |buf| when closing the file.
     }
   }
 };
 
-// Platform specific file implementations can simply pass a pointer to a
-// a specialization of this function as the CleanupFunc argument to the
-// File constructor. The template type argument FileType should replaced
-// with the type of the platform specific file implementation.
-template <typename FileType> void cleanup_file(File *f) {
-  auto *file = reinterpret_cast<FileType *>(f);
-  delete file;
-}
-
 // The implementaiton of this function is provided by the platfrom_file
 // library.
 ErrorOr<File *> openfile(const char *path, const char *mode);
 
 // The platform_file library should implement it if it relevant for that
 // platform.
 int get_fileno(File *f);
 
 extern File *stdin;
 extern File *stdout;
 extern File *stderr;
 
 } // namespace __llvm_libc
 
 #endif // LLVM_LIBC_SRC_SUPPORT_OSUTIL_FILE_H

libc/src/__support/File/gpu/file.cpp

 
 } // namespace
 
 class GPUFile : public File {
   uintptr_t file;
 
 public:
   constexpr GPUFile(uintptr_t file, File::ModeFlags modeflags)
-      : File(&write_func, nullptr, nullptr, nullptr, nullptr, nullptr, 0,
-             _IONBF, false, modeflags),
+      : File(&write_func, nullptr, nullptr, nullptr, nullptr, 0, _IONBF, false,
+             modeflags),
         file(file) {}
 
   uintptr_t get_file() const { return file; }
 };
 
 namespace {
 
 int write_to_stdout(const void *data, size_t size) {

libc/src/__support/File/linux/file.cpp

 } // anonymous namespace
 
 class LinuxFile : public File {
   int fd;
 
 public:
   constexpr LinuxFile(int file_descriptor, uint8_t *buffer, size_t buffer_size,
                       int buffer_mode, bool owned, File::ModeFlags modeflags)
-      : File(&write_func, &read_func, &seek_func, &close_func,
-             &cleanup_file<LinuxFile>, buffer, buffer_size, buffer_mode, owned,
-             modeflags),
+      : File(&write_func, &read_func, &seek_func, &close_func, buffer,
+             buffer_size, buffer_mode, owned, modeflags),
         fd(file_descriptor) {}
 
   int get_fd() const { return fd; }
 };
 
 namespace {
 
 FileIOResult write_func(File *f, const void *data, size_t size) {

 }
 
 int close_func(File *f) {
   auto *lf = reinterpret_cast<LinuxFile *>(f);
   int ret = __llvm_libc::syscall_impl(SYS_close, lf->get_fd());
   if (ret < 0) {
     return -ret;
   }
+  delete lf;
   return 0;
 }
 
 } // anonymous namespace
 
 ErrorOr<File *> openfile(const char *path, const char *mode) {
   using ModeFlags = File::ModeFlags;
   auto modeflags = File::mode_flags(mode);

libc/src/stdio/fclose.cpp

 #include "src/__support/File/file.h"
 
 #include "src/errno/libc_errno.h"
 #include <stdio.h>
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(int, fclose, (::FILE * stream)) {
-  auto *file = reinterpret_cast<__llvm_libc::File *>(stream);
-  int result = File::cleanup(file);
+  int result = reinterpret_cast<__llvm_libc::File *>(stream)->close();
   if (result != 0) {
     libc_errno = result;
     return EOF;
   }
   return 0;
 }
 
 } // namespace __llvm_libc

libc/src/stdio/fopencookie.cpp

class CookieFile : public __llvm_libc::File {
   static FileIOResult cookie_read(File *f, void *data, size_t size);
   static ErrorOr<long> cookie_seek(File *f, long offset, int whence);
   static int cookie_close(File *f);
 
 public:
   CookieFile(void *c, cookie_io_functions_t cops, uint8_t *buffer,
              size_t bufsize, File::ModeFlags mode)
       : File(&cookie_write, &cookie_read, &CookieFile::cookie_seek,
-             &cookie_close, &cleanup_file<CookieFile>, buffer, bufsize,
-             0 /* default buffering mode */, true /* File owns buffer */, mode),
+             &cookie_close, buffer, bufsize, 0 /* default buffering mode */,
+             true /* File owns buffer */, mode),
         cookie(c), ops(cops) {}
 };
 
 FileIOResult CookieFile::cookie_write(File *f, const void *data, size_t size) {
   auto cookie_file = reinterpret_cast<CookieFile *>(f);
   if (cookie_file->ops.write == nullptr)
     return 0;
   return cookie_file->ops.write(cookie_file->cookie,
ErrorOr<long> CookieFile::cookie_seek(File *f, long offset, int whence) {
   else
     return -1;
 }
 
 int CookieFile::cookie_close(File *f) {
   auto cookie_file = reinterpret_cast<CookieFile *>(f);
   if (cookie_file->ops.close == nullptr)
     return 0;
-  return cookie_file->ops.close(cookie_file->cookie);
+  int retval = cookie_file->ops.close(cookie_file->cookie);
+  if (retval != 0)
+    return retval;
+  delete cookie_file;
+  return 0;
 }
 
 } // anonymous namespace
 
 LLVM_LIBC_FUNCTION(::FILE *, fopencookie,
                    (void *cookie, const char *mode,
                     cookie_io_functions_t ops)) {
   uint8_t *buffer;

libc/test/src/__support/File/file_test.cpp

class StringFile : public File {
   char str[SIZE] = {0};
   size_t eof_marker;
   bool write_append;
 
   static FileIOResult str_read(__llvm_libc::File *f, void *data, size_t len);
   static FileIOResult str_write(__llvm_libc::File *f, const void *data,
                                 size_t len);
   static ErrorOr<long> str_seek(__llvm_libc::File *f, long offset, int whence);
-  static int str_close(__llvm_libc::File *f) { return 0; }
+  static int str_close(__llvm_libc::File *f) {
+    delete reinterpret_cast<StringFile *>(f);
+    return 0;
+  }
 
 public:
   explicit StringFile(char *buffer, size_t buflen, int bufmode, bool owned,
                       ModeFlags modeflags)
       : __llvm_libc::File(&str_write, &str_read, &str_seek, &str_close,
-                          &__llvm_libc::cleanup_file<StringFile>,
                           reinterpret_cast<uint8_t *>(buffer), buflen, bufmode,
                           owned, modeflags),
         pos(0), eof_marker(0), write_append(false) {
     if (modeflags & static_cast<ModeFlags>(__llvm_libc::File::OpenMode::APPEND))
       write_append = true;
   }
 
   void reset() { pos = 0; }
TEST(LlvmLibcFileTest, WriteOnly) {
   {
     // This is not a readable file.
     auto result = f->read(read_data, sizeof(data));
     EXPECT_EQ(result.value, size_t(0));
     EXPECT_TRUE(f->error());
     EXPECT_TRUE(result.has_error());
   }
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, WriteLineBuffered) {
   const char data[] = "hello\n file";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(data) * 3 / 2;
 
   char file_buffer_line[FILE_BUFFER_SIZE];
   char file_buffer_full[FILE_BUFFER_SIZE];
TEST(LlvmLibcFileTest, WriteLineBuffered) {
   ASSERT_EQ(f_line->flush(), 0);
   ASSERT_EQ(f_full->flush(), 0);
 
   EXPECT_EQ(f_line->get_pos(), sizeof(data) + sizeof(data2));
   MemoryView dst_line_final(f_line->get_str(), 37);
   EXPECT_MEM_EQ(src3, dst_line_final);
   EXPECT_MEM_EQ(src3, dst_full_final);
 
-  ASSERT_EQ(File::cleanup(f_line), 0);
-  ASSERT_EQ(File::cleanup(f_full), 0);
+  ASSERT_EQ(f_line->close(), 0);
+  ASSERT_EQ(f_full->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, WriteUnbuffered) {
   const char data[] = "written immediately";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(data) + 1;
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IONBF, false, "w");
 
   ASSERT_EQ(sizeof(data), f->write(data, sizeof(data)).value);
   EXPECT_EQ(f->get_pos(),
             sizeof(data)); // no buffering means this is written immediately.
   EXPECT_STREQ(f->get_str(), data);
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, ReadOnly) {
   const char initial_content[] = "1234567890987654321";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(initial_content);
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IOFBF, false, "r");
TEST(LlvmLibcFileTest, ReadOnly) {
   {
     // This is not a writable file.
     auto result = f->write(initial_content, sizeof(initial_content));
     EXPECT_EQ(result.value, size_t(0));
     EXPECT_TRUE(f->error());
     EXPECT_TRUE(result.has_error());
   }
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, ReadSeekCurAndRead) {
   const char initial_content[] = "1234567890987654321";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(initial_content);
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IOFBF, false, "r");
   f->reset_and_fill(initial_content, sizeof(initial_content));
 
   constexpr size_t READ_SIZE = 5;
   char data[READ_SIZE];
   data[READ_SIZE - 1] = '\0';
   ASSERT_EQ(f->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "1234");
   ASSERT_EQ(f->seek(5, SEEK_CUR).value(), 0);
   ASSERT_EQ(f->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "0987");
   ASSERT_EQ(f->seek(-5, SEEK_CUR).value(), 0);
   ASSERT_EQ(f->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "9098");
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, AppendOnly) {
   const char initial_content[] = "1234567890987654321";
   const char write_data[] = "append";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(write_data) * 3 / 2;
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
TEST(LlvmLibcFileTest, AppendOnly) {
 
   // Write should succeed but will be buffered in the file stream.
   ASSERT_EQ(f->write(write_data, sizeof(write_data)).value, sizeof(write_data));
   EXPECT_EQ(f->get_pos(), size_t(0));
   // Flushing will write to the file.
   EXPECT_EQ(f->flush(), int(0));
   EXPECT_EQ(f->get_pos(), sizeof(write_data) + sizeof(initial_content));
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, WriteUpdate) {
   const char data[] = "hello, file";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(data) * 3 / 2;
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IOFBF, false, "w+");
 
   ASSERT_EQ(sizeof(data), f->write(data, sizeof(data)).value);
   EXPECT_EQ(f->get_pos(), size_t(0)); // Data is buffered in the file stream
 
   ASSERT_EQ(f->seek(0, SEEK_SET).value(), 0);
 
   // Seek flushes the stream buffer so we can read the previously written data.
   char read_data[sizeof(data)];
   ASSERT_EQ(f->read(read_data, sizeof(data)).value, sizeof(data));
   EXPECT_STREQ(read_data, data);
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, ReadUpdate) {
   const char initial_content[] = "1234567890987654321";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(initial_content);
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IOFBF, false, "r+");
TEST(LlvmLibcFileTest, ReadUpdate) {
   const char write_data[] = "hello, file";
   ASSERT_EQ(sizeof(write_data), f->write(write_data, sizeof(write_data)).value);
   EXPECT_STREQ(file_buffer, write_data);
   ASSERT_EQ(f->flush(), 0);
   MemoryView dst2(f->get_str(), sizeof(write_data)),
       src2(write_data, sizeof(write_data));
   EXPECT_MEM_EQ(src2, dst2);
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, AppendUpdate) {
   const char initial_content[] = "1234567890987654321";
   const char data[] = "hello, file";
   constexpr size_t FILE_BUFFER_SIZE = sizeof(data) * 3 / 2;
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
TEST(LlvmLibcFileTest, AppendUpdate) {
   // Reads can happen from any point.
   ASSERT_EQ(f->seek(0, SEEK_SET).value(), 0);
   constexpr size_t READ_SIZE = 10;
   char read_data[READ_SIZE];
   ASSERT_EQ(READ_SIZE, f->read(read_data, READ_SIZE).value);
   MemoryView src4(initial_content, READ_SIZE), dst4(read_data, READ_SIZE);
   EXPECT_MEM_EQ(src4, dst4);
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, SmallBuffer) {
   const char WRITE_DATA[] = "small buffer";
   constexpr size_t WRITE_SIZE = sizeof(WRITE_DATA);
   constexpr size_t FILE_BUFFER_SIZE = sizeof(WRITE_DATA) / 2 - 1;
   char file_buffer[FILE_BUFFER_SIZE];
   StringFile *f =
       new_string_file(file_buffer, FILE_BUFFER_SIZE, _IOFBF, false, "w");
 
   ASSERT_EQ(WRITE_SIZE, f->write(WRITE_DATA, WRITE_SIZE).value);
   // Since data much larger than the buffer is being written, all of it should
   // be available in the file without a flush operation.
   EXPECT_EQ(f->get_pos(), sizeof(WRITE_DATA));
   ASSERT_STREQ(f->get_str(), WRITE_DATA);
 
-  ASSERT_EQ(File::cleanup(f), 0);
+  ASSERT_EQ(f->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, ZeroLengthBuffer) {
   const char WRITE_DATA[] = "small buffer";
   constexpr size_t WRITE_SIZE = sizeof(WRITE_DATA);
   StringFile *f_fbf = new_string_file(nullptr, 0, _IOFBF, true, "w");
   StringFile *f_lbf = new_string_file(nullptr, 0, _IOLBF, true, "w");
   StringFile *f_nbf = new_string_file(nullptr, 0, _IONBF, true, "w");
 
   ASSERT_EQ(WRITE_SIZE, f_fbf->write(WRITE_DATA, WRITE_SIZE).value);
   ASSERT_EQ(WRITE_SIZE, f_lbf->write(WRITE_DATA, WRITE_SIZE).value);
   ASSERT_EQ(WRITE_SIZE, f_nbf->write(WRITE_DATA, WRITE_SIZE).value);
   // Since there is no buffer space, all of the written data should
   // be available in the file without a flush operation.
   EXPECT_EQ(f_fbf->get_pos(), sizeof(WRITE_DATA));
   EXPECT_EQ(f_lbf->get_pos(), sizeof(WRITE_DATA));
   EXPECT_EQ(f_nbf->get_pos(), sizeof(WRITE_DATA));
   ASSERT_STREQ(f_fbf->get_str(), WRITE_DATA);
   ASSERT_STREQ(f_lbf->get_str(), WRITE_DATA);
   ASSERT_STREQ(f_nbf->get_str(), WRITE_DATA);
 
-  ASSERT_EQ(File::cleanup(f_fbf), 0);
-  ASSERT_EQ(File::cleanup(f_lbf), 0);
-  ASSERT_EQ(File::cleanup(f_nbf), 0);
+  ASSERT_EQ(f_fbf->close(), 0);
+  ASSERT_EQ(f_lbf->close(), 0);
+  ASSERT_EQ(f_nbf->close(), 0);
 }
 
 TEST(LlvmLibcFileTest, WriteNothing) {
   const char WRITE_DATA[] = "";
   constexpr size_t WRITE_SIZE = 0;
   constexpr size_t FILE_BUFFER_SIZE = 5;
   char file_buffer_fbf[FILE_BUFFER_SIZE];
   char file_buffer_lbf[FILE_BUFFER_SIZE];
   char file_buffer_nbf[FILE_BUFFER_SIZE];
   StringFile *f_fbf =
       new_string_file(file_buffer_fbf, FILE_BUFFER_SIZE, _IOFBF, false, "w");
   StringFile *f_lbf =
       new_string_file(file_buffer_lbf, FILE_BUFFER_SIZE, _IOLBF, false, "w");
   StringFile *f_nbf =
       new_string_file(file_buffer_nbf, FILE_BUFFER_SIZE, _IONBF, false, "w");
 
   ASSERT_EQ(WRITE_SIZE, f_fbf->write(WRITE_DATA, WRITE_SIZE).value);
   ASSERT_EQ(WRITE_SIZE, f_lbf->write(WRITE_DATA, WRITE_SIZE).value);
   ASSERT_EQ(WRITE_SIZE, f_nbf->write(WRITE_DATA, WRITE_SIZE).value);
 
   ASSERT_FALSE(f_fbf->error_unlocked());
   ASSERT_FALSE(f_lbf->error_unlocked());
   ASSERT_FALSE(f_nbf->error_unlocked());
 
-  ASSERT_EQ(File::cleanup(f_fbf), 0);
-  ASSERT_EQ(File::cleanup(f_lbf), 0);
-  ASSERT_EQ(File::cleanup(f_nbf), 0);
+  ASSERT_EQ(f_fbf->close(), 0);
+  ASSERT_EQ(f_lbf->close(), 0);
+  ASSERT_EQ(f_nbf->close(), 0);
 }

libc/test/src/__support/File/platform_file_test.cpp

LIBC_INLINE File *openfile(const char *file_name, const char *mode) {
   return error_or_file.has_value() ? error_or_file.value() : nullptr;
 }
 
 TEST(LlvmLibcPlatformFileTest, CreateWriteCloseAndReadBack) {
   constexpr char FILENAME[] = "testdata/create_write_close_and_readback.test";
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->write(TEXT, TEXT_SIZE).value, TEXT_SIZE);
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "r");
   ASSERT_FALSE(file == nullptr);
   char data[sizeof(TEXT)];
   ASSERT_EQ(file->read(data, TEXT_SIZE).value, TEXT_SIZE);
   data[TEXT_SIZE] = '\0';
   ASSERT_STREQ(data, TEXT);
 
   // Reading more data should trigger EOF.
   ASSERT_EQ(file->read(data, TEXT_SIZE).value, size_t(0));
   ASSERT_TRUE(file->iseof());
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, CreateWriteSeekAndReadBack) {
   constexpr char FILENAME[] = "testdata/create_write_seek_and_readback.test";
   File *file = openfile(FILENAME, "w+");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->write(TEXT, TEXT_SIZE).value, TEXT_SIZE);
 
   ASSERT_EQ(file->seek(0, SEEK_SET).value(), 0);
 
   char data[sizeof(TEXT)];
   ASSERT_EQ(file->read(data, TEXT_SIZE).value, TEXT_SIZE);
   data[TEXT_SIZE] = '\0';
   ASSERT_STREQ(data, TEXT);
 
   // Reading more data should trigger EOF.
   ASSERT_EQ(file->read(data, TEXT_SIZE).value, size_t(0));
   ASSERT_TRUE(file->iseof());
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, CreateAppendCloseAndReadBack) {
   constexpr char FILENAME[] = "testdata/create_append_close_and_readback.test";
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->write(TEXT, TEXT_SIZE).value, TEXT_SIZE);
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "a");
   ASSERT_FALSE(file == nullptr);
   constexpr char APPEND_TEXT[] = " Append Text";
   constexpr size_t APPEND_TEXT_SIZE = sizeof(APPEND_TEXT) - 1;
   ASSERT_EQ(file->write(APPEND_TEXT, APPEND_TEXT_SIZE).value, APPEND_TEXT_SIZE);
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "r");
   ASSERT_FALSE(file == nullptr);
   constexpr size_t READ_SIZE = TEXT_SIZE + APPEND_TEXT_SIZE;
   char data[READ_SIZE + 1];
   ASSERT_EQ(file->read(data, READ_SIZE).value, READ_SIZE);
   data[READ_SIZE] = '\0';
   ASSERT_STREQ(data, "Hello, File Append Text");
 
   // Reading more data should trigger EOF.
   ASSERT_EQ(file->read(data, READ_SIZE).value, size_t(0));
   ASSERT_TRUE(file->iseof());
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, CreateAppendSeekAndReadBack) {
   constexpr char FILENAME[] = "testdata/create_append_seek_and_readback.test";
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->write(TEXT, TEXT_SIZE).value, TEXT_SIZE);
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "a+");
   ASSERT_FALSE(file == nullptr);
   constexpr char APPEND_TEXT[] = " Append Text";
   constexpr size_t APPEND_TEXT_SIZE = sizeof(APPEND_TEXT) - 1;
   ASSERT_EQ(file->write(APPEND_TEXT, APPEND_TEXT_SIZE).value, APPEND_TEXT_SIZE);
 
   ASSERT_EQ(file->seek(-APPEND_TEXT_SIZE, SEEK_END).value(), 0);
   char data[APPEND_TEXT_SIZE + 1];
   ASSERT_EQ(file->read(data, APPEND_TEXT_SIZE).value, APPEND_TEXT_SIZE);
   data[APPEND_TEXT_SIZE] = '\0';
   ASSERT_STREQ(data, APPEND_TEXT);
 
   // Reading more data should trigger EOF.
   ASSERT_EQ(file->read(data, APPEND_TEXT_SIZE).value, size_t(0));
   ASSERT_TRUE(file->iseof());
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, LargeFile) {
   constexpr size_t DATA_SIZE = File::DEFAULT_BUFFER_SIZE >> 2;
   constexpr char BYTE = 123;
   char write_data[DATA_SIZE];
   for (size_t i = 0; i < DATA_SIZE; ++i)
     write_data[i] = BYTE;
 
   constexpr char FILENAME[] = "testdata/large_file.test";
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
 
   constexpr int REPEAT = 5;
   for (int i = 0; i < REPEAT; ++i) {
     ASSERT_EQ(file->write(write_data, DATA_SIZE).value, DATA_SIZE);
   }
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "r");
   ASSERT_FALSE(file == nullptr);
   constexpr size_t READ_SIZE = DATA_SIZE * REPEAT;
   char data[READ_SIZE] = {0};
   ASSERT_EQ(file->read(data, READ_SIZE).value, READ_SIZE);
 
   for (size_t i = 0; i < READ_SIZE; ++i)
     ASSERT_EQ(data[i], BYTE);
 
   // Reading more data should trigger EOF.
   ASSERT_EQ(file->read(data, 1).value, size_t(0));
   ASSERT_TRUE(file->iseof());
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, ReadSeekCurAndRead) {
   constexpr char FILENAME[] = "testdata/read_seek_cur_and_read.test";
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
   constexpr char CONTENT[] = "1234567890987654321";
   ASSERT_EQ(sizeof(CONTENT) - 1,
             file->write(CONTENT, sizeof(CONTENT) - 1).value);
-  ASSERT_EQ(0, File::cleanup(file));
+  ASSERT_EQ(0, file->close());
 
   file = openfile(FILENAME, "r");
   ASSERT_FALSE(file == nullptr);
 
   constexpr size_t READ_SIZE = 5;
   char data[READ_SIZE];
   data[READ_SIZE - 1] = '\0';
   ASSERT_EQ(file->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "1234");
   ASSERT_EQ(file->seek(5, SEEK_CUR).value(), 0);
   ASSERT_EQ(file->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "0987");
   ASSERT_EQ(file->seek(-5, SEEK_CUR).value(), 0);
   ASSERT_EQ(file->read(data, READ_SIZE - 1).value, READ_SIZE - 1);
   ASSERT_STREQ(data, "9098");
 
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, IncorrectOperation) {
   constexpr char FILENAME[] = "testdata/incorrect_operation.test";
   char data[1] = {123};
 
   File *file = openfile(FILENAME, "w");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->read(data, 1).value, size_t(0)); // Cannot read
   ASSERT_FALSE(file->iseof());
   ASSERT_TRUE(file->error());
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "r");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->write(data, 1).value, size_t(0)); // Cannot write
   ASSERT_FALSE(file->iseof());
   ASSERT_TRUE(file->error());
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 
   file = openfile(FILENAME, "a");
   ASSERT_FALSE(file == nullptr);
   ASSERT_EQ(file->read(data, 1).value, size_t(0)); // Cannot read
   ASSERT_FALSE(file->iseof());
   ASSERT_TRUE(file->error());
-  ASSERT_EQ(File::cleanup(file), 0);
+  ASSERT_EQ(file->close(), 0);
 }
 
 TEST(LlvmLibcPlatformFileTest, StdOutStdErrSmokeTest) {
   EXPECT_FALSE(__llvm_libc::stdout == nullptr);
   EXPECT_FALSE(__llvm_libc::stderr == nullptr);
 }