RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:57:34 +00:00
Code Issues Activity Actions

Kernel: Make SharedMemory inherit from File.

Browse source
This commit is contained in:
Andreas Kling 2019-04-28 22:31:31 +02:00
parent a6d407fec5
commit a104d7cc93
5 changed files with 57 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Kernel/FileSystem/FileDescriptor.cpp
View file

@ -23,11 +23,6 @@ Retained<FileDescriptor> FileDescriptor::create(RetainPtr<File>&& file)
return adopt(*new FileDescriptor(move(file)));
}
Retained<FileDescriptor> FileDescriptor::create(RetainPtr<SharedMemory>&& shared_memory)
{
return adopt(*new FileDescriptor(move(shared_memory)));
}
Retained<FileDescriptor> FileDescriptor::create(RetainPtr<Socket>&& socket, SocketRole role)
{
return adopt(*new FileDescriptor(move(socket), role));
@ -53,11 +48,6 @@ FileDescriptor::FileDescriptor(RetainPtr<File>&& file)
{
}
FileDescriptor::FileDescriptor(RetainPtr<SharedMemory>&& shared_memory)
: m_shared_memory(move(shared_memory))
{
}
FileDescriptor::FileDescriptor(RetainPtr<Socket>&& socket, SocketRole role)
: m_socket(move(socket))
{
@ -448,3 +438,22 @@ KResult FileDescriptor::truncate(off_t length)
ASSERT(is_shared_memory());
return shared_memory()->truncate(length);
}
bool FileDescriptor::is_shared_memory() const
{
return m_file && m_file->is_shared_memory();
}
SharedMemory* FileDescriptor::shared_memory()
{
if (!is_shared_memory())
return nullptr;
return static_cast<SharedMemory*>(m_file.ptr());
}
const SharedMemory* FileDescriptor::shared_memory() const
{
if (!is_shared_memory())
return nullptr;
return static_cast<const SharedMemory*>(m_file.ptr());
}

12
Kernel/FileSystem/FileDescriptor.h
View file

@ -9,7 +9,6 @@
#include <AK/Retainable.h>
#include <AK/Badge.h>
#include <Kernel/Net/Socket.h>
#include <Kernel/SharedMemory.h>
class File;
class TTY;
@ -17,13 +16,13 @@ class MasterPTY;
class Process;
class Region;
class CharacterDevice;
class SharedMemory;
class FileDescriptor : public Retainable<FileDescriptor> {
public:
static Retained<FileDescriptor> create(RetainPtr<Socket>&&, SocketRole = SocketRole::None);
static Retained<FileDescriptor> create(RetainPtr<Inode>&&);
static Retained<FileDescriptor> create(RetainPtr<File>&&);
static Retained<FileDescriptor> create(RetainPtr<SharedMemory>&&);
static Retained<FileDescriptor> create_pipe_writer(FIFO&);
static Retained<FileDescriptor> create_pipe_reader(FIFO&);
~FileDescriptor();
@ -85,9 +84,9 @@ public:
FIFO::Direction fifo_direction() { return m_fifo_direction; }
bool is_fsfile() const;
bool is_shared_memory() const { return m_shared_memory; }
SharedMemory* shared_memory() { return m_shared_memory.ptr(); }
const SharedMemory* shared_memory() const { return m_shared_memory.ptr(); }
bool is_shared_memory() const;
SharedMemory* shared_memory();
const SharedMemory* shared_memory() const;
ByteBuffer& generator_cache() { return m_generator_cache; }
@ -103,7 +102,6 @@ private:
FileDescriptor(RetainPtr<Socket>&&, SocketRole);
explicit FileDescriptor(RetainPtr<Inode>&&);
explicit FileDescriptor(RetainPtr<File>&&);
explicit FileDescriptor(RetainPtr<SharedMemory>&&);
FileDescriptor(FIFO&, FIFO::Direction);
RetainPtr<Inode> m_inode;
@ -122,8 +120,6 @@ private:
RetainPtr<FIFO> m_fifo;
FIFO::Direction m_fifo_direction { FIFO::Neither };
RetainPtr<SharedMemory> m_shared_memory;
bool m_closed { false };
};