aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kapi/cpu.cpp2
-rw-r--r--kernel/kapi/devices/driver_registry.cpp4
-rw-r--r--kernel/kapi/devices/facet_registry.cpp4
-rw-r--r--kernel/kapi/memory.cpp10
-rw-r--r--kernel/kernel/filesystems/ext2/directory_iterator.cpp6
-rw-r--r--kernel/kernel/filesystems/ext2/filesystem.cpp2
-rw-r--r--kernel/kernel/filesystems/ext2/inode.cpp2
-rw-r--r--kernel/kernel/filesystems/ext2/write_batch.cpp6
-rw-r--r--kernel/kernel/main.cpp2
-rw-r--r--kernel/kernel/memory/block_list_allocator.cpp2
-rw-r--r--kernel/kernel/memory/operators.cpp2
-rw-r--r--kernel/kernel/vfs.cpp28
-rw-r--r--kernel/kernel/vfs/dentry.cpp4
-rw-r--r--kernel/kernel/vfs/device_inode.cpp4
-rw-r--r--kernel/kernel/vfs/driver_registry.cpp8
-rw-r--r--kernel/kernel/vfs/mount.cpp6
-rw-r--r--kernel/kernel/vfs/open_file_descriptor.cpp4
-rw-r--r--kernel/kernel/vfs/open_file_table.cpp4
18 files changed, 50 insertions, 50 deletions
diff --git a/kernel/kapi/cpu.cpp b/kernel/kapi/cpu.cpp
index 44331908..61f13edc 100644
--- a/kernel/kapi/cpu.cpp
+++ b/kernel/kapi/cpu.cpp
@@ -16,7 +16,7 @@ namespace kapi::cpu
kstd::println(kstd::print_sink::stderr, "\tWrite: {}", context.is_write_access);
kstd::println(kstd::print_sink::stderr, "\tUser: {}", context.is_user_mode);
- kapi::system::panic("Halting the system due to an unrecoverable page fault.");
+ kapi::system::panic("[OS:CPU] Halting the system due to an unrecoverable page fault.");
}
} // namespace
diff --git a/kernel/kapi/devices/driver_registry.cpp b/kernel/kapi/devices/driver_registry.cpp
index 7abb121f..405596cd 100644
--- a/kernel/kapi/devices/driver_registry.cpp
+++ b/kernel/kapi/devices/driver_registry.cpp
@@ -38,7 +38,7 @@ namespace kapi::devices
{
if (registry.has_value())
{
- system::panic("[kernel] Device driver registry has already been initialized.");
+ system::panic("[OS:DRV] Device driver registry has already been initialized.");
}
registry.emplace();
@@ -48,7 +48,7 @@ namespace kapi::devices
{
if (!registry)
{
- system::panic("[kernel] Device driver registry has not been initialized.");
+ system::panic("[OS:DRV] Device driver registry has not been initialized.");
}
return *registry;
diff --git a/kernel/kapi/devices/facet_registry.cpp b/kernel/kapi/devices/facet_registry.cpp
index b2d12c86..2974c71e 100644
--- a/kernel/kapi/devices/facet_registry.cpp
+++ b/kernel/kapi/devices/facet_registry.cpp
@@ -29,7 +29,7 @@ namespace kapi::devices
{
if (registry.has_value())
{
- system::panic("[kernel] Device facet registry has already been initialized.");
+ system::panic("[OS:DEV] Device facet registry has already been initialized.");
}
registry.emplace();
@@ -39,7 +39,7 @@ namespace kapi::devices
{
if (!registry)
{
- system::panic("[kernel] Device facet registry has not been initialized.");
+ system::panic("[OS:DEV] Device facet registry has not been initialized.");
}
return *registry;
diff --git a/kernel/kapi/memory.cpp b/kernel/kapi/memory.cpp
index a0445645..1c6fa2c8 100644
--- a/kernel/kapi/memory.cpp
+++ b/kernel/kapi/memory.cpp
@@ -27,17 +27,17 @@ namespace kapi::memory
auto allocate_many(std::size_t) noexcept -> std::optional<std::pair<frame, std::size_t>> override
{
- system::panic("Tried to allocate frames without an active allocator.");
+ system::panic("[OS:MEM] Tried to allocate frames without an active allocator.");
}
auto mark_used(frame) -> void override
{
- system::panic("Tried to mark frame as used without an active allocator.");
+ system::panic("[OS:MEM] Tried to mark frame as used without an active allocator.");
}
auto release_many(std::pair<frame, std::size_t>) -> void override
{
- system::panic("Tried to release frames without an active allocator.");
+ system::panic("[OS:MEM] Tried to release frames without an active allocator.");
}
};
@@ -47,12 +47,12 @@ namespace kapi::memory
auto map(page, frame, flags) -> std::byte * override
{
- system::panic("Tried to map a page without an active mapper.");
+ system::panic("[OS:MEM] Tried to map a page without an active mapper.");
}
auto unmap(page) -> void override
{
- system::panic("Tried to unmap a page without an active mapper.");
+ system::panic("[OS:MEM] Tried to unmap a page without an active mapper.");
}
auto try_unmap(page) noexcept -> bool override
diff --git a/kernel/kernel/filesystems/ext2/directory_iterator.cpp b/kernel/kernel/filesystems/ext2/directory_iterator.cpp
index 2d5a2fe4..b1bb8b4f 100644
--- a/kernel/kernel/filesystems/ext2/directory_iterator.cpp
+++ b/kernel/kernel/filesystems/ext2/directory_iterator.cpp
@@ -26,7 +26,7 @@ namespace kernel::filesystems::ext2
{
if (!inode.is_directory())
{
- kapi::system::panic("[FS:ext2] Tried perform directory iteration on non-directory inode {}", inode.number());
+ kapi::system::panic("[FS:EXT2] Tried perform directory iteration on non-directory inode {}", inode.number());
}
if (m_file_offset >= data_size(*m_inode, *m_state))
@@ -84,7 +84,7 @@ namespace kernel::filesystems::ext2
{
if (auto result = do_read(*m_inode, m_buffer, m_file_offset, *m_state); !result)
{
- kapi::system::panic("[FS:ext2] failed to read directory entry", result.error());
+ kapi::system::panic("[FS:EXT2] failed to read directory entry", result.error());
}
auto entry = reinterpret_cast<pointer>(m_buffer.data());
@@ -97,7 +97,7 @@ namespace kernel::filesystems::ext2
if (auto result = do_read(*m_inode, m_buffer, m_file_offset, *m_state); !result)
{
- kapi::system::panic("[FS:ext2] failed to read directory entry", result.error());
+ kapi::system::panic("[FS:EXT2] failed to read directory entry", result.error());
}
entry = reinterpret_cast<pointer>(m_buffer.data());
diff --git a/kernel/kernel/filesystems/ext2/filesystem.cpp b/kernel/kernel/filesystems/ext2/filesystem.cpp
index 1785c0d7..eefd658c 100644
--- a/kernel/kernel/filesystems/ext2/filesystem.cpp
+++ b/kernel/kernel/filesystems/ext2/filesystem.cpp
@@ -166,7 +166,7 @@ namespace kernel::filesystems::ext2
case kapi::filesystem::file_type::socket:
return constants::mode_socket;
default:
- kapi::system::panic("[EXT2] Not implemented.");
+ kapi::system::panic("[FS:EXT2] Not implemented.");
}
}();
}
diff --git a/kernel/kernel/filesystems/ext2/inode.cpp b/kernel/kernel/filesystems/ext2/inode.cpp
index 4abf8599..5bdd7871 100644
--- a/kernel/kernel/filesystems/ext2/inode.cpp
+++ b/kernel/kernel/filesystems/ext2/inode.cpp
@@ -93,7 +93,7 @@ namespace kernel::filesystems::ext2
{
if (!is_regular())
{
- kapi::system::panic("[EXT2] ext2::inode write called on inode that is not of type regular");
+ kapi::system::panic("[FS:EXT2] ext2::inode write called on inode that is not of type regular");
}
// TODO check maximum file size of filesystem
diff --git a/kernel/kernel/filesystems/ext2/write_batch.cpp b/kernel/kernel/filesystems/ext2/write_batch.cpp
index 0bec30f4..76865a47 100644
--- a/kernel/kernel/filesystems/ext2/write_batch.cpp
+++ b/kernel/kernel/filesystems/ext2/write_batch.cpp
@@ -25,7 +25,7 @@ namespace kernel::filesystems::ext2
if (!result)
{
- kapi::system::panic("[FS:ext2] failed to write block groups descriptor", result.error());
+ kapi::system::panic("[FS:EXT2] failed to write block groups descriptor", result.error());
}
});
@@ -34,7 +34,7 @@ namespace kernel::filesystems::ext2
auto result = ext2::write_superblock(m_state);
if (!result)
{
- kapi::system::panic("[FS:ext2] failed to write superblock", result.error());
+ kapi::system::panic("[FS:EXT2] failed to write superblock", result.error());
}
}
@@ -42,7 +42,7 @@ namespace kernel::filesystems::ext2
auto result = ext2::write_inode(inode->number(), inode->data(), m_state);
if (!result)
{
- kapi::system::panic("[FS:ext2] failed to write inode", result.error());
+ kapi::system::panic("[FS:EXT2] failed to write inode", result.error());
}
});
}
diff --git a/kernel/kernel/main.cpp b/kernel/kernel/main.cpp
index f59b4ad7..ac2e18b8 100644
--- a/kernel/kernel/main.cpp
+++ b/kernel/kernel/main.cpp
@@ -32,7 +32,7 @@ auto run_demo() -> void
auto fd_1 = kapi::filesystem::open("/entrance/tickets.txt");
if (!fd_1)
{
- kapi::system::panic("demo failed");
+ kapi::system::panic("[demo failed]");
}
else
{
diff --git a/kernel/kernel/memory/block_list_allocator.cpp b/kernel/kernel/memory/block_list_allocator.cpp
index 993dd470..b5afd1d8 100644
--- a/kernel/kernel/memory/block_list_allocator.cpp
+++ b/kernel/kernel/memory/block_list_allocator.cpp
@@ -130,7 +130,7 @@ namespace kernel::memory
auto frame = kapi::memory::allocate_frame();
if (!frame)
{
- kapi::system::panic("[OS:Heap] OOM when expanding heap.");
+ kapi::system::panic("[OS:MEM] OOM when expanding heap.");
return false;
}
diff --git a/kernel/kernel/memory/operators.cpp b/kernel/kernel/memory/operators.cpp
index 45ba5152..8c60bb63 100644
--- a/kernel/kernel/memory/operators.cpp
+++ b/kernel/kernel/memory/operators.cpp
@@ -20,7 +20,7 @@
if (pointer == nullptr)
{
- kapi::system::panic("[OS:Heap] Out of memory!");
+ kapi::system::panic("[OS:MEM] Out of memory!");
}
return pointer;
diff --git a/kernel/kernel/vfs.cpp b/kernel/kernel/vfs.cpp
index 42e98219..cbabda82 100644
--- a/kernel/kernel/vfs.cpp
+++ b/kernel/kernel/vfs.cpp
@@ -44,7 +44,7 @@ namespace kernel::vfs
{
if (active_vfs)
{
- kapi::system::panic("[FILESYSTEM] vfs has already been initialized.");
+ kapi::system::panic("[OS:VFS] vfs has already been initialized.");
}
active_vfs.emplace();
@@ -56,13 +56,13 @@ namespace kernel::vfs
auto rootfs = driver_registry::get().find("rootfs");
if (!rootfs)
{
- kapi::system::panic("[OS:FS] rootfs driver is missing!");
+ kapi::system::panic("[OS:VFS] rootfs driver is missing!");
}
auto root_mount_result = (*rootfs)->mount(nullptr);
if (!root_mount_result)
{
- kapi::system::panic("[FILESYSTEM] failed to mount root FS", root_mount_result.error());
+ kapi::system::panic("[OS:VFS] failed to mount root FS", root_mount_result.error());
}
auto [root_inode, root_state] = *root_mount_result;
@@ -74,13 +74,13 @@ namespace kernel::vfs
auto devfs = driver_registry::get().find("devfs");
if (!devfs)
{
- kapi::system::panic("[OS:FS] devfs driver is missing!");
+ kapi::system::panic("[OS:VFS] devfs driver is missing!");
}
auto device_fs_mount_result = (*devfs)->mount(nullptr);
if (!device_fs_mount_result)
{
- kapi::system::panic("[FILESYSTEM] failed to mount device FS", device_fs_mount_result.error());
+ kapi::system::panic("[OS:VFS] failed to mount device FS", device_fs_mount_result.error());
}
auto [device_fs_root, device_fs_data] = *device_fs_mount_result;
@@ -95,13 +95,13 @@ namespace kernel::vfs
if (!root_devfs_mount)
{
- kapi::system::panic("[OS:FS] failed to mount initial devfs!", root_devfs_mount.error());
+ kapi::system::panic("[OS:VFS] failed to mount initial devfs!", root_devfs_mount.error());
}
auto resolved = resolve_path_internal("/dev/ram0");
if (!resolved)
{
- kapi::system::panic("[OS:FS] Failed to resolve boot disk!", resolved.error());
+ kapi::system::panic("[OS:VFS] Failed to resolve boot disk!", resolved.error());
}
auto [boot_device_dentry, boot_device_mount_context] = *resolved;
@@ -109,14 +109,14 @@ namespace kernel::vfs
auto driver = driver_registry::get().match(boot_device_dentry->inode());
if (!driver)
{
- kstd::println(kstd::print_sink::stderr, "[OS:FS] Missing driver for root disk!");
+ kstd::println(kstd::print_sink::stderr, "[OS:VFS] Missing driver for root disk!");
return;
}
auto mount = mount::create(nullptr, *driver, nullptr, boot_device_mount_context, boot_device_dentry->inode());
if (!mount)
{
- kapi::system::panic("[OS:FS] failed to mount boot FS", mount.error());
+ kapi::system::panic("[OS:VFS] failed to mount boot FS", mount.error());
}
m_mount_table.add_mount(*mount);
@@ -125,7 +125,7 @@ namespace kernel::vfs
{
if (auto result = mkdir("/dev"); !result)
{
- kapi::system::panic("[OS:FS] Failed to create devfs mount point!", result.error());
+ kapi::system::panic("[OS:VFS] Failed to create devfs mount point!", result.error());
}
real_dev_dentry = resolve_path("/dev");
}
@@ -133,7 +133,7 @@ namespace kernel::vfs
m_mount_table.move_mount(*root_devfs_mount, *real_dev_dentry, *mount);
if (auto result = m_mount_table.remove_mount(root_mount); !result)
{
- kapi::system::panic("[OS:FS] Failed to unmount early rootfs!", result.error());
+ kapi::system::panic("[OS:VFS] Failed to unmount early rootfs!", result.error());
}
}
@@ -141,7 +141,7 @@ namespace kernel::vfs
{
if (!active_vfs)
{
- kapi::system::panic("[FILESYSTEM] vfs has not been initialized.");
+ kapi::system::panic("[OS:VFS] vfs has not been initialized.");
}
return *active_vfs;
@@ -343,7 +343,7 @@ namespace kernel::vfs
auto current_mount = m_mount_table.find_mount("/");
if (!current_mount)
{
- kapi::system::panic("[FILESYSTEM] no root mount found.");
+ kapi::system::panic("[OS:VFS] no root mount found.");
}
auto current_dentry = current_mount->root_dentry();
@@ -410,7 +410,7 @@ namespace kernel::vfs
current_mount = m_mount_table.find_mount(next_dentry->absolute_path());
if (!current_mount)
{
- kapi::system::panic("[FILESYSTEM] mount for dentry with mounted flag not found.");
+ kapi::system::panic("[OS:VFS] mount for dentry with mounted flag not found.");
}
next_dentry = current_mount->root_dentry();
diff --git a/kernel/kernel/vfs/dentry.cpp b/kernel/kernel/vfs/dentry.cpp
index d9cb835a..092cab7c 100644
--- a/kernel/kernel/vfs/dentry.cpp
+++ b/kernel/kernel/vfs/dentry.cpp
@@ -22,11 +22,11 @@ namespace kernel::vfs
{
if (!m_inode)
{
- kapi::system::panic("[FILESYSTEM] dentry constructed with null inode.");
+ kapi::system::panic("[OS:VFS] dentry constructed with null inode.");
}
if (m_name.empty())
{
- kapi::system::panic("[FILESYSTEM] dentry constructed with empty name.");
+ kapi::system::panic("[OS:VFS] dentry constructed with empty name.");
}
}
diff --git a/kernel/kernel/vfs/device_inode.cpp b/kernel/kernel/vfs/device_inode.cpp
index ebb39541..e9c70f15 100644
--- a/kernel/kernel/vfs/device_inode.cpp
+++ b/kernel/kernel/vfs/device_inode.cpp
@@ -25,7 +25,7 @@ namespace kernel::vfs
{
if (!device)
{
- kapi::system::panic("[FILESYSTEM] device_inode constructed with null device.");
+ kapi::system::panic("[OS:VFS] device_inode constructed with null device.");
}
}
@@ -36,7 +36,7 @@ namespace kernel::vfs
{
if (!device)
{
- kapi::system::panic("[FILESYSTEM] device_inode constructed with null device.");
+ kapi::system::panic("[OS:VFS] device_inode constructed with null device.");
}
}
diff --git a/kernel/kernel/vfs/driver_registry.cpp b/kernel/kernel/vfs/driver_registry.cpp
index 16d048bf..736cfcbc 100644
--- a/kernel/kernel/vfs/driver_registry.cpp
+++ b/kernel/kernel/vfs/driver_registry.cpp
@@ -42,7 +42,7 @@ namespace kernel::vfs
{
if (instance)
{
- kapi::system::panic("[OS:FS] The filesystem driver registry was already initialized!");
+ kapi::system::panic("[OS:VFS] The filesystem driver registry was already initialized!");
}
instance.emplace();
@@ -55,7 +55,7 @@ namespace kernel::vfs
std::ranges::for_each(instances, [](auto entry) {
auto [descriptor, driver] = entry;
- kstd::println("[OS:FS] Registering filesystem driver '{}'", descriptor->name());
+ kstd::println("[OS:VFS] Registering filesystem driver '{}'", descriptor->name());
instance->add(descriptor->name(), driver);
});
}
@@ -64,7 +64,7 @@ namespace kernel::vfs
{
if (!instance)
{
- kapi::system::panic("[OS:FS] The filesystem driver registry has not been initialized!");
+ kapi::system::panic("[OS:VFS] The filesystem driver registry has not been initialized!");
}
return *instance;
@@ -84,7 +84,7 @@ namespace kernel::vfs
auto result = m_drivers.emplace(name, driver);
if (!result.second)
{
- kstd::println(kstd::print_sink::stderr, "[OS:FS] Tried to register duplicate filesystem driver '{}'!", name);
+ kstd::println(kstd::print_sink::stderr, "[OS:VFS] Tried to register duplicate filesystem driver '{}'!", name);
}
return result.second;
diff --git a/kernel/kernel/vfs/mount.cpp b/kernel/kernel/vfs/mount.cpp
index 3f99f733..a48558f1 100644
--- a/kernel/kernel/vfs/mount.cpp
+++ b/kernel/kernel/vfs/mount.cpp
@@ -28,7 +28,7 @@ namespace kernel::vfs
{
if (!m_filesystem)
{
- kapi::system::panic("[FILESYSTEM] mount initialized with null filesystem.");
+ kapi::system::panic("[OS:VFS] mount initialized with null filesystem.");
}
}
@@ -59,7 +59,7 @@ namespace kernel::vfs
{
if (!fs)
{
- kapi::system::panic("[OS:FS] Tried to mount a null filesystem!");
+ kapi::system::panic("[OS:VFS] Tried to mount a null filesystem!");
}
auto mount_result = fs->mount(backing_inode);
@@ -123,7 +123,7 @@ namespace kernel::vfs
{
if (m_ref_count == 0)
{
- kapi::system::panic("[FILESYSTEM] decrement_ref_count() was called but ref_count is 0");
+ kapi::system::panic("[OS:VFS] decrement_ref_count() was called but ref_count is 0");
}
m_ref_count -= 1;
diff --git a/kernel/kernel/vfs/open_file_descriptor.cpp b/kernel/kernel/vfs/open_file_descriptor.cpp
index 4f0581d2..985aab50 100644
--- a/kernel/kernel/vfs/open_file_descriptor.cpp
+++ b/kernel/kernel/vfs/open_file_descriptor.cpp
@@ -4,9 +4,9 @@
#include <kernel/vfs/error.hpp>
#include <kapi/filesystem.hpp>
+#include <kapi/system.hpp>
#include <kstd/memory.hpp>
-#include <kstd/os/error.hpp>
#include <kstd/result.hpp>
#include <kstd/units.hpp>
@@ -20,7 +20,7 @@ namespace kernel::vfs
{
if (!dentry)
{
- kstd::os::panic("[FILESYSTEM] open_file_descriptor constructed with null dentry.");
+ kapi::system::panic("[OS:VFS] open_file_descriptor constructed with null dentry.");
}
}
diff --git a/kernel/kernel/vfs/open_file_table.cpp b/kernel/kernel/vfs/open_file_table.cpp
index 108f4e11..c2f0465a 100644
--- a/kernel/kernel/vfs/open_file_table.cpp
+++ b/kernel/kernel/vfs/open_file_table.cpp
@@ -24,7 +24,7 @@ namespace kernel::vfs
{
if (global_open_file_table)
{
- kapi::system::panic("[FILESYSTEM] Open file table has already been initialized.");
+ kapi::system::panic("[OS:VFS] Open file table has already been initialized.");
}
global_open_file_table.emplace(open_file_table{});
@@ -34,7 +34,7 @@ namespace kernel::vfs
{
if (!global_open_file_table)
{
- kapi::system::panic("[FILESYSTEM] Open file table has not been initialized.");
+ kapi::system::panic("[OS:VFS] Open file table has not been initialized.");
}
return *global_open_file_table;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-30 07:11:26 +0000