use kstd::shared_ptr instead of std::optional for open_file_descriptions

5 files changed, 27 insertions, 21 deletions

diff --git a/kernel/include/kernel/filesystem/file_descriptor_table.hpp b/kernel/include/kernel/filesystem/file_descriptor_table.hpp
index 6d78532..bc6fb24 100644
--- a/kernel/include/kernel/filesystem/file_descriptor_table.hpp
+++ b/kernel/include/kernel/filesystem/file_descriptor_table.hpp
@@ -3,10 +3,9 @@
 
 #include "open_file_description.hpp"
 
+#include <kstd/memory>
 #include <kstd/vector>
 
-#include <optional>
-
 namespace filesystem
 {
   struct file_descriptor_table
@@ -16,15 +15,14 @@ namespace filesystem
 
     ~file_descriptor_table() = default;
 
-    auto add_file(open_file_description & f) -> int;
-    [[nodiscard]] auto get_file(int fd) const -> std::optional<open_file_description>;
+    auto add_file(kstd::shared_ptr<open_file_description> const & f) -> int;
+    [[nodiscard]] auto get_file(int fd) const -> kstd::shared_ptr<open_file_description>;
     auto remove_file(int fd) -> void;
 
   private:
     file_descriptor_table() = default;
 
-    // TODO BA-FS26 use kstd::shared_ptr when available
-    kstd::vector<std::optional<open_file_description>> m_open_files{};
+    kstd::vector<kstd::shared_ptr<open_file_description>> m_open_files{};
   };
 }  // namespace filesystem
 
diff --git a/kernel/include/kernel/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp
index 2ad570b..ca51d90 100644
--- a/kernel/include/kernel/filesystem/vfs.hpp
+++ b/kernel/include/kernel/filesystem/vfs.hpp
@@ -23,7 +23,7 @@ namespace filesystem
 
     ~vfs() = default;
 
-    auto open(std::string_view path) -> std::optional<open_file_description>;
+    auto open(std::string_view path) -> kstd::shared_ptr<open_file_description>;
     auto do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int;
 
   private:
diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/file_descriptor_table.cpp
index 814322e..6eb3845 100644
--- a/kernel/src/filesystem/file_descriptor_table.cpp
+++ b/kernel/src/filesystem/file_descriptor_table.cpp
@@ -4,6 +4,8 @@
 
 #include "kernel/filesystem/open_file_description.hpp"
 
+#include <kstd/memory>
+
 #include <algorithm>
 #include <cstddef>
 #include <optional>
@@ -35,9 +37,15 @@ namespace filesystem
     return *global_file_descriptor_table;
   }
 
-  auto file_descriptor_table::add_file(open_file_description & file_description) -> int
+  auto file_descriptor_table::add_file(kstd::shared_ptr<open_file_description> const & file_description) -> int
   {
-    auto it = std::ranges::find_if(m_open_files, [](auto & open_file) { return !open_file.has_value(); });
+    if (!file_description)
+    {
+      // TODO BA-FS26 panic or errorcode?
+      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_description;
@@ -48,20 +56,20 @@ namespace filesystem
     return static_cast<int>(m_open_files.size() - 1);
   }
 
-  auto file_descriptor_table::get_file(int fd) const -> std::optional<open_file_description>
+  auto file_descriptor_table::get_file(int fd) const -> kstd::shared_ptr<open_file_description>
   {
     if (fd < 0)
     {
-      return std::nullopt;
+      return nullptr;
     }
 
     auto const index = static_cast<size_t>(fd);
-    if (index >= m_open_files.size() || !m_open_files.at(fd).has_value())
+    if (index >= m_open_files.size())
     {
-      return std::nullopt;
+      return nullptr;
     }
 
-    return m_open_files.at(fd);
+    return m_open_files.at(index);
   }
 
   auto file_descriptor_table::remove_file(int fd) -> void
@@ -77,6 +85,6 @@ namespace filesystem
       return;
     }
 
-    m_open_files.at(fd).reset();
+    m_open_files.at(index) = nullptr;
   }
 }  // namespace filesystem
\ No newline at end of file
diff --git a/kernel/src/filesystem/vfs.cpp b/kernel/src/filesystem/vfs.cpp
index febb844..a3e554e 100644
--- a/kernel/src/filesystem/vfs.cpp
+++ b/kernel/src/filesystem/vfs.cpp
@@ -7,6 +7,7 @@
 #include "kernel/filesystem/custody.hpp"
 #include "kernel/filesystem/device_inode.hpp"
 #include "kernel/filesystem/ext2/ext2_filesystem.hpp"
+#include "kernel/filesystem/filesystem.hpp"
 #include "kernel/filesystem/mount.hpp"
 #include "kernel/filesystem/open_file_description.hpp"
 
@@ -62,7 +63,7 @@ namespace filesystem
     return *active_vfs;
   }
 
-  auto vfs::open(std::string_view path) -> std::optional<open_file_description>
+  auto vfs::open(std::string_view path) -> kstd::shared_ptr<open_file_description>
   {
     if (auto custody = resolve_path(path))
     {
@@ -70,14 +71,13 @@ namespace filesystem
 
       if (auto current_inode_file = node->open_file())
       {
-        // TODO BA-FS26 return shared_ptr?
-        return open_file_description{current_inode_file};
+        return kstd::make_shared<open_file_description>(current_inode_file);
       }
 
       kapi::system::panic("[FILESYSTEM] inode::open_file returned null file.");
     }
 
-    return std::nullopt;
+    return nullptr;
   }
 
   auto vfs::do_mount(std::string_view path, kstd::shared_ptr<filesystem> const & filesystem) -> int
diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp
index e719164..31133a5 100644
--- a/kernel/src/main.cpp
+++ b/kernel/src/main.cpp
@@ -26,7 +26,7 @@ auto test_file_description_manually() -> void
   auto device = storage_mgmt.device_by_major_minor(1, 0);
 
   auto dev_file = kstd::make_shared<filesystem::device_file>(device);
-  filesystem::open_file_description ofd(dev_file);
+  auto ofd = kstd::make_shared<filesystem::open_file_description>(dev_file);
   auto fd_index = fd_table.add_file(ofd);
 
   // use: read two bytes and write two again
@@ -61,7 +61,7 @@ auto test_file_description_manually() -> void
   fd_table.remove_file(fd_index);
 
   // use: read four bytes again -> two old bytes two new bytes
-  filesystem::open_file_description ofd1(dev_file);
+  auto ofd1 = kstd::make_shared<filesystem::open_file_description>(dev_file);
   fd_index = fd_table.add_file(ofd1);
   auto fd1 = fd_table.get_file(fd_index);