From e0854bc0aad9e59d67fbf300cb223b116b127ffc Mon Sep 17 00:00:00 2001
From: Lukas Oesch <lukasoesch20@gmail.com>
Date: Sun, 26 Apr 2026 12:36:26 +0200
Subject: rename file_descriptor_table to open_file_table

---
 kernel/src/filesystem/file_descriptor_table.cpp    |  98 ------------------
 .../src/filesystem/file_descriptor_table.tests.cpp | 113 ---------------------
 kernel/src/filesystem/open_file_table.cpp          |  98 ++++++++++++++++++
 kernel/src/filesystem/open_file_table.tests.cpp    | 113 +++++++++++++++++++++
 4 files changed, 211 insertions(+), 211 deletions(-)
 delete mode 100644 kernel/src/filesystem/file_descriptor_table.cpp
 delete mode 100644 kernel/src/filesystem/file_descriptor_table.tests.cpp
 create mode 100644 kernel/src/filesystem/open_file_table.cpp
 create mode 100644 kernel/src/filesystem/open_file_table.tests.cpp

(limited to 'kernel/src/filesystem')

diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp
deleted file mode 100644
index 9361f37..0000000
--- a/kernel/src/filesystem/file_descriptor_table.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include <kernel/filesystem/file_descriptor_table.hpp>
-
-#include <kernel/filesystem/open_file_descriptor.hpp>
-
-#include <kapi/system.hpp>
-
-#include <kstd/memory>
-
-#include <algorithm>
-#include <cstddef>
-#include <optional>
-
-namespace
-{
-  constinit auto static global_file_descriptor_table = std::optional<kernel::filesystem::file_descriptor_table>{};
-}  // namespace
-
-namespace kernel::filesystem
-{
-  auto file_descriptor_table::init() -> void
-  {
-    if (global_file_descriptor_table)
-    {
-      kapi::system::panic("[FILESYSTEM] File descriptor table has already been initialized.");
-    }
-
-    global_file_descriptor_table.emplace(file_descriptor_table{});
-  }
-
-  auto file_descriptor_table::get() -> file_descriptor_table &
-  {
-    if (!global_file_descriptor_table)
-    {
-      kapi::system::panic("[FILESYSTEM] File descriptor table has not been initialized.");
-    }
-
-    return *global_file_descriptor_table;
-  }
-
-  auto file_descriptor_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> int
-  {
-    if (!file_descriptor)
-    {
-      return -1;
-    }
-
-    auto it = std::ranges::find_if(m_open_files, [](auto const & open_file) { return open_file == nullptr; });
-    if (it != m_open_files.end())
-    {
-      *it = file_descriptor;
-      return static_cast<int>(it - m_open_files.begin());
-    }
-
-    m_open_files.push_back(file_descriptor);
-    return static_cast<int>(m_open_files.size() - 1);
-  }
-
-  auto file_descriptor_table::get_file(int fd) const -> kstd::shared_ptr<open_file_descriptor>
-  {
-    if (fd < 0)
-    {
-      return nullptr;
-    }
-
-    auto const index = static_cast<size_t>(fd);
-    if (index >= m_open_files.size())
-    {
-      return nullptr;
-    }
-
-    return m_open_files.at(index);
-  }
-
-  auto file_descriptor_table::remove_file(int fd) -> int
-  {
-    if (fd < 0)
-    {
-      return -1;
-    }
-
-    auto const index = static_cast<size_t>(fd);
-    if (index >= m_open_files.size())
-    {
-      return -1;
-    }
-
-    m_open_files.at(index) = nullptr;
-    return 0;
-  }
-}  // namespace kernel::filesystem
-
-namespace kernel::tests::filesystem::file_descriptor_table
-{
-  auto deinit() -> void
-  {
-    global_file_descriptor_table.reset();
-  }
-}  // namespace kernel::tests::filesystem::file_descriptor_table
diff --git a/kernel/src/filesystem/file_descriptor_table.tests.cpp b/kernel/src/filesystem/file_descriptor_table.tests.cpp
deleted file mode 100644
index dd04e00..0000000
--- a/kernel/src/filesystem/file_descriptor_table.tests.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <kernel/filesystem/file_descriptor_table.hpp>
-
-#include <kernel/filesystem/open_file_descriptor.hpp>
-#include <kernel/test_support/filesystem/inode.hpp>
-
-#include <kstd/memory>
-#include <kstd/print>
-#include <kstd/vector>
-
-#include <catch2/catch_test_macros.hpp>
-
-SCENARIO("File descriptor table add/get file", "[filesystem][file_descriptor_table]")
-{
-  GIVEN("a file descriptor table and an open file descriptor")
-  {
-    auto & table = kernel::filesystem::file_descriptor_table::get();
-    auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto file_descriptor_1 = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
-    auto file_descriptor_2 = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
-
-    WHEN("adding the open file descriptor to the file descriptor table")
-    {
-      auto fd_1 = table.add_file(file_descriptor_1);
-      auto fd_2 = table.add_file(file_descriptor_2);
-      auto fd_3 = table.add_file(file_descriptor_2);
-
-      THEN("a valid file descriptor is returned")
-      {
-        REQUIRE(fd_1 == 0);
-        REQUIRE(fd_2 == 1);
-        REQUIRE(fd_3 == 2);
-      }
-
-      THEN("the file descriptor can be retrieved using the returned file descriptor")
-      {
-        auto retrieved_descriptor = table.get_file(fd_1);
-        REQUIRE(retrieved_descriptor == file_descriptor_1);
-      }
-    }
-  }
-
-  GIVEN("a invalid open file descriptor")
-  {
-    auto & table = kernel::filesystem::file_descriptor_table::get();
-
-    THEN("adding a null file descriptor returns an error code")
-    {
-      auto fd = table.add_file(nullptr);
-      REQUIRE(fd == -1);
-    }
-
-    THEN("retrieving a file descriptor with a negative file descriptor returns a null pointer")
-    {
-      auto retrieved_descriptor = table.get_file(-1);
-      REQUIRE(retrieved_descriptor == nullptr);
-    }
-
-    THEN("retrieving a file descriptor with an out-of-bounds file descriptor returns a null pointer")
-    {
-      auto retrieved_descriptor = table.get_file(1000);
-      REQUIRE(retrieved_descriptor == nullptr);
-    }
-  }
-}
-
-SCENARIO("File descriptor table remove file", "[filesystem][file_descriptor_table]")
-{
-  GIVEN("a file descriptor table with an open file descriptor")
-  {
-    auto & table = kernel::filesystem::file_descriptor_table::get();
-    auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
-    auto fd = table.add_file(file_descriptor);
-
-    WHEN("removing the file descriptor using the file descriptor")
-    {
-      table.remove_file(fd);
-
-      THEN("the file descriptor can no longer be retrieved using the file descriptor")
-      {
-        auto retrieved_descriptor = table.get_file(fd);
-        REQUIRE(retrieved_descriptor == nullptr);
-      }
-    }
-
-    WHEN("removing a file descriptor the other file descriptor keep the same index")
-    {
-      auto fd2 = table.add_file(file_descriptor);
-      table.remove_file(fd);
-
-      THEN("the second file descriptor can still be retrieved using its file descriptor")
-      {
-        auto retrieved_descriptor = table.get_file(fd2);
-        REQUIRE(retrieved_descriptor == file_descriptor);
-      }
-    }
-  }
-
-  GIVEN("an invalid file descriptor")
-  {
-    auto & table = kernel::filesystem::file_descriptor_table::get();
-
-    THEN("removing a file with a negative file descriptor does nothing")
-    {
-      REQUIRE_NOTHROW(table.remove_file(-1));
-    }
-
-    THEN("removing a file with an out-of-bounds file descriptor does nothing")
-    {
-      REQUIRE_NOTHROW(table.remove_file(1000));
-    }
-  }
-}
\ No newline at end of file
diff --git a/kernel/src/filesystem/open_file_table.cpp b/kernel/src/filesystem/open_file_table.cpp
new file mode 100644
index 0000000..e47d229
--- /dev/null
+++ b/kernel/src/filesystem/open_file_table.cpp
@@ -0,0 +1,98 @@
+#include <kernel/filesystem/open_file_table.hpp>
+
+#include <kernel/filesystem/open_file_descriptor.hpp>
+
+#include <kapi/system.hpp>
+
+#include <kstd/memory>
+
+#include <algorithm>
+#include <cstddef>
+#include <optional>
+
+namespace
+{
+  constinit auto static global_open_file_table = std::optional<kernel::filesystem::open_file_table>{};
+}  // namespace
+
+namespace kernel::filesystem
+{
+  auto open_file_table::init() -> void
+  {
+    if (global_open_file_table)
+    {
+      kapi::system::panic("[FILESYSTEM] Open file table has already been initialized.");
+    }
+
+    global_open_file_table.emplace(open_file_table{});
+  }
+
+  auto open_file_table::get() -> open_file_table &
+  {
+    if (!global_open_file_table)
+    {
+      kapi::system::panic("[FILESYSTEM] Open file table has not been initialized.");
+    }
+
+    return *global_open_file_table;
+  }
+
+  auto open_file_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> int
+  {
+    if (!file_descriptor)
+    {
+      return -1;
+    }
+
+    auto it = std::ranges::find_if(m_open_files, [](auto const & open_file) { return open_file == nullptr; });
+    if (it != m_open_files.end())
+    {
+      *it = file_descriptor;
+      return static_cast<int>(it - m_open_files.begin());
+    }
+
+    m_open_files.push_back(file_descriptor);
+    return static_cast<int>(m_open_files.size() - 1);
+  }
+
+  auto open_file_table::get_file(int fd) const -> kstd::shared_ptr<open_file_descriptor>
+  {
+    if (fd < 0)
+    {
+      return nullptr;
+    }
+
+    auto const index = static_cast<size_t>(fd);
+    if (index >= m_open_files.size())
+    {
+      return nullptr;
+    }
+
+    return m_open_files.at(index);
+  }
+
+  auto open_file_table::remove_file(int fd) -> int
+  {
+    if (fd < 0)
+    {
+      return -1;
+    }
+
+    auto const index = static_cast<size_t>(fd);
+    if (index >= m_open_files.size())
+    {
+      return -1;
+    }
+
+    m_open_files.at(index) = nullptr;
+    return 0;
+  }
+}  // namespace kernel::filesystem
+
+namespace kernel::tests::filesystem::open_file_table
+{
+  auto deinit() -> void
+  {
+    global_open_file_table.reset();
+  }
+}  // namespace kernel::tests::filesystem::open_file_table
diff --git a/kernel/src/filesystem/open_file_table.tests.cpp b/kernel/src/filesystem/open_file_table.tests.cpp
new file mode 100644
index 0000000..a5c791d
--- /dev/null
+++ b/kernel/src/filesystem/open_file_table.tests.cpp
@@ -0,0 +1,113 @@
+#include <kernel/filesystem/open_file_table.hpp>
+
+#include <kernel/filesystem/open_file_descriptor.hpp>
+#include <kernel/test_support/filesystem/inode.hpp>
+
+#include <kstd/memory>
+#include <kstd/print>
+#include <kstd/vector>
+
+#include <catch2/catch_test_macros.hpp>
+
+SCENARIO("Open file table add/get file", "[filesystem][open_file_table]")
+{
+  GIVEN("a open file table and an open file descriptor")
+  {
+    auto & table = kernel::filesystem::open_file_table::get();
+    auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
+    auto file_descriptor_1 = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
+    auto file_descriptor_2 = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
+
+    WHEN("adding the open file descriptor to the open file table")
+    {
+      auto fd_1 = table.add_file(file_descriptor_1);
+      auto fd_2 = table.add_file(file_descriptor_2);
+      auto fd_3 = table.add_file(file_descriptor_2);
+
+      THEN("a valid file descriptor is returned")
+      {
+        REQUIRE(fd_1 == 0);
+        REQUIRE(fd_2 == 1);
+        REQUIRE(fd_3 == 2);
+      }
+
+      THEN("the file descriptor can be retrieved using the returned file descriptor")
+      {
+        auto retrieved_descriptor = table.get_file(fd_1);
+        REQUIRE(retrieved_descriptor == file_descriptor_1);
+      }
+    }
+  }
+
+  GIVEN("a invalid open file descriptor")
+  {
+    auto & table = kernel::filesystem::open_file_table::get();
+
+    THEN("adding a null file descriptor returns an error code")
+    {
+      auto fd = table.add_file(nullptr);
+      REQUIRE(fd == -1);
+    }
+
+    THEN("retrieving a file descriptor with a negative file descriptor returns a null pointer")
+    {
+      auto retrieved_descriptor = table.get_file(-1);
+      REQUIRE(retrieved_descriptor == nullptr);
+    }
+
+    THEN("retrieving a file descriptor with an out-of-bounds file descriptor returns a null pointer")
+    {
+      auto retrieved_descriptor = table.get_file(1000);
+      REQUIRE(retrieved_descriptor == nullptr);
+    }
+  }
+}
+
+SCENARIO("Open file table remove file", "[filesystem][open_file_table]")
+{
+  GIVEN("a open file table with an open file descriptor")
+  {
+    auto & table = kernel::filesystem::open_file_table::get();
+    auto inode = kstd::make_shared<kernel::tests::filesystem::inode>();
+    auto file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(inode);
+    auto fd = table.add_file(file_descriptor);
+
+    WHEN("removing the file descriptor using the file descriptor")
+    {
+      table.remove_file(fd);
+
+      THEN("the file descriptor can no longer be retrieved using the file descriptor")
+      {
+        auto retrieved_descriptor = table.get_file(fd);
+        REQUIRE(retrieved_descriptor == nullptr);
+      }
+    }
+
+    WHEN("removing a file descriptor the other file descriptor keep the same index")
+    {
+      auto fd2 = table.add_file(file_descriptor);
+      table.remove_file(fd);
+
+      THEN("the second file descriptor can still be retrieved using its file descriptor")
+      {
+        auto retrieved_descriptor = table.get_file(fd2);
+        REQUIRE(retrieved_descriptor == file_descriptor);
+      }
+    }
+  }
+
+  GIVEN("an invalid file descriptor")
+  {
+    auto & table = kernel::filesystem::open_file_table::get();
+
+    THEN("removing a file with a negative file descriptor does nothing")
+    {
+      REQUIRE_NOTHROW(table.remove_file(-1));
+    }
+
+    THEN("removing a file with an out-of-bounds file descriptor does nothing")
+    {
+      REQUIRE_NOTHROW(table.remove_file(1000));
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3