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

Kernel: Add explicit offset parameter to File::read etc

Browse source
This commit is contained in:
Conrad Pankoff 2020-04-10 19:44:42 +10:00 • committed by Andreas Kling
parent 68c7ca7d3b
commit a3edeb5868
45 changed files with 199 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Devices/BXVGADevice.h
View file

@ -45,10 +45,10 @@ public:
private:
virtual const char* class_name() const override { return "BXVGA"; }
virtual bool can_read(const FileDescription&) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return -EINVAL; }
virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override { return -EINVAL; }
virtual bool read_blocks(unsigned, u16, u8*) override { return false; }
virtual bool write_blocks(unsigned, u16, const u8*) override { return false; }

60
Kernel/Devices/DiskPartition.cpp
View file

@ -48,32 +48,48 @@ DiskPartition::~DiskPartition()
{
}
ssize_t DiskPartition::read(FileDescription& file_description, u8* buffer, ssize_t length)
ssize_t DiskPartition::read(FileDescription& fd, size_t offset, u8* outbuf, ssize_t len)
{
// FIXME: This is a hacky solution, but works fine for now...
off_t current_offset = file_description.seek(0, SEEK_CUR);
auto new_offset = current_offset + (m_block_offset * m_device->block_size());
if ((new_offset / m_device->block_size()) > m_block_limit || ((new_offset + length) / m_device->block_size()) > m_block_limit) {
return 0;
}
file_description.seek(new_offset, SEEK_SET);
auto result = m_device->read(file_description, buffer, length);
file_description.seek(current_offset, SEEK_SET);
return result;
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::read offset=" << fd.offset() << " adjust=" << adjust << " len=" << len;
#endif
return m_device->read(fd, offset + adjust, outbuf, len);
}
ssize_t DiskPartition::write(FileDescription& file_description, const u8* buffer, ssize_t length)
bool DiskPartition::can_read(const FileDescription& fd, size_t offset) const
{
// FIXME: This is a hacky solution, but works fine for now...
off_t current_offset = file_description.seek(0, SEEK_CUR);
auto new_offset = current_offset + (m_block_offset * m_device->block_size());
if ((new_offset / m_device->block_size()) > m_block_limit || ((new_offset + length) / m_device->block_size()) > m_block_limit) {
return 0;
}
file_description.seek(new_offset, SEEK_SET);
auto result = m_device->write(file_description, buffer, length);
file_description.seek(current_offset, SEEK_SET);
return result;
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::can_read offset=" << offset << " adjust=" << adjust;
#endif
return m_device->can_read(fd, offset + adjust);
}
ssize_t DiskPartition::write(FileDescription& fd, size_t offset, const u8* inbuf, ssize_t len)
{
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::write offset=" << offset << " adjust=" << adjust << " len=" << len;
#endif
return m_device->write(fd, offset + adjust, inbuf, len);
}
bool DiskPartition::can_write(const FileDescription& fd, size_t offset) const
{
unsigned adjust = m_block_offset * block_size();
#ifdef OFFD_DEBUG
klog() << "DiskPartition::can_write offset=" << offset << " adjust=" << adjust;
#endif
return m_device->can_write(fd, offset + adjust);
}
bool DiskPartition::read_blocks(unsigned index, u16 count, u8* out)

8
Kernel/Devices/DiskPartition.h
View file

@ -40,10 +40,10 @@ public:
virtual bool write_blocks(unsigned index, u16 count, const u8*) override;
// ^BlockDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override { return true; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override;
private:
virtual const char* class_name() const override;

6
Kernel/Devices/FullDevice.cpp
View file

@ -40,19 +40,19 @@ FullDevice::~FullDevice()
{
}
bool FullDevice::can_read(const FileDescription&) const
bool FullDevice::can_read(const FileDescription&, size_t) const
{
return true;
}
ssize_t FullDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t FullDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
ssize_t count = min(PAGE_SIZE, size);
memset(buffer, 0, (size_t)count);
return count;
}
ssize_t FullDevice::write(FileDescription&, const u8*, ssize_t size)
ssize_t FullDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{
if (size == 0)
return 0;

8
Kernel/Devices/FullDevice.h
View file

@ -38,10 +38,10 @@ public:
private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "FullDevice"; }
};

6
Kernel/Devices/KeyboardDevice.cpp
View file

@ -573,12 +573,12 @@ KeyboardDevice::~KeyboardDevice()
{
}
bool KeyboardDevice::can_read(const FileDescription&) const
bool KeyboardDevice::can_read(const FileDescription&, size_t) const
{
return !m_queue.is_empty();
}
ssize_t KeyboardDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t KeyboardDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
ssize_t nread = 0;
while (nread < size) {
@ -594,7 +594,7 @@ ssize_t KeyboardDevice::read(FileDescription&, u8* buffer, ssize_t size)
return nread;
}
ssize_t KeyboardDevice::write(FileDescription&, const u8*, ssize_t)
ssize_t KeyboardDevice::write(FileDescription&, size_t, const u8*, ssize_t)
{
return 0;
}

8
Kernel/Devices/KeyboardDevice.h
View file

@ -52,10 +52,10 @@ public:
void set_maps(const char* n_map, const char* n_shift_map, const char* n_alt_map, const char* n_altgr_map);
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8* buffer, ssize_t) override;
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t write(FileDescription&, const u8* buffer, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8* buffer, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, size_t, const u8* buffer, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); }

8
Kernel/Devices/MBVGADevice.h
View file

@ -45,10 +45,10 @@ public:
private:
virtual const char* class_name() const override { return "MBVGA"; }
virtual bool can_read(const FileDescription&) const override { return true; }
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override { return -EINVAL; }
virtual bool can_read(const FileDescription&, size_t) const override { return true; }
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override { return -EINVAL; }
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override { return -EINVAL; }
virtual bool read_blocks(unsigned, u16, u8*) override { return false; }
virtual bool write_blocks(unsigned, u16, const u8*) override { return false; }

6
Kernel/Devices/NullDevice.cpp
View file

@ -47,17 +47,17 @@ NullDevice::~NullDevice()
{
}
bool NullDevice::can_read(const FileDescription&) const
bool NullDevice::can_read(const FileDescription&, size_t) const
{
return true;
}
ssize_t NullDevice::read(FileDescription&, u8*, ssize_t)
ssize_t NullDevice::read(FileDescription&, size_t, u8*, ssize_t)
{
return 0;
}
ssize_t NullDevice::write(FileDescription&, const u8*, ssize_t buffer_size)
ssize_t NullDevice::write(FileDescription&, size_t, const u8*, ssize_t buffer_size)
{
return min(PAGE_SIZE, buffer_size);
}

8
Kernel/Devices/NullDevice.h
View file

@ -40,10 +40,10 @@ public:
private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual bool can_read(const FileDescription&, size_t) const override;
virtual const char* class_name() const override { return "NullDevice"; }
};

16
Kernel/Devices/PATADiskDevice.cpp
View file

@ -80,9 +80,9 @@ void PATADiskDevice::set_drive_geometry(u16 cyls, u16 heads, u16 spt)
m_sectors_per_track = spt;
}
ssize_t PATADiskDevice::read(FileDescription& fd, u8* outbuf, ssize_t len)
ssize_t PATADiskDevice::read(FileDescription&, size_t offset, u8* outbuf, ssize_t len)
{
unsigned index = fd.offset() / block_size();
unsigned index = offset / block_size();
u16 whole_blocks = len / block_size();
ssize_t remaining = len % block_size();
@ -116,14 +116,14 @@ ssize_t PATADiskDevice::read(FileDescription& fd, u8* outbuf, ssize_t len)
return pos + remaining;
}
bool PATADiskDevice::can_read(const FileDescription& fd) const
bool PATADiskDevice::can_read(const FileDescription&, size_t offset) const
{
return static_cast<unsigned>(fd.offset()) < (m_cylinders * m_heads * m_sectors_per_track * block_size());
return offset < (m_cylinders * m_heads * m_sectors_per_track * block_size());
}
ssize_t PATADiskDevice::write(FileDescription& fd, const u8* inbuf, ssize_t len)
ssize_t PATADiskDevice::write(FileDescription&, size_t offset, const u8* inbuf, ssize_t len)
{
unsigned index = fd.offset() / block_size();
unsigned index = offset / block_size();
u16 whole_blocks = len / block_size();
ssize_t remaining = len % block_size();
@ -162,9 +162,9 @@ ssize_t PATADiskDevice::write(FileDescription& fd, const u8* inbuf, ssize_t len)
return pos + remaining;
}
bool PATADiskDevice::can_write(const FileDescription& fd) const
bool PATADiskDevice::can_write(const FileDescription&, size_t offset) const
{
return static_cast<unsigned>(fd.offset()) < (m_cylinders * m_heads * m_sectors_per_track * block_size());
return offset < (m_cylinders * m_heads * m_sectors_per_track * block_size());
}
bool PATADiskDevice::read_sectors_with_dma(u32 lba, u16 count, u8* outbuf)

8
Kernel/Devices/PATADiskDevice.h
View file

@ -61,10 +61,10 @@ public:
void set_drive_geometry(u16, u16, u16);
// ^BlockDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override;
protected:
explicit PATADiskDevice(PATAChannel&, DriveType, int, int);

6
Kernel/Devices/PS2MouseDevice.cpp
View file

@ -293,12 +293,12 @@ u8 PS2MouseDevice::mouse_read()
return IO::in8(I8042_BUFFER);
}
bool PS2MouseDevice::can_read(const FileDescription&) const
bool PS2MouseDevice::can_read(const FileDescription&, size_t) const
{
return !m_queue.is_empty();
}
ssize_t PS2MouseDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t PS2MouseDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
ASSERT(size > 0);
size_t nread = 0;
@ -318,7 +318,7 @@ ssize_t PS2MouseDevice::read(FileDescription&, u8* buffer, ssize_t size)
return nread;
}
ssize_t PS2MouseDevice::write(FileDescription&, const u8*, ssize_t)
ssize_t PS2MouseDevice::write(FileDescription&, size_t, const u8*, ssize_t)
{
return 0;
}

8
Kernel/Devices/PS2MouseDevice.h
View file

@ -42,10 +42,10 @@ public:
static PS2MouseDevice& the();
// ^CharacterDevice
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); }

6
Kernel/Devices/RandomDevice.cpp
View file

@ -38,18 +38,18 @@ RandomDevice::~RandomDevice()
{
}
bool RandomDevice::can_read(const FileDescription&) const
bool RandomDevice::can_read(const FileDescription&, size_t) const
{
return true;
}
ssize_t RandomDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t RandomDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
get_good_random_bytes(buffer, size);
return size;
}
ssize_t RandomDevice::write(FileDescription&, const u8*, ssize_t size)
ssize_t RandomDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{
// FIXME: Use input for entropy? I guess that could be a neat feature?
return min(PAGE_SIZE, size);

8
Kernel/Devices/RandomDevice.h
View file

@ -38,10 +38,10 @@ public:
private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "RandomDevice"; }
};

6
Kernel/Devices/SB16.cpp
View file

@ -167,12 +167,12 @@ void SB16::set_irq_line(u8 irq_number)
change_irq_number(irq_number);
}
bool SB16::can_read(const FileDescription&) const
bool SB16::can_read(const FileDescription&, size_t) const
{
return false;
}
ssize_t SB16::read(FileDescription&, u8*, ssize_t)
ssize_t SB16::read(FileDescription&, size_t, u8*, ssize_t)
{
return 0;
}
@ -226,7 +226,7 @@ void SB16::wait_for_irq()
disable_irq();
}
ssize_t SB16::write(FileDescription&, const u8* data, ssize_t length)
ssize_t SB16::write(FileDescription&, size_t, const u8* data, ssize_t length)
{
if (!m_dma_region) {
auto page = MM.allocate_supervisor_physical_page();

8
Kernel/Devices/SB16.h
View file

@ -45,10 +45,10 @@ public:
static SB16& the();
// ^CharacterDevice
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* purpose() const override { return class_name(); }

8
Kernel/Devices/SerialDevice.cpp
View file

@ -40,12 +40,12 @@ SerialDevice::~SerialDevice()
{
}
bool SerialDevice::can_read(const FileDescription&) const
bool SerialDevice::can_read(const FileDescription&, size_t) const
{
return (get_line_status() & DataReady) != 0;
}
ssize_t SerialDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t SerialDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
if (!size)
return 0;
@ -58,12 +58,12 @@ ssize_t SerialDevice::read(FileDescription&, u8* buffer, ssize_t size)
return 1;
}
bool SerialDevice::can_write(const FileDescription&) const
bool SerialDevice::can_write(const FileDescription&, size_t) const
{
return (get_line_status() & EmptyTransmitterHoldingRegister) != 0;
}
ssize_t SerialDevice::write(FileDescription&, const u8* buffer, ssize_t size)
ssize_t SerialDevice::write(FileDescription&, size_t, const u8* buffer, ssize_t size)
{
if (!size)
return 0;

8
Kernel/Devices/SerialDevice.h
View file

@ -40,10 +40,10 @@ public:
virtual ~SerialDevice() override;
// ^CharacterDevice
virtual bool can_read(const FileDescription&) const override;
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual bool can_write(const FileDescription&) const override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual bool can_write(const FileDescription&, size_t) const override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
enum InterruptEnable {
LowPowerMode = 0x01 << 5,

6
Kernel/Devices/ZeroDevice.cpp
View file

@ -39,19 +39,19 @@ ZeroDevice::~ZeroDevice()
{
}
bool ZeroDevice::can_read(const FileDescription&) const
bool ZeroDevice::can_read(const FileDescription&, size_t) const
{
return true;
}
ssize_t ZeroDevice::read(FileDescription&, u8* buffer, ssize_t size)
ssize_t ZeroDevice::read(FileDescription&, size_t, u8* buffer, ssize_t size)
{
ssize_t count = min(PAGE_SIZE, size);
memset(buffer, 0, (size_t)count);
return count;
}
ssize_t ZeroDevice::write(FileDescription&, const u8*, ssize_t size)
ssize_t ZeroDevice::write(FileDescription&, size_t, const u8*, ssize_t size)
{
return min(PAGE_SIZE, size);
}

8
Kernel/Devices/ZeroDevice.h
View file

@ -38,10 +38,10 @@ public:
private:
// ^CharacterDevice
virtual ssize_t read(FileDescription&, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&) const override;
virtual bool can_write(const FileDescription&) const override { return true; }
virtual ssize_t read(FileDescription&, size_t, u8*, ssize_t) override;
virtual ssize_t write(FileDescription&, size_t, const u8*, ssize_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&, size_t) const override { return true; }
virtual const char* class_name() const override { return "ZeroDevice"; }
};