aboutsummaryrefslogtreecommitdiff
path: root/kernel/filesystem/src
diff options
context:
space:
mode:
authormarcel.braun <marcel.braun@ost.ch>2026-03-17 19:36:20 +0100
committermarcel.braun <marcel.braun@ost.ch>2026-03-17 19:36:20 +0100
commit3ace886a9e9f044cd48de51f0a15aceb02bfa9b2 (patch)
tree1dc00e8802ab8fb60809b1f55ae7baadf9e430e1 /kernel/filesystem/src
parent59504cfd677dd3e9d9ddb0deea4df7614efedb84 (diff)
downloadteachos-3ace886a9e9f044cd48de51f0a15aceb02bfa9b2.tar.xz
teachos-3ace886a9e9f044cd48de51f0a15aceb02bfa9b2.zip
Clean up project folder structure
Diffstat (limited to 'kernel/filesystem/src')
-rw-r--r--kernel/filesystem/src/custody.cpp30
-rw-r--r--kernel/filesystem/src/device_file.cpp124
-rw-r--r--kernel/filesystem/src/ext2/ext2_filesystem.cpp33
-rw-r--r--kernel/filesystem/src/file_descriptor_table.cpp82
-rw-r--r--kernel/filesystem/src/filesystem.cpp11
-rw-r--r--kernel/filesystem/src/inode.cpp108
-rw-r--r--kernel/filesystem/src/inode_file.cpp35
-rw-r--r--kernel/filesystem/src/mount.cpp32
-rw-r--r--kernel/filesystem/src/open_file_description.cpp35
-rw-r--r--kernel/filesystem/src/vfs.cpp123
10 files changed, 0 insertions, 613 deletions
diff --git a/kernel/filesystem/src/custody.cpp b/kernel/filesystem/src/custody.cpp
deleted file mode 100644
index 3a87345..0000000
--- a/kernel/filesystem/src/custody.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "filesystem/custody.hpp"
-
-#include "kapi/system.hpp"
-
-#include "filesystem/inode.hpp"
-
-#include <kstd/memory>
-
-namespace filesystem
-{
- custody::custody(kstd::shared_ptr<custody> const & parent, kstd::shared_ptr<inode> const & node)
- : m_parent(parent)
- , m_inode(node)
- {
- if (!m_inode)
- {
- kapi::system::panic("[FILESYSTEM] custody constructed with null inode.");
- }
- }
-
- auto custody::get_inode() const -> kstd::shared_ptr<inode> const &
- {
- return m_inode;
- }
-
- auto custody::get_parent() const -> kstd::shared_ptr<custody> const &
- {
- return m_parent;
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/device_file.cpp b/kernel/filesystem/src/device_file.cpp
deleted file mode 100644
index 8fc159a..0000000
--- a/kernel/filesystem/src/device_file.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include "filesystem/device_file.hpp"
-
-#include "kapi/system.hpp"
-
-#include "devices/block_device.hpp"
-#include "devices/device.hpp"
-
-#include <kstd/cstring>
-#include <kstd/memory>
-#include <kstd/vector>
-
-#include <algorithm>
-#include <cstddef>
-
-namespace filesystem
-{
- device_file::device_file(kstd::shared_ptr<devices::device> const & device)
- : m_device(device)
- {
- if (!m_device)
- {
- kapi::system::panic("[FILESYSTEM] device_file constructed with null device.");
- }
- }
-
- auto device_file::open() -> void
- {
- // Hook point for permission checks or lazy metadata loading.
- }
-
- auto device_file::read(void * buffer, size_t offset, size_t size) const -> size_t
- {
- if (m_device->is_block_device())
- {
- return process_blocks(offset, size, buffer,
- [](size_t idx, size_t off, size_t len, size_t done, devices::block_device * device,
- std::byte * scratch, void * buffer) {
- auto * out = static_cast<std::byte *>(buffer);
- if (off == 0 && len == device->block_size())
- {
- device->read_block(idx, out + done);
- }
- else
- {
- device->read_block(idx, scratch);
- kstd::libc::memcpy(out + done, scratch + off, len);
- }
- });
- }
- else
- {
- kapi::system::panic("[FILESYSTEM] device_file::read called on non-block device.");
- }
- }
-
- auto device_file::write(void const * buffer, size_t offset, size_t size) -> size_t
- {
- if (m_device->is_block_device())
- {
- return process_blocks(offset, size, const_cast<void *>(buffer),
- [](size_t idx, size_t off, size_t len, size_t done, devices::block_device * device,
- std::byte * scratch, void * buffer) {
- auto const * in = static_cast<std::byte const *>(buffer);
- if (off == 0 && len == device->block_size())
- {
- device->write_block(idx, in + done);
- }
- else
- {
- device->read_block(idx, scratch);
- kstd::libc::memcpy(scratch + off, in + done, len);
- device->write_block(idx, scratch);
- }
- });
- }
- else
- {
- kapi::system::panic("[FILESYSTEM] device_file::write called on non-block device.");
- }
- }
-
- auto device_file::process_blocks(size_t offset, size_t size, void * buffer, block_op op) const -> size_t
- {
- if (buffer == nullptr)
- {
- kapi::system::panic("[FILESYSTEM] device_file::write called with null buffer.");
- }
-
- if (size == 0)
- {
- return 0;
- }
-
- auto * block_dev = static_cast<devices::block_device *>(m_device.get());
- if (block_dev == nullptr)
- {
- kapi::system::panic("[FILESYSTEM] device_file: expected block_device.");
- }
-
- size_t const block_size = block_dev->block_size();
- size_t const capacity = block_dev->capacity();
-
- if (offset >= capacity)
- return 0;
- size_t const total_to_process = std::min(size, capacity - offset);
-
- kstd::vector<std::byte> scratch_buffer{block_size};
- auto processed = 0uz;
-
- while (processed < total_to_process)
- {
- size_t const absolute_offset = offset + processed;
- size_t const block_index = absolute_offset / block_size;
- size_t const in_block_offset = absolute_offset % block_size;
- size_t const chunk_size = std::min(total_to_process - processed, block_size - in_block_offset);
-
- op(block_index, in_block_offset, chunk_size, processed, block_dev, scratch_buffer.data(), buffer);
-
- processed += chunk_size;
- }
-
- return processed;
- }
-} // namespace filesystem
diff --git a/kernel/filesystem/src/ext2/ext2_filesystem.cpp b/kernel/filesystem/src/ext2/ext2_filesystem.cpp
deleted file mode 100644
index a82a098..0000000
--- a/kernel/filesystem/src/ext2/ext2_filesystem.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "filesystem/ext2/ext2_filesystem.hpp"
-
-#include "devices/device.hpp"
-#include "filesystem/inode.hpp"
-#include "filesystem/inode_metadata.hpp"
-
-#include <kstd/memory>
-
-#include <string_view>
-
-namespace filesystem::ext2
-{
- auto ext2_filesystem::mount(kstd::shared_ptr<devices::device> const & device) -> int
- {
- if (!device)
- {
- return -1; // TODO BA-FS26 panic or errorcode?
- }
-
- m_device = device;
- // TODO BA-FS26 load proper root inode from ext2 metadata
- m_root_inode = inode{inode_kind::directory};
-
- // TODO BA-FS26 implement
- return 0;
- }
-
- auto ext2_filesystem::lookup(inode const & /*parent*/, std::string_view /*name*/) -> inode *
- {
- // TODO BA-FS26 implement ext2 directory traversal and inode loading
- return nullptr;
- }
-} // namespace filesystem::ext2
diff --git a/kernel/filesystem/src/file_descriptor_table.cpp b/kernel/filesystem/src/file_descriptor_table.cpp
deleted file mode 100644
index 64fad0c..0000000
--- a/kernel/filesystem/src/file_descriptor_table.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include "filesystem/file_descriptor_table.hpp"
-
-#include "kapi/system.hpp"
-
-#include "filesystem/open_file_description.hpp"
-
-#include <algorithm>
-#include <cstddef>
-#include <optional>
-
-namespace filesystem
-{
- namespace
- {
- constinit auto static global_file_descriptor_table = std::optional<file_descriptor_table>{};
- } // namespace
-
- 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(open_file_description & file_description) -> int
- {
- auto it = std::ranges::find_if(m_open_files, [](auto & open_file) { return !open_file.has_value(); });
- if (it != m_open_files.end())
- {
- *it = file_description;
- return static_cast<int>(it - m_open_files.begin());
- }
-
- m_open_files.push_back(file_description);
- return static_cast<int>(m_open_files.size() - 1);
- }
-
- auto file_descriptor_table::get_file(int fd) const -> std::optional<open_file_description>
- {
- if (fd < 0)
- {
- return std::nullopt;
- }
-
- auto const index = static_cast<size_t>(fd);
- if (index >= m_open_files.size() || !m_open_files.at(fd).has_value())
- {
- return std::nullopt;
- }
-
- return m_open_files.at(fd);
- }
-
- auto file_descriptor_table::remove_file(int fd) -> void
- {
- if (fd < 0)
- {
- return;
- }
-
- auto const index = static_cast<size_t>(fd);
- if (index >= m_open_files.size())
- {
- return;
- }
-
- m_open_files.at(fd).reset();
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/filesystem.cpp b/kernel/filesystem/src/filesystem.cpp
deleted file mode 100644
index cdfe7f8..0000000
--- a/kernel/filesystem/src/filesystem.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "filesystem/filesystem.hpp"
-
-#include "filesystem/inode.hpp"
-
-namespace filesystem
-{
- auto filesystem::root_inode() const -> inode const &
- {
- return m_root_inode;
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/inode.cpp b/kernel/filesystem/src/inode.cpp
deleted file mode 100644
index 231ee33..0000000
--- a/kernel/filesystem/src/inode.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "filesystem/inode.hpp"
-
-#include "kapi/system.hpp"
-
-#include "devices/device.hpp"
-#include "filesystem/inode_metadata.hpp"
-
-#include <kstd/memory>
-
-#include <cstddef>
-
-namespace filesystem
-{
- inode::inode(inode_kind kind)
- : m_kind(kind)
- {}
-
- inode::inode(kstd::shared_ptr<devices::device> const & device)
- : m_kind(inode_kind::device)
- , m_device(device)
- {
- if (!m_device)
- {
- kapi::system::panic("[FILESYSTEM] inode constructed with null device.");
- }
- }
-
- auto inode::metadata() const -> inode_metadata
- {
- auto meta = inode_metadata{};
- meta.kind = m_kind;
-
- if (is_device())
- {
- meta.major = m_device->major();
- meta.minor = m_device->minor();
- }
-
- return meta;
- }
-
- auto inode::is_directory() const -> bool
- {
- return m_kind == inode_kind::directory;
- }
-
- auto inode::is_regular() const -> bool
- {
- return m_kind == inode_kind::regular;
- }
-
- auto inode::is_device() const -> bool
- {
- return m_kind == inode_kind::device;
- }
-
- auto inode::is_block_device() const -> bool
- {
- return is_device() && m_device->is_block_device();
- }
-
- auto inode::major_device() const -> size_t
- {
- if (!is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::major_device called on non-device inode.");
- }
-
- return m_device->major();
- }
-
- auto inode::minor_device() const -> size_t
- {
- if (!is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::minor_device called on non-device inode.");
- }
-
- return m_device->minor();
- }
-
- auto inode::backing_device() const -> kstd::shared_ptr<devices::device> const &
- {
- return m_device;
- }
-
- auto inode::read(void * /*buffer*/, size_t /*offset*/, size_t /*size*/) const -> size_t
- {
- if (is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::read called on device inode. Open it as a device file first.");
- }
-
- // TODO BA-FS26
- return 0;
- }
-
- auto inode::write(void const *, size_t, size_t) -> size_t
- {
- if (is_device())
- {
- kapi::system::panic("[FILESYSTEM] inode::write called on device inode. Open it as a device file first.");
- }
-
- kapi::system::panic("[FILESYSTEM] inode::write is not implemented yet");
- return 0;
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/inode_file.cpp b/kernel/filesystem/src/inode_file.cpp
deleted file mode 100644
index 0b8bdf9..0000000
--- a/kernel/filesystem/src/inode_file.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "filesystem/inode_file.hpp"
-
-#include "kapi/system.hpp"
-
-#include "filesystem/inode.hpp"
-
-#include <kstd/memory>
-
-#include <cstddef>
-
-namespace filesystem
-{
- inode_file::inode_file(kstd::shared_ptr<inode> const & inode)
- : m_inode(inode)
- {
- if (!m_inode)
- {
- kapi::system::panic("[FILESYSTEM] inode_file constructed with null inode");
- }
- }
-
- auto inode_file::open() -> void
- {
- // Hook point for permission checks or lazy metadata loading.
- }
-
- auto inode_file::read(void * buffer, size_t offset, size_t size) const -> size_t
- {
- return m_inode->read(buffer, offset, size);
- }
- auto inode_file::write(void const * buffer, size_t offset, size_t size) -> size_t
- {
- return m_inode->write(buffer, offset, size);
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/mount.cpp b/kernel/filesystem/src/mount.cpp
deleted file mode 100644
index 021b074..0000000
--- a/kernel/filesystem/src/mount.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "filesystem/mount.hpp"
-
-#include "kapi/system.hpp"
-
-#include "filesystem/filesystem.hpp"
-
-#include <kstd/memory>
-
-#include <string_view>
-
-namespace filesystem
-{
- mount::mount(std::string_view const & path, kstd::shared_ptr<filesystem> const & fs)
- : m_path(path)
- , m_filesystem(fs)
- {
- if (!m_filesystem)
- {
- kapi::system::panic("[FILESYSTEM] mount initialized with null filesystem.");
- }
- }
-
- auto mount::path() const -> std::string_view
- {
- return m_path;
- }
-
- auto mount::get_filesystem() const -> kstd::shared_ptr<filesystem> const &
- {
- return m_filesystem;
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/open_file_description.cpp b/kernel/filesystem/src/open_file_description.cpp
deleted file mode 100644
index cddee76..0000000
--- a/kernel/filesystem/src/open_file_description.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "filesystem/open_file_description.hpp"
-
-#include "filesystem/file.hpp"
-
-#include <kstd/memory>
-#include <kstd/os/error.hpp>
-
-#include <cstddef>
-
-namespace filesystem
-{
- open_file_description::open_file_description(kstd::shared_ptr<file> const & file)
- : m_file(file)
- , m_offset(0)
- {
- if (!file)
- {
- kstd::os::panic("[FILESYSTEM] open_file_description constructed with null file.");
- }
- }
-
- auto open_file_description::read(void * buffer, size_t size) -> size_t
- {
- auto read_bytes = m_file->read(buffer, m_offset, size);
- m_offset += read_bytes;
- return read_bytes;
- }
-
- auto open_file_description::write(void const * buffer, size_t size) -> size_t
- {
- auto written_bytes = m_file->write(buffer, m_offset, size);
- m_offset += written_bytes;
- return written_bytes;
- }
-} // namespace filesystem \ No newline at end of file
diff --git a/kernel/filesystem/src/vfs.cpp b/kernel/filesystem/src/vfs.cpp
deleted file mode 100644
index c0f1c3a..0000000
--- a/kernel/filesystem/src/vfs.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "filesystem/vfs.hpp"
-
-#include "kapi/system.hpp"
-
-#include "devices/device.hpp"
-#include "devices/storage/storage_management.hpp"
-#include "filesystem/custody.hpp"
-#include "filesystem/device_file.hpp"
-#include "filesystem/ext2/ext2_filesystem.hpp"
-#include "filesystem/inode.hpp"
-#include "filesystem/inode_file.hpp"
-#include "filesystem/mount.hpp"
-#include "filesystem/open_file_description.hpp"
-
-#include <kstd/cstring>
-#include <kstd/memory>
-
-#include <algorithm>
-#include <optional>
-#include <string_view>
-
-namespace filesystem
-{
- namespace
- {
- constinit auto static active_vfs = std::optional<vfs>{};
- } // namespace
-
- auto vfs::init() -> void
- {
- if (active_vfs)
- {
- kapi::system::panic("[FILESYSTEM] vfs has already been initialized.");
- }
-
- active_vfs.emplace(vfs{});
-
- auto storage_mgmt = devices::storage::storage_management::get();
- if (auto boot_device = storage_mgmt.determine_boot_device())
- {
- active_vfs->m_root_fs = kstd::make_shared<ext2::ext2_filesystem>();
- if (active_vfs->m_root_fs->mount(boot_device) != 0)
- {
- kapi::system::panic("[FILESYSTEM] Failed to mount root filesystem.");
- }
-
- active_vfs->m_root_mount = mount{"/", active_vfs->m_root_fs};
-
- std::ranges::for_each(storage_mgmt.all_controllers(), [&](auto controller) {
- std::ranges::for_each(controller->all_devices(), [&](auto device) { active_vfs->make_device_node(device); });
- });
- }
- else
- {
- // TODO BA-FS26 ?? what when no boot_device == no modules loaded??
- }
- }
-
- auto vfs::get() -> vfs &
- {
- if (!active_vfs)
- {
- kapi::system::panic("[FILESYSTEM] vfs has not been initialized.");
- }
-
- return *active_vfs;
- }
-
- auto vfs::open(std::string_view path) -> std::optional<open_file_description>
- {
- if (auto custody = resolve_path(path))
- {
- auto node = custody->get_inode();
- if (node->is_device())
- {
- auto current_device_file = kstd::make_shared<device_file>(node->backing_device());
- current_device_file->open();
- return open_file_description{current_device_file};
- }
-
- auto current_inode_file = kstd::make_shared<inode_file>(node);
- current_inode_file->open();
- return open_file_description{current_inode_file};
- }
-
- return std::nullopt;
- }
-
- auto vfs::make_device_node(kstd::shared_ptr<devices::device> const & device) -> void
- {
- if (!device)
- {
- kapi::system::panic("[FILESYSTEM] make_device_node called with null device.");
- }
-
- m_device_nodes.push_back(device_node_entry{device->name(), kstd::make_shared<inode>(device)});
- }
-
- auto vfs::resolve_path(std::string_view path) -> std::optional<custody>
- {
- // TODO BA-FS26 implement real path resolution with mounts and directories etc.
- // For now, just support device nodes at /dev/<device_name>.
-
- constexpr auto device_prefix = std::string_view{"/dev/"};
- if (path.starts_with(device_prefix))
- {
- auto const device_name = path.substr(device_prefix.size());
- auto entry = std::ranges::find_if(m_device_nodes, [&](auto const & device_entry) {
- return device_entry.has_value() && device_entry->name == device_name;
- });
-
- if (entry != m_device_nodes.end())
- {
- return custody{nullptr, entry->value().node};
- }
-
- return std::nullopt;
- }
-
- return std::nullopt;
- }
-
-} // namespace filesystem \ No newline at end of file