aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kapi/filesystem.cpp9
-rw-r--r--kernel/kapi/filesystem.tests.cpp58
2 files changed, 37 insertions, 30 deletions
diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 822095e6..982d5df0 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -10,6 +10,7 @@
#include <cstddef>
#include <expected>
+#include <span>
#include <string_view>
namespace kapi::filesystem
@@ -41,17 +42,17 @@ namespace kapi::filesystem
.and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); });
}
- auto read(size_t file_descriptor, void * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
+ auto read(size_t file_descriptor, std::span<std::byte> buffer) -> std::expected<std::size_t, kstd::error_code>
{
return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
- return descriptor->read(buffer, size);
+ return descriptor->read(buffer.data(), buffer.size());
});
}
- auto write(size_t file_descriptor, void const * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
+ auto write(size_t file_descriptor, std::span<std::byte const> buffer) -> std::expected<std::size_t, kstd::error_code>
{
return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
- return descriptor->write(buffer, size);
+ return descriptor->write(buffer.data(), buffer.size());
});
}
diff --git a/kernel/kapi/filesystem.tests.cpp b/kernel/kapi/filesystem.tests.cpp
index f2a6a988..afd43d97 100644
--- a/kernel/kapi/filesystem.tests.cpp
+++ b/kernel/kapi/filesystem.tests.cpp
@@ -7,11 +7,14 @@
#include <catch2/catch_test_macros.hpp>
#include <algorithm>
+#include <bit>
#include <cstddef>
#include <filesystem>
#include <string_view>
#include <vector>
+// NOLINTBEGIN (readability-magic-numbers)
+
SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kapi filesystem with real images",
"[kapi][filesystem]")
{
@@ -30,10 +33,11 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/information/info_1.txt").value();
auto buffer = std::vector<std::byte>(6);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
- REQUIRE(bytes_read);
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
+
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "info_1");
REQUIRE(kapi::filesystem::close(fd));
@@ -46,17 +50,17 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto write_buffer = std::vector<std::byte>{std::byte{'H'}, std::byte{'e'}};
- auto const bytes_written = kapi::filesystem::write(*write_fd, write_buffer.data(), write_buffer.size());
+ auto const bytes_written = kapi::filesystem::write(*write_fd, write_buffer);
REQUIRE(bytes_written == 2);
auto read_fd = kapi::filesystem::open("/information/info_1.txt");
REQUIRE(read_fd);
auto read_buffer = std::vector<std::byte>(6);
- auto const bytes_read = kapi::filesystem::read(*read_fd, read_buffer.data(), read_buffer.size());
- REQUIRE(bytes_read);
+ auto const bytes_read = kapi::filesystem::read(*read_fd, read_buffer);
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(read_buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(read_buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "Hefo_1");
REQUIRE(kapi::filesystem::close(*write_fd));
@@ -68,10 +72,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/symlinks/information_directory_absolute/info_1.txt").value();
auto buffer = std::vector<std::byte>(6);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
- REQUIRE(bytes_read);
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "info_1");
REQUIRE(kapi::filesystem::close(fd));
@@ -82,10 +86,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/symlinks/information_directory_relative/info_1.txt").value();
auto buffer = std::vector<std::byte>(6);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
- REQUIRE(bytes_read);
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "info_1");
REQUIRE(kapi::filesystem::close(fd));
@@ -98,10 +102,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/information/symlinks/traverse_back_twice/information/sheep_1.txt").value();
auto buffer = std::vector<std::byte>(7);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
- REQUIRE(bytes_read);
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "sheep_1");
REQUIRE(kapi::filesystem::close(fd));
@@ -114,10 +118,10 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/information/monkey_house/monkey_1.txt").value();
auto buffer = std::vector<std::byte>(8);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
- REQUIRE(bytes_read);
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
+ auto buffer_as_str = bytes_read.transform(
+ [&](auto length) { return std::string_view{std::bit_cast<char *>(buffer.data()), length}; });
- std::string_view buffer_as_str{reinterpret_cast<char *>(buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "monkey_1");
REQUIRE(kapi::filesystem::close(fd));
@@ -141,7 +145,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto fd = kapi::filesystem::open("/dev/ram0").value();
auto buffer = std::vector<std::byte>(512);
- auto bytes_read = kapi::filesystem::read(fd, buffer.data(), buffer.size());
+ auto bytes_read = kapi::filesystem::read(fd, buffer);
REQUIRE(bytes_read);
REQUIRE(kapi::filesystem::close(fd));
@@ -152,13 +156,13 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
auto read_fd = kapi::filesystem::open("/dev/ram16").value();
auto buffer = std::vector<std::byte>(512, std::byte{0xAB});
- auto bytes_written = kapi::filesystem::write(read_fd, buffer.data(), buffer.size());
+ auto bytes_written = kapi::filesystem::write(read_fd, buffer);
REQUIRE(bytes_written);
auto write_fd = kapi::filesystem::open("/dev/ram16").value();
auto read_buffer = std::vector<std::byte>(512);
- auto bytes_read = kapi::filesystem::read(write_fd, read_buffer.data(), read_buffer.size());
+ auto bytes_read = kapi::filesystem::read(write_fd, read_buffer);
REQUIRE(bytes_read);
REQUIRE(std::equal(buffer.begin(), buffer.end(), read_buffer.begin()));
@@ -200,7 +204,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
{
std::vector<std::byte> buffer(10);
auto const invalid_fd = 999uz;
- auto bytes_read = kapi::filesystem::read(invalid_fd, buffer.data(), buffer.size());
+ auto bytes_read = kapi::filesystem::read(invalid_fd, buffer);
REQUIRE(!bytes_read);
}
@@ -208,7 +212,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
{
std::vector<std::byte> buffer(10);
auto const invalid_fd = 999uz;
- auto bytes_written = kapi::filesystem::write(invalid_fd, buffer.data(), buffer.size());
+ auto bytes_written = kapi::filesystem::write(invalid_fd, buffer);
REQUIRE(!bytes_written);
}
@@ -224,7 +228,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
REQUIRE(fd);
auto write_buffer = std::vector<std::byte>{std::byte{'T'}, std::byte{'e'}, std::byte{'s'}, std::byte{'t'}};
- CHECK(kapi::filesystem::write(*fd, write_buffer.data(), write_buffer.size()));
+ CHECK(kapi::filesystem::write(*fd, write_buffer));
REQUIRE(kapi::filesystem::close(*fd));
@@ -232,7 +236,7 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
REQUIRE(fd);
auto read_buffer = std::vector<std::byte>(4);
- auto bytes_read = kapi::filesystem::read(*fd, read_buffer.data(), read_buffer.size());
+ auto bytes_read = kapi::filesystem::read(*fd, read_buffer);
std::string_view buffer_as_str{reinterpret_cast<char *>(read_buffer.data()), static_cast<size_t>(*bytes_read)};
REQUIRE(buffer_as_str == "Test");
@@ -271,3 +275,5 @@ SCENARIO_METHOD(kernel::tests::filesystem::storage_boot_module_vfs_fixture, "Kap
}
}
}
+
+// NOLINTEND (readability-magic-numbers) \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-31 05:35:34 +0000