1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:07:44 +00:00

Kernel: Convert MasterPTY creation to use DoubleBuffer factory

In order to remove the public DoubleBuffer constructor, we need to
convert the callers to the factory instead, allowing the caller to
observe OOM.
This commit is contained in:
Brian Gianforcaro 2021-08-01 01:54:09 -07:00 committed by Andreas Kling
parent f816abcbad
commit 43f930d3aa
3 changed files with 31 additions and 11 deletions

View file

@ -16,17 +16,36 @@
namespace Kernel { namespace Kernel {
MasterPTY::MasterPTY(unsigned index) RefPtr<MasterPTY> MasterPTY::try_create(unsigned int index)
{
auto buffer = DoubleBuffer::try_create();
if (!buffer)
return {};
auto master_pty = adopt_ref_if_nonnull(new (nothrow) MasterPTY(index, buffer.release_nonnull()));
if (!master_pty)
return {};
auto slave_pty = adopt_ref_if_nonnull(new (nothrow) SlavePTY(*master_pty, index));
if (!slave_pty)
return {};
master_pty->m_slave = slave_pty;
return master_pty;
}
MasterPTY::MasterPTY(unsigned index, NonnullOwnPtr<DoubleBuffer> buffer)
: CharacterDevice(200, index) : CharacterDevice(200, index)
, m_slave(adopt_ref(*new SlavePTY(*this, index)))
, m_index(index) , m_index(index)
, m_buffer(move(buffer))
{ {
m_pts_name = String::formatted("/dev/pts/{}", m_index); m_pts_name = String::formatted("/dev/pts/{}", m_index);
auto process = Process::current(); auto process = Process::current();
set_uid(process->uid()); set_uid(process->uid());
set_gid(process->gid()); set_gid(process->gid());
m_buffer.set_unblock_callback([this]() { m_buffer->set_unblock_callback([this]() {
if (m_slave) if (m_slave)
evaluate_block_conditions(); evaluate_block_conditions();
}); });
@ -45,9 +64,9 @@ String MasterPTY::pts_name() const
KResultOr<size_t> MasterPTY::read(FileDescription&, u64, UserOrKernelBuffer& buffer, size_t size) KResultOr<size_t> MasterPTY::read(FileDescription&, u64, UserOrKernelBuffer& buffer, size_t size)
{ {
if (!m_slave && m_buffer.is_empty()) if (!m_slave && m_buffer->is_empty())
return 0; return 0;
return m_buffer.read(buffer, size); return m_buffer->read(buffer, size);
} }
KResultOr<size_t> MasterPTY::write(FileDescription&, u64, const UserOrKernelBuffer& buffer, size_t size) KResultOr<size_t> MasterPTY::write(FileDescription&, u64, const UserOrKernelBuffer& buffer, size_t size)
@ -62,7 +81,7 @@ bool MasterPTY::can_read(const FileDescription&, size_t) const
{ {
if (!m_slave) if (!m_slave)
return true; return true;
return !m_buffer.is_empty(); return !m_buffer->is_empty();
} }
bool MasterPTY::can_write(const FileDescription&, size_t) const bool MasterPTY::can_write(const FileDescription&, size_t) const
@ -83,14 +102,14 @@ KResultOr<size_t> MasterPTY::on_slave_write(const UserOrKernelBuffer& data, size
{ {
if (m_closed) if (m_closed)
return EIO; return EIO;
return m_buffer.write(data, size); return m_buffer->write(data, size);
} }
bool MasterPTY::can_write_from_slave() const bool MasterPTY::can_write_from_slave() const
{ {
if (m_closed) if (m_closed)
return true; return true;
return m_buffer.space_for_writing(); return m_buffer->space_for_writing();
} }
KResult MasterPTY::close() KResult MasterPTY::close()

View file

@ -16,7 +16,7 @@ class SlavePTY;
class MasterPTY final : public CharacterDevice { class MasterPTY final : public CharacterDevice {
public: public:
explicit MasterPTY(unsigned index); [[nodiscard]] static RefPtr<MasterPTY> try_create(unsigned index);
virtual ~MasterPTY() override; virtual ~MasterPTY() override;
unsigned index() const { return m_index; } unsigned index() const { return m_index; }
@ -33,6 +33,7 @@ public:
virtual String device_name() const override; virtual String device_name() const override;
private: private:
explicit MasterPTY(unsigned index, NonnullOwnPtr<DoubleBuffer> buffer);
// ^CharacterDevice // ^CharacterDevice
virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) override; virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override; virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
@ -46,7 +47,7 @@ private:
RefPtr<SlavePTY> m_slave; RefPtr<SlavePTY> m_slave;
unsigned m_index; unsigned m_index;
bool m_closed { false }; bool m_closed { false };
DoubleBuffer m_buffer; NonnullOwnPtr<DoubleBuffer> m_buffer;
String m_pts_name; String m_pts_name;
}; };

View file

@ -40,7 +40,7 @@ KResultOr<NonnullRefPtr<FileDescription>> PTYMultiplexer::open(int options)
if (m_freelist.is_empty()) if (m_freelist.is_empty())
return EBUSY; return EBUSY;
auto master_index = m_freelist.take_last(); auto master_index = m_freelist.take_last();
auto master = try_create<MasterPTY>(master_index); auto master = MasterPTY::try_create(master_index);
if (!master) if (!master)
return ENOMEM; return ENOMEM;
dbgln_if(PTMX_DEBUG, "PTYMultiplexer::open: Vending master {}", master->index()); dbgln_if(PTMX_DEBUG, "PTYMultiplexer::open: Vending master {}", master->index());