diff options
Diffstat (limited to 'kernel/src/filesystem')
| -rw-r--r-- | kernel/src/filesystem/open_file_table.cpp (renamed from kernel/src/filesystem/file_descriptor_table.cpp) | 32 | ||||
| -rw-r--r-- | kernel/src/filesystem/open_file_table.tests.cpp (renamed from kernel/src/filesystem/file_descriptor_table.tests.cpp) | 20 |
2 files changed, 26 insertions, 26 deletions
diff --git a/kernel/src/filesystem/file_descriptor_table.cpp b/kernel/src/filesystem/open_file_table.cpp index 9361f37..e47d229 100644 --- a/kernel/src/filesystem/file_descriptor_table.cpp +++ b/kernel/src/filesystem/open_file_table.cpp @@ -1,4 +1,4 @@ -#include <kernel/filesystem/file_descriptor_table.hpp> +#include <kernel/filesystem/open_file_table.hpp> #include <kernel/filesystem/open_file_descriptor.hpp> @@ -12,32 +12,32 @@ namespace { - constinit auto static global_file_descriptor_table = std::optional<kernel::filesystem::file_descriptor_table>{}; + constinit auto static global_open_file_table = std::optional<kernel::filesystem::open_file_table>{}; } // namespace namespace kernel::filesystem { - auto file_descriptor_table::init() -> void + auto open_file_table::init() -> void { - if (global_file_descriptor_table) + if (global_open_file_table) { - kapi::system::panic("[FILESYSTEM] File descriptor table has already been initialized."); + kapi::system::panic("[FILESYSTEM] Open file table has already been initialized."); } - global_file_descriptor_table.emplace(file_descriptor_table{}); + global_open_file_table.emplace(open_file_table{}); } - auto file_descriptor_table::get() -> file_descriptor_table & + auto open_file_table::get() -> open_file_table & { - if (!global_file_descriptor_table) + if (!global_open_file_table) { - kapi::system::panic("[FILESYSTEM] File descriptor table has not been initialized."); + kapi::system::panic("[FILESYSTEM] Open file table has not been initialized."); } - return *global_file_descriptor_table; + return *global_open_file_table; } - auto file_descriptor_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> int + auto open_file_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> int { if (!file_descriptor) { @@ -55,7 +55,7 @@ namespace kernel::filesystem return static_cast<int>(m_open_files.size() - 1); } - auto file_descriptor_table::get_file(int fd) const -> kstd::shared_ptr<open_file_descriptor> + auto open_file_table::get_file(int fd) const -> kstd::shared_ptr<open_file_descriptor> { if (fd < 0) { @@ -71,7 +71,7 @@ namespace kernel::filesystem return m_open_files.at(index); } - auto file_descriptor_table::remove_file(int fd) -> int + auto open_file_table::remove_file(int fd) -> int { if (fd < 0) { @@ -89,10 +89,10 @@ namespace kernel::filesystem } } // namespace kernel::filesystem -namespace kernel::tests::filesystem::file_descriptor_table +namespace kernel::tests::filesystem::open_file_table { auto deinit() -> void { - global_file_descriptor_table.reset(); + global_open_file_table.reset(); } -} // namespace kernel::tests::filesystem::file_descriptor_table +} // namespace kernel::tests::filesystem::open_file_table diff --git a/kernel/src/filesystem/file_descriptor_table.tests.cpp b/kernel/src/filesystem/open_file_table.tests.cpp index dd04e00..a5c791d 100644 --- a/kernel/src/filesystem/file_descriptor_table.tests.cpp +++ b/kernel/src/filesystem/open_file_table.tests.cpp @@ -1,4 +1,4 @@ -#include <kernel/filesystem/file_descriptor_table.hpp> +#include <kernel/filesystem/open_file_table.hpp> #include <kernel/filesystem/open_file_descriptor.hpp> #include <kernel/test_support/filesystem/inode.hpp> @@ -9,16 +9,16 @@ #include <catch2/catch_test_macros.hpp> -SCENARIO("File descriptor table add/get file", "[filesystem][file_descriptor_table]") +SCENARIO("Open file table add/get file", "[filesystem][open_file_table]") { - GIVEN("a file descriptor table and an open file descriptor") + GIVEN("a open file table and an open file descriptor") { - auto & table = kernel::filesystem::file_descriptor_table::get(); + 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 file descriptor table") + 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); @@ -41,7 +41,7 @@ SCENARIO("File descriptor table add/get file", "[filesystem][file_descriptor_tab GIVEN("a invalid open file descriptor") { - auto & table = kernel::filesystem::file_descriptor_table::get(); + auto & table = kernel::filesystem::open_file_table::get(); THEN("adding a null file descriptor returns an error code") { @@ -63,11 +63,11 @@ SCENARIO("File descriptor table add/get file", "[filesystem][file_descriptor_tab } } -SCENARIO("File descriptor table remove file", "[filesystem][file_descriptor_table]") +SCENARIO("Open file table remove file", "[filesystem][open_file_table]") { - GIVEN("a file descriptor table with an open file descriptor") + GIVEN("a open file table with an open file descriptor") { - auto & table = kernel::filesystem::file_descriptor_table::get(); + 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); @@ -98,7 +98,7 @@ SCENARIO("File descriptor table remove file", "[filesystem][file_descriptor_tabl GIVEN("an invalid file descriptor") { - auto & table = kernel::filesystem::file_descriptor_table::get(); + auto & table = kernel::filesystem::open_file_table::get(); THEN("removing a file with a negative file descriptor does nothing") { |
