Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Rename RefCounted -> RefPtr and implement RefCounted

Browse Source
This commit is contained in:
Bananymous
2023-03-08 03:21:30 +02:00
parent f7ebda3bf1
commit 23b3028e15
12 changed files with 98 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/include/kernel/FS/Ext2.h
View File

@@ -131,8 +131,8 @@ namespace Kernel
virtual BAN::StringView name() const override { return m_name; }
virtual BAN::ErrorOr<BAN::Vector<uint8_t>> read_all() override;
virtual BAN::ErrorOr<BAN::Vector<BAN::RefCounted<Inode>>> directory_inodes() override;
virtual BAN::ErrorOr<BAN::RefCounted<Inode>> directory_find(BAN::StringView) override;
virtual BAN::ErrorOr<BAN::Vector<BAN::RefPtr<Inode>>> directory_inodes() override;
virtual BAN::ErrorOr<BAN::RefPtr<Inode>> directory_find(BAN::StringView) override;
private:
BAN::ErrorOr<void> for_each_block(BAN::Function<BAN::ErrorOr<bool>(const BAN::Vector<uint8_t>&)>&);
@@ -158,7 +158,7 @@ namespace Kernel
public:
static BAN::ErrorOr<Ext2FS*> create(StorageDevice::Partition&);
virtual const BAN::RefCounted<Inode> root_inode() const override { return m_root_inode; }
virtual const BAN::RefPtr<Inode> root_inode() const override { return m_root_inode; }
private:
Ext2FS(StorageDevice::Partition& partition)
@@ -179,7 +179,7 @@ namespace Kernel
private:
StorageDevice::Partition& m_partition;
BAN::RefCounted<Inode> m_root_inode;
BAN::RefPtr<Inode> m_root_inode;
Ext2::Superblock m_superblock;
BAN::Vector<Ext2::BlockGroupDescriptor> m_block_group_descriptors;

2
kernel/include/kernel/FS/FileSystem.h
View File

@@ -9,7 +9,7 @@ namespace Kernel
class FileSystem
{
public:
virtual const BAN::RefCounted<Inode> root_inode() const = 0;
virtual const BAN::RefPtr<Inode> root_inode() const = 0;
};
}

6
kernel/include/kernel/FS/Inode.h
View File

@@ -8,7 +8,7 @@
namespace Kernel
{
class Inode
class Inode : public BAN::RefCounted<Inode>
{
public:
union Mode
@@ -48,8 +48,8 @@ namespace Kernel
virtual BAN::StringView name() const = 0;
virtual BAN::ErrorOr<BAN::Vector<uint8_t>> read_all() = 0;
virtual BAN::ErrorOr<BAN::Vector<BAN::RefCounted<Inode>>> directory_inodes() = 0;
virtual BAN::ErrorOr<BAN::RefCounted<Inode>> directory_find(BAN::StringView) = 0;
virtual BAN::ErrorOr<BAN::Vector<BAN::RefPtr<Inode>>> directory_inodes() = 0;
virtual BAN::ErrorOr<BAN::RefPtr<Inode>> directory_find(BAN::StringView) = 0;
};
}

6
kernel/include/kernel/FS/VirtualFileSystem.h
View File

@@ -13,16 +13,16 @@ namespace Kernel
static VirtualFileSystem& get();
static bool is_initialized();
virtual const BAN::RefCounted<Inode> root_inode() const override { return m_root_inode; }
virtual const BAN::RefPtr<Inode> root_inode() const override { return m_root_inode; }
BAN::ErrorOr<BAN::RefCounted<Inode>> from_absolute_path(BAN::StringView);
BAN::ErrorOr<BAN::RefPtr<Inode>> from_absolute_path(BAN::StringView);
private:
VirtualFileSystem() = default;
BAN::ErrorOr<void> initialize_impl();
private:
BAN::RefCounted<Inode> m_root_inode;
BAN::RefPtr<Inode> m_root_inode;
BAN::Vector<StorageController*> m_storage_controllers;
};

14
kernel/include/kernel/Scheduler.h
View File

@@ -16,7 +16,7 @@ namespace Kernel
void start();
void reschedule();
BAN::ErrorOr<void> add_thread(BAN::RefCounted<Thread>);
BAN::ErrorOr<void> add_thread(BAN::RefPtr<Thread>);
void set_current_thread_sleeping(uint64_t);
[[noreturn]] void set_current_thread_done();
@@ -24,7 +24,7 @@ namespace Kernel
private:
Scheduler() = default;
BAN::RefCounted<Thread> current_thread();
BAN::RefPtr<Thread> current_thread();
void wake_threads();
[[nodiscard]] bool save_current_thread();
@@ -34,17 +34,17 @@ namespace Kernel
private:
struct ActiveThread
{
BAN::RefCounted<Thread> thread;
uint64_t padding;
BAN::RefPtr<Thread> thread;
uint64_t padding = 0;
};
struct SleepingThread
{
BAN::RefCounted<Thread> thread;
uint64_t wake_delta;
BAN::RefPtr<Thread> thread;
uint64_t wake_time;
};
BAN::RefCounted<Thread> m_idle_thread;
BAN::RefPtr<Thread> m_idle_thread;
BAN::LinkedList<ActiveThread> m_active_threads;
BAN::LinkedList<SleepingThread> m_sleeping_threads;

9
kernel/include/kernel/Thread.h
View File

@@ -6,13 +6,10 @@
namespace Kernel
{
class Thread
class Thread : public BAN::RefCounted<Thread>
{
BAN_NON_COPYABLE(Thread);
BAN_NON_MOVABLE(Thread);
public:
static BAN::ErrorOr<BAN::RefCounted<Thread>> create(const BAN::Function<void()>&);
static BAN::ErrorOr<BAN::RefPtr<Thread>> create(const BAN::Function<void()>&);
~Thread();
uint32_t tid() const { return m_tid; }
@@ -40,7 +37,7 @@ namespace Kernel
BAN::Function<void()> m_function;
friend class BAN::RefCounted<Thread>;
friend class BAN::RefPtr<Thread>;
};
}

14
kernel/kernel/FS/Ext2.cpp
View File

@@ -253,12 +253,12 @@ namespace Kernel
return data_buffer;
}
BAN::ErrorOr<BAN::RefCounted<Inode>> Ext2Inode::directory_find(BAN::StringView file_name)
BAN::ErrorOr<BAN::RefPtr<Inode>> Ext2Inode::directory_find(BAN::StringView file_name)
{
if (!ifdir())
return BAN::Error::from_errno(ENOTDIR);
BAN::RefCounted<Inode> result;
BAN::RefPtr<Inode> result;
BAN::Function<BAN::ErrorOr<bool>(const BAN::Vector<uint8_t>&)> function(
[&](const BAN::Vector<uint8_t>& block_data) -> BAN::ErrorOr<bool>
{
@@ -273,7 +273,7 @@ namespace Kernel
Ext2Inode* inode = new Ext2Inode(m_fs, TRY(m_fs->read_inode(entry->inode)), entry_name);
if (inode == nullptr)
return BAN::Error::from_errno(ENOMEM);
result = TRY(BAN::RefCounted<Inode>::adopt(inode));
result = BAN::RefPtr<Inode>::adopt(inode);
return false;
}
entry_addr += entry->rec_len;
@@ -288,12 +288,12 @@ namespace Kernel
return BAN::Error::from_errno(ENOENT);
}
BAN::ErrorOr<BAN::Vector<BAN::RefCounted<Inode>>> Ext2Inode::directory_inodes()
BAN::ErrorOr<BAN::Vector<BAN::RefPtr<Inode>>> Ext2Inode::directory_inodes()
{
if (!ifdir())
return BAN::Error::from_errno(ENOTDIR);
BAN::Vector<BAN::RefCounted<Inode>> inodes;
BAN::Vector<BAN::RefPtr<Inode>> inodes;
BAN::Function<BAN::ErrorOr<bool>(const BAN::Vector<uint8_t>&)> function(
[&](const BAN::Vector<uint8_t>& block_data) -> BAN::ErrorOr<bool>
{
@@ -310,7 +310,7 @@ namespace Kernel
Ext2Inode* inode = new Ext2Inode(m_fs, BAN::move(current_inode), entry_name);
if (inode == nullptr)
return BAN::Error::from_errno(ENOMEM);
TRY(inodes.push_back(TRY(BAN::RefCounted<Inode>::adopt(inode))));
TRY(inodes.push_back(BAN::RefPtr<Inode>::adopt(inode)));
}
entry_addr += entry->rec_len;
}
@@ -431,7 +431,7 @@ namespace Kernel
Ext2Inode* root_inode = new Ext2Inode(this, TRY(read_inode(Ext2::Enum::ROOT_INO)), "");
if (root_inode == nullptr)
return BAN::Error::from_errno(ENOMEM);
m_root_inode = TRY(BAN::RefCounted<Inode>::adopt(root_inode));
m_root_inode = BAN::RefPtr<Inode>::adopt(root_inode);
#if EXT2_DEBUG_PRINT
dprintln("root inode:");

2
kernel/kernel/FS/VirtualFileSystem.cpp
View File

@@ -112,7 +112,7 @@ namespace Kernel
return BAN::Error::from_string("Could not locate root partition");
}
BAN::ErrorOr<BAN::RefCounted<Inode>> VirtualFileSystem::from_absolute_path(BAN::StringView path)
BAN::ErrorOr<BAN::RefPtr<Inode>> VirtualFileSystem::from_absolute_path(BAN::StringView path)
{
if (path.front() != '/')
return BAN::Error::from_string("Path must be an absolute path");

12
kernel/kernel/Scheduler.cpp
View File

@@ -46,9 +46,9 @@ namespace Kernel
ASSERT_NOT_REACHED();
}
Thread& Scheduler::current_thread()
BAN::RefPtr<Thread> Scheduler::current_thread()
{
return m_current_thread ? *m_current_thread->thread : *m_idle_thread;
return m_current_thread ? m_current_thread->thread : m_idle_thread;
}
void Scheduler::reschedule()
@@ -147,9 +147,9 @@ namespace Kernel
}
read_rsp(rsp);
auto& current = current_thread();
current.set_rip(rip);
current.set_rsp(rsp);
auto current = current_thread();
current->set_rip(rip);
current->set_rsp(rsp);
return false;
}
@@ -157,7 +157,7 @@ namespace Kernel
{
VERIFY_CLI();
auto& current = current_thread();
auto& current = *current_thread();
if (current.started())
{

8
kernel/kernel/Shell.cpp
View File

@@ -182,7 +182,7 @@ argument_done:
s_thread_spinlock.lock();
MUST(Scheduler::get().add_thread(MUST(Thread::create(
auto thread_or_error = Thread::create(
[this, &arguments]
{
auto args = arguments;
@@ -191,7 +191,11 @@ argument_done:
PIT::sleep(5000);
process_command(args);
}
))));
);
if (thread_or_error.is_error())
return TTY_PRINTLN("{}", thread_or_error.error());
MUST(Scheduler::get().add_thread(thread));
while (s_thread_spinlock.is_locked());
}

4
kernel/kernel/Thread.cpp
View File

@@ -22,9 +22,9 @@ namespace Kernel
}
BAN::ErrorOr<BAN::RefCounted<Thread>> Thread::create(const BAN::Function<void()>& function)
BAN::ErrorOr<BAN::RefPtr<Thread>> Thread::create(const BAN::Function<void()>& function)
{
return BAN::RefCounted<Thread>::create(function);
return BAN::RefPtr<Thread>::create(function);
}
Thread::Thread(const BAN::Function<void()>& function)