RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:47:44 +00:00
Code Issues Activity Actions

LibPartition: Make PartitionTable kernel/userland agnostic

Browse source 
Previously, PartitionTable was constructed using a Kernel::StorageDevice
making it only usable in the kernel. This commit adds a new constructor
that takes a Core::File instead, making it usable in userland as well.

This also adds the m_block_size field which stores the block size of the
underlying device obtained by calling StorageDevice::block_size() in the
kernel or by using the STORAGE_DEVICE_GET_BLOCK_SIZE ioctl in userland.
This avoids the need for an #ifdef every time block size is needed.
This commit is contained in:
Samuel Bowman 2022-03-20 19:59:05 -04:00 • committed by Linus Groh
parent f6ab636d31
commit 6a1c85aa61
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibPartition/CMakeLists.txt
View file

@ -7,3 +7,4 @@ set(SOURCES
) )
serenity_lib(LibPartition partition) serenity_lib(LibPartition partition)
target_link_libraries(LibPartition LibCore)

15
Userland/Libraries/LibPartition/PartitionTable.cpp
View file

@ -6,14 +6,27 @@
#include <LibPartition/PartitionTable.h> #include <LibPartition/PartitionTable.h>
#ifndef KERNEL
# include <sys/ioctl.h>
#endif
namespace Partition { namespace Partition {
#ifdef KERNEL
PartitionTable::PartitionTable(Kernel::StorageDevice const& device) PartitionTable::PartitionTable(Kernel::StorageDevice const& device)
: m_device(device) : m_device(device)
, m_block_size(device.block_size())
{ {
} }
#else
PartitionTable::PartitionTable(NonnullRefPtr<Core::File> device_file)
: m_device_file(device_file)
{
VERIFY(ioctl(m_device_file->leak_fd(), STORAGE_DEVICE_GET_BLOCK_SIZE, &m_block_size) >= 0);
}
#endif
Optional<DiskPartitionMetadata> PartitionTable::partition(unsigned index) Optional<DiskPartitionMetadata> PartitionTable::partition(unsigned index) const
{ {
if (index > partitions_count()) if (index > partitions_count())
return {}; return {};

18
Userland/Libraries/LibPartition/PartitionTable.h
View file

@ -6,25 +6,37 @@
#pragma once #pragma once
#include <Kernel/Storage/StorageDevice.h>
#include <LibPartition/DiskPartitionMetadata.h> #include <LibPartition/DiskPartitionMetadata.h>
#ifdef KERNEL
# include <Kernel/Storage/StorageDevice.h>
#else
# include <LibCore/File.h>
#endif
namespace Partition { namespace Partition {
class PartitionTable { class PartitionTable {
public: public:
Optional<DiskPartitionMetadata> partition(unsigned index); Optional<DiskPartitionMetadata> partition(unsigned index) const;
size_t partitions_count() const { return m_partitions.size(); } size_t partitions_count() const { return m_partitions.size(); }
virtual ~PartitionTable() = default; virtual ~PartitionTable() = default;
virtual bool is_valid() const = 0; virtual bool is_valid() const = 0;
Vector<DiskPartitionMetadata> partitions() const { return m_partitions; } Vector<DiskPartitionMetadata> partitions() const { return m_partitions; }
size_t block_size() const { return m_block_size; }
protected: protected:
#ifdef KERNEL
explicit PartitionTable(Kernel::StorageDevice const&); explicit PartitionTable(Kernel::StorageDevice const&);
NonnullRefPtr<Kernel::StorageDevice> m_device; NonnullRefPtr<Kernel::StorageDevice> m_device;
#else
explicit PartitionTable(NonnullRefPtr<Core::File>);
NonnullRefPtr<Core::File> m_device_file;
#endif
Vector<DiskPartitionMetadata> m_partitions; Vector<DiskPartitionMetadata> m_partitions;
size_t m_block_size;
}; };
} }