Merge branch 'refactoring' into 'develop-BA-FS26'

Refactoring

See merge request teachos/kernel!32

1 files changed, 40 insertions, 63 deletions

diff --git a/kernel/src/filesystem/mount_table.tests.cpp b/kernel/src/filesystem/mount_table.tests.cpp
index efacdfe..4ae8711 100644
--- a/kernel/src/filesystem/mount_table.tests.cpp
+++ b/kernel/src/filesystem/mount_table.tests.cpp
@@ -19,12 +19,6 @@ SCENARIO("Mount table construction", "[filesystem][mount_table]")
   {
     kernel::filesystem::mount_table table;
 
-    THEN("finding any mount returns null")
-    {
-      REQUIRE(table.find_longest_prefix_mount("/") == nullptr);
-      REQUIRE(table.find_longest_prefix_mount("/any/path") == nullptr);
-    }
-
     THEN("removing any mount returns mount_not_found")
     {
       REQUIRE(table.remove_mount("/") == kernel::filesystem::mount_table::operation_result::mount_not_found);
@@ -40,31 +34,26 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     kernel::filesystem::mount_table table;
 
     auto fs1 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode1 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode1, "/");
-    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry1, fs1, "/", nullptr);
+    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry1, root_dentry1, fs1, nullptr);
 
     auto fs2 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode2 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode2, "/");
-    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry2, fs2, "/mnt", nullptr);
+    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/mnt");
+    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry2, root_dentry2, fs2, nullptr);
 
     table.add_mount(mount1);
     table.add_mount(mount2);
 
     THEN("dentry flags are set correctly for mounted dentries")
     {
-      REQUIRE(root_dentry1->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
-      REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
-    }
-
-    THEN("finding mounts by longest prefix returns the correct mount")
-    {
-      REQUIRE(table.find_longest_prefix_mount("/") == mount1);
-      REQUIRE(table.find_longest_prefix_mount("/file") == mount1);
-      REQUIRE(table.find_longest_prefix_mount("/mnt") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/mnt/file") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/other") == mount1);
+      REQUIRE(mount_dentry1->has_flag(kernel::filesystem::dentry::dentry_flags::is_mount_point));
+      REQUIRE(mount_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::is_mount_point));
     }
 
     THEN("finding mounts by exact valid path returns the correct mount")
@@ -82,8 +71,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     THEN("removing a mount that has no child mounts succeeds")
     {
       REQUIRE(table.remove_mount("/mnt") == kernel::filesystem::mount_table::operation_result::removed);
-      REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
-      REQUIRE(table.find_longest_prefix_mount("/mnt") == mount1);
+      REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::is_mount_point));
     }
 
     THEN("removing a mount that does not exist returns mount_not_found")
@@ -97,27 +85,22 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     kernel::filesystem::mount_table table;
 
     auto fs1 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode1 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode1, "/");
-    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry1, fs1, "/", nullptr);
+    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry1, root_dentry1, fs1, nullptr);
 
     auto fs2 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode2 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode2, "/");
-    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry2, fs2, "/", mount1);
+    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry2, root_dentry2, fs2, nullptr);
 
     table.add_mount(mount1);
     table.add_mount(mount2);
 
-    THEN("finding mounts by longest prefix returns the correct mount")
-    {
-      REQUIRE(table.find_longest_prefix_mount("/") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/file") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/mnt") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/mnt/file") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/other") == mount2);
-    }
-
     THEN("finding mounts by exact valid path returns the correct mount")
     {
       REQUIRE(table.find_exact_mount("/") == mount2);
@@ -126,8 +109,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     THEN("removing the topmost mount with the same path succeeds")
     {
       REQUIRE(table.remove_mount("/") == kernel::filesystem::mount_table::operation_result::removed);
-      REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
-      REQUIRE(table.find_longest_prefix_mount("/") == mount1);
+      REQUIRE_FALSE(root_dentry2->has_flag(kernel::filesystem::dentry::dentry_flags::is_mount_point));
     }
   }
 
@@ -136,34 +118,30 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     kernel::filesystem::mount_table table;
 
     auto fs1 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode1 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode1, "/");
-    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry1, fs1, "/", nullptr);
+    auto root_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry1 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount1 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry1, root_dentry1, fs1, nullptr);
 
     auto fs2 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode2 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode2, "/");
-    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(root_dentry1, root_dentry2, fs2, "/mnt", mount1);
+    auto root_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry2 = kstd::make_shared<kernel::filesystem::dentry>(
+        mount_dentry1, kstd::make_shared<kernel::tests::filesystem::inode>(), "mnt");
+    auto mount2 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry2, root_dentry2, fs2, mount1);
 
     auto fs3 = kstd::make_shared<kernel::tests::filesystem::filesystem>();
-    auto root_inode3 = kstd::make_shared<kernel::tests::filesystem::inode>();
-    auto root_dentry3 = kstd::make_shared<kernel::filesystem::dentry>(nullptr, root_inode3, "/");
-    auto mount3 = kstd::make_shared<kernel::filesystem::mount>(root_dentry2, root_dentry3, fs3, "/mnt/submnt", mount2);
+    auto root_dentry3 = kstd::make_shared<kernel::filesystem::dentry>(
+        nullptr, kstd::make_shared<kernel::tests::filesystem::inode>(), "/");
+    auto mount_dentry3 = kstd::make_shared<kernel::filesystem::dentry>(
+        mount_dentry2, kstd::make_shared<kernel::tests::filesystem::inode>(), "submnt");
+    auto mount3 = kstd::make_shared<kernel::filesystem::mount>(mount_dentry3, root_dentry3, fs3, mount2);
 
     table.add_mount(mount1);
     table.add_mount(mount2);
     table.add_mount(mount3);
 
-    THEN("finding mounts by path returns the correct mount based on longest prefix")
-    {
-      REQUIRE(table.find_longest_prefix_mount("/") == mount1);
-      REQUIRE(table.find_longest_prefix_mount("/file") == mount1);
-      REQUIRE(table.find_longest_prefix_mount("/mnt") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/mnt/file") == mount2);
-      REQUIRE(table.find_longest_prefix_mount("/mnt/submnt") == mount3);
-      REQUIRE(table.find_longest_prefix_mount("/other") == mount1);
-    }
-
     THEN("removing a mount with child mounts returns has_child_mounts")
     {
       REQUIRE(table.remove_mount("/") == kernel::filesystem::mount_table::operation_result::has_child_mounts);
@@ -173,8 +151,7 @@ SCENARIO("Adding, finding and removing mounts in the mount table", "[filesystem]
     THEN("removing a leaf mount succeeds")
     {
       REQUIRE(table.remove_mount("/mnt/submnt") == kernel::filesystem::mount_table::operation_result::removed);
-      REQUIRE_FALSE(root_dentry3->has_flag(kernel::filesystem::dentry::dentry_flags::mounted));
-      REQUIRE(table.find_longest_prefix_mount("/mnt/submnt") == mount2);
+      REQUIRE_FALSE(root_dentry3->has_flag(kernel::filesystem::dentry::dentry_flags::is_mount_point));
     }
   }
 }