From faee9f200898c0eb7f28ed89cdd16f8afa4438e1 Mon Sep 17 00:00:00 2001 From: Amlal Date: Sun, 27 Apr 2025 03:44:22 +0200 Subject: dev: fixes and improvements, codebase formating too. Signed-off-by: Amlal --- dev/kernel/FSKit/HeFS.h | 9 ++++++--- dev/kernel/KernelKit/CoreProcessScheduler.h | 4 ++-- dev/kernel/src/FS/HeFS.cc | 29 ++++++++++++++++++++++------- dev/kernel/src/FS/NeFS.cc | 2 +- dev/kernel/src/Gfx/FBDeviceInterface.cc | 2 +- dev/kernel/src/User.cc | 14 +++++++------- dev/kernel/src/UserProcessScheduler.cc | 9 +++++++-- 7 files changed, 46 insertions(+), 23 deletions(-) (limited to 'dev/kernel') diff --git a/dev/kernel/FSKit/HeFS.h b/dev/kernel/FSKit/HeFS.h index a2dd9fe0..c18f05d4 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -144,7 +144,8 @@ struct PACKED ALIGN(8) HEFS_INDEX_NODE final { Kernel::Utf16Char fMime[kHeFSFileNameLen]; /// @brief File mime type. - Kernel::Boolean fSymLink; /// @brief Is this a symbolic link? (if yes, the fName is the path to the file and blocklinkstart and end contains it's inodes.) + Kernel::Boolean fSymLink; /// @brief Is this a symbolic link? (if yes, the fName is the path to + /// the file and blocklinkstart and end contains it's inodes.) Kernel::ATime fCreated, fAccessed, fModified, fDeleted; /// @brief File timestamps. Kernel::UInt32 fUID, fGID; /// @brief User ID and Group ID of the file. @@ -181,7 +182,8 @@ struct PACKED ALIGN(8) HEFS_INDEX_NODE_DIRECTORY final { Kernel::Utf16Char fDim[kHeFSFileNameLen]; /// @brief Directiory Immatriculation magic. - Kernel::ATime fCreated, fAccessed, fModified, fDeleted; /// @brief File timestamps and allocation status. + Kernel::ATime fCreated, fAccessed, fModified, + fDeleted; /// @brief File timestamps and allocation status. Kernel::UInt32 fUID, fGID; /// @brief User ID and Group ID of the file. Kernel::UInt32 fMode; /// @brief File mode. (read, write, execute, etc). @@ -367,7 +369,8 @@ class HeFileSystemParser final { _Output Bool Format(_Input _Output DriveTrait* drive, _Input const Int32 flags, const Utf16Char* part_name); - _Output Bool CreateDirectory(_Input DriveTrait* drive, _Input const Int32 flags, const Utf16Char* dir); + _Output Bool CreateDirectory(_Input DriveTrait* drive, _Input const Int32 flags, + const Utf16Char* dir); _Output Bool CreateFile(_Input DriveTrait* drive, _Input const Int32 flags, const Utf16Char* dir, const Utf16Char* name); diff --git a/dev/kernel/KernelKit/CoreProcessScheduler.h b/dev/kernel/KernelKit/CoreProcessScheduler.h index 42def9fc..acaa66c0 100644 --- a/dev/kernel/KernelKit/CoreProcessScheduler.h +++ b/dev/kernel/KernelKit/CoreProcessScheduler.h @@ -115,7 +115,7 @@ using ImagePtr = VoidPtr; struct PROCESS_IMAGE final { explicit PROCESS_IMAGE() = default; -private: + private: friend USER_PROCESS; friend KERNEL_PROCESS; friend class UserProcessScheduler; @@ -123,7 +123,7 @@ private: ImagePtr fCode; ImagePtr fBlob; -public: + public: Bool HasCode() const { return this->fCode != nullptr; } Bool HasImage() const { return this->fBlob != nullptr; } diff --git a/dev/kernel/src/FS/HeFS.cc b/dev/kernel/src/FS/HeFS.cc index 13d79c8f..f36cf3b6 100644 --- a/dev/kernel/src/FS/HeFS.cc +++ b/dev/kernel/src/FS/HeFS.cc @@ -79,7 +79,8 @@ namespace Detail { NE_UNUSED(node); if (!dir || !node) { - ke_panic(RUNTIME_CHECK_FILESYSTEM, "Error: Invalid directory node/boot_node in RB-Tree traversal."); + ke_panic(RUNTIME_CHECK_FILESYSTEM, + "Error: Invalid directory node/boot_node in RB-Tree traversal."); } if (dir->fChild != 0) { @@ -315,8 +316,7 @@ namespace Detail { return NO; } - if (parent->fDeleted || - !parent->fCreated) { + if (parent->fDeleted || !parent->fCreated) { mnt->fPacket.fPacketLba = start; mnt->fPacket.fPacketSize = sizeof(HEFS_INDEX_NODE_DIRECTORY); mnt->fPacket.fPacketContent = dir; @@ -790,13 +790,20 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input // Check if the disk is already formatted. - if (KStringBuilder::Equals(root->fMagic, kHeFSMagic)) { + if (KStringBuilder::Equals(root->fMagic, kHeFSMagic) && root->fVersion == kHeFSVersion) { delete root; root = nullptr; err_global_get() = kErrorSuccess; return YES; + } else if (root->fVersion != kHeFSVersion) { + delete root; + root = nullptr; + + err_global_get() = kErrorUnrecoverableDisk; + + return NO; } rt_set_memory(root, 0, sizeof(HEFS_BOOT_NODE)); @@ -835,6 +842,8 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input root->fReserved3 = 0; root->fReserved4 = 0; + root->fVersion = kHeFSVersion; + root->fChecksum = 0; root->fVID = kHeFSInvalidVID; @@ -939,7 +948,7 @@ _Output Bool HeFileSystemParser::CreateDirectory(_Input DriveTrait* drive, _Inpu drive->fInput(drive->fPacket); Detail::hefsi_balance_filesystem(root, drive); - + auto dirent = Detail::hefs_fetch_index_node_directory(root, drive, dir); if (dirent) { @@ -1067,6 +1076,9 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con node->fFlags = flags; node->fChecksum = 0; + node->fGID = 0; + node->fUID = 0; + wrt_copy_memory((VoidPtr) name, node->fName, wrt_string_len(name)); if (Detail::hefs_allocate_index_node(root, drive, dir, node)) { @@ -1076,18 +1088,21 @@ _Output Bool HeFileSystemParser::CreateFile(_Input DriveTrait* drive, _Input con return YES; } + delete node; + delete root; + return NO; } /// @brief Initialize the HeFS filesystem. /// @return To check its status, see err_local_get(). Boolean fs_init_hefs(Void) noexcept { - kout << "Creating main disk with HeFS in it...\r"; + kout << "Creating HeFS disk...\r"; auto drv = io_construct_main_drive(); if (drv.fPacket.fPacketReadOnly == YES) - ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main filesystem cannot be mounted."); + ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main disk cannot be mounted."); HeFileSystemParser parser; diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index e0cdc71b..e68a4035 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -877,7 +877,7 @@ Boolean fs_init_nefs(Void) noexcept { kMountpoint.A() = io_construct_main_drive(); if (kMountpoint.A().fPacket.fPacketReadOnly == YES) - ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main filesystem cannot be mounted."); + ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main disk cannot be mounted."); NeFileSystemParser parser; parser.Format(&kMountpoint.A(), 0, kNeFSVolumeName); diff --git a/dev/kernel/src/Gfx/FBDeviceInterface.cc b/dev/kernel/src/Gfx/FBDeviceInterface.cc index be52655d..d588e8c8 100644 --- a/dev/kernel/src/Gfx/FBDeviceInterface.cc +++ b/dev/kernel/src/Gfx/FBDeviceInterface.cc @@ -37,7 +37,7 @@ FBDeviceInterface& FBDeviceInterface::operator<<(FBDevicePacket* pckt) { /// @return the class itself after operation. FBDeviceInterface& FBDeviceInterface::operator>>(FBDevicePacket* pckt) { if (!pckt) return *this; - + this->fIn(this, pckt); return *this; diff --git a/dev/kernel/src/User.cc b/dev/kernel/src/User.cc index 54f3853d..3e6aeeba 100644 --- a/dev/kernel/src/User.cc +++ b/dev/kernel/src/User.cc @@ -29,20 +29,20 @@ namespace Detail { /// \param password password to hash. /// \return the hashed password //////////////////////////////////////////////////////////// - Int32 cred_construct_token(Char* password, const Char* in_password, User* user, SizeT length) { + Int32 user_standard_token_generator(Char* password, const Char* in_password, User* user, + SizeT length) { if (!password || !user) return 1; + if (*password == 0) return 1; - kout << "cred_construct_token: Hashing user password...\r"; + kout << "user_standard_token_generator: Hashing user password...\r"; for (SizeT i_pass = 0UL; i_pass < length; ++i_pass) { Char cur_chr = in_password[i_pass]; - if (cur_chr == 0) break; - password[i_pass] = cur_chr | (user->IsStdUser() ? kStdUserType : kSuperUserType); } - kout << "cred_construct_token: Hashed user password.\r"; + kout << "user_standard_token_generator: Hashed user password.\r"; return 0; } @@ -84,7 +84,7 @@ Bool User::Save(const UserPublicKey password_to_fill) noexcept { rt_copy_memory((VoidPtr) password_to_fill, password, len); - if (!Detail::cred_construct_token(password, password_to_fill, this, len)) { + if (!Detail::user_standard_token_generator(password, password_to_fill, this, len)) { delete[] password; password = nullptr; @@ -116,7 +116,7 @@ Bool User::Matches(const UserPublicKey password_to_fill) noexcept { rt_copy_memory((VoidPtr) password_to_fill, password, len); - if (!Detail::cred_construct_token(password, password_to_fill, this, len)) { + if (!Detail::user_standard_token_generator(password, password_to_fill, this, len)) { delete[] password; password = nullptr; diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc index bc2cc8e2..5d983f34 100644 --- a/dev/kernel/src/UserProcessScheduler.cc +++ b/dev/kernel/src/UserProcessScheduler.cc @@ -101,8 +101,14 @@ Void USER_PROCESS::Wake(Bool should_wakeup) { STATIC USER_PROCESS::USER_HEAP_TREE* sched_try_go_upper_heap_tree( USER_PROCESS::USER_HEAP_TREE* tree) { + if (!tree) { + return nullptr; + } + + tree = tree->MemoryParent; + if (tree) { - tree = tree->MemoryNext; + tree = tree->MemoryParent; if (!tree) { return nullptr; @@ -162,7 +168,6 @@ ErrorOr USER_PROCESS::New(SizeT sz, SizeT pad_amount) { entry = entry->MemoryChild; is_parent = YES; } else { - entry = entry->MemoryParent; entry = sched_try_go_upper_heap_tree(entry); } } -- cgit v1.2.3