mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 09:48:11 +00:00
Kernel: Make DoubleBuffer::try() return KResultOr
This tidies up error propagation in a number of places.
This commit is contained in:
parent
213b8868af
commit
01993d0af3
8 changed files with 23 additions and 32 deletions
|
@ -17,13 +17,13 @@ inline void DoubleBuffer::compute_lockfree_metadata()
|
||||||
m_space_for_writing = m_capacity - m_write_buffer->size;
|
m_space_for_writing = m_capacity - m_write_buffer->size;
|
||||||
}
|
}
|
||||||
|
|
||||||
OwnPtr<DoubleBuffer> DoubleBuffer::try_create(size_t capacity)
|
KResultOr<NonnullOwnPtr<DoubleBuffer>> DoubleBuffer::try_create(size_t capacity)
|
||||||
{
|
{
|
||||||
auto storage = KBuffer::try_create_with_size(capacity * 2, Memory::Region::Access::ReadWrite, "DoubleBuffer");
|
auto storage = KBuffer::try_create_with_size(capacity * 2, Memory::Region::Access::ReadWrite, "DoubleBuffer");
|
||||||
if (!storage)
|
if (!storage)
|
||||||
return {};
|
return ENOMEM;
|
||||||
|
|
||||||
return adopt_own_if_nonnull(new (nothrow) DoubleBuffer(capacity, storage.release_nonnull()));
|
return adopt_nonnull_own_or_enomem(new (nothrow) DoubleBuffer(capacity, storage.release_nonnull()));
|
||||||
}
|
}
|
||||||
|
|
||||||
DoubleBuffer::DoubleBuffer(size_t capacity, NonnullOwnPtr<KBuffer> storage)
|
DoubleBuffer::DoubleBuffer(size_t capacity, NonnullOwnPtr<KBuffer> storage)
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace Kernel {
|
||||||
|
|
||||||
class DoubleBuffer {
|
class DoubleBuffer {
|
||||||
public:
|
public:
|
||||||
[[nodiscard]] static OwnPtr<DoubleBuffer> try_create(size_t capacity = 65536);
|
static KResultOr<NonnullOwnPtr<DoubleBuffer>> try_create(size_t capacity = 65536);
|
||||||
KResultOr<size_t> write(const UserOrKernelBuffer&, size_t);
|
KResultOr<size_t> write(const UserOrKernelBuffer&, size_t);
|
||||||
KResultOr<size_t> write(const u8* data, size_t size)
|
KResultOr<size_t> write(const u8* data, size_t size)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,10 +18,10 @@ static Atomic<int> s_next_fifo_id = 1;
|
||||||
|
|
||||||
RefPtr<FIFO> FIFO::try_create(UserID uid)
|
RefPtr<FIFO> FIFO::try_create(UserID uid)
|
||||||
{
|
{
|
||||||
auto buffer = DoubleBuffer::try_create();
|
auto buffer_or_error = DoubleBuffer::try_create();
|
||||||
if (buffer)
|
if (buffer_or_error.is_error())
|
||||||
return adopt_ref_if_nonnull(new (nothrow) FIFO(uid, buffer.release_nonnull()));
|
return {};
|
||||||
return {};
|
return adopt_ref_if_nonnull(new (nothrow) FIFO(uid, buffer_or_error.release_value()));
|
||||||
}
|
}
|
||||||
|
|
||||||
KResultOr<NonnullRefPtr<OpenFileDescription>> FIFO::open_direction(FIFO::Direction direction)
|
KResultOr<NonnullRefPtr<OpenFileDescription>> FIFO::open_direction(FIFO::Direction direction)
|
||||||
|
|
|
@ -35,23 +35,21 @@ MutexProtected<IPv4Socket::List>& IPv4Socket::all_sockets()
|
||||||
return *s_all_sockets;
|
return *s_all_sockets;
|
||||||
}
|
}
|
||||||
|
|
||||||
OwnPtr<DoubleBuffer> IPv4Socket::create_receive_buffer()
|
KResultOr<NonnullOwnPtr<DoubleBuffer>> IPv4Socket::try_create_receive_buffer()
|
||||||
{
|
{
|
||||||
return DoubleBuffer::try_create(256 * KiB);
|
return DoubleBuffer::try_create(256 * KiB);
|
||||||
}
|
}
|
||||||
|
|
||||||
KResultOr<NonnullRefPtr<Socket>> IPv4Socket::create(int type, int protocol)
|
KResultOr<NonnullRefPtr<Socket>> IPv4Socket::create(int type, int protocol)
|
||||||
{
|
{
|
||||||
auto receive_buffer = IPv4Socket::create_receive_buffer();
|
auto receive_buffer = TRY(IPv4Socket::try_create_receive_buffer());
|
||||||
if (!receive_buffer)
|
|
||||||
return ENOMEM;
|
|
||||||
|
|
||||||
if (type == SOCK_STREAM)
|
if (type == SOCK_STREAM)
|
||||||
return TRY(TCPSocket::try_create(protocol, receive_buffer.release_nonnull()));
|
return TRY(TCPSocket::try_create(protocol, move(receive_buffer)));
|
||||||
if (type == SOCK_DGRAM)
|
if (type == SOCK_DGRAM)
|
||||||
return TRY(UDPSocket::try_create(protocol, receive_buffer.release_nonnull()));
|
return TRY(UDPSocket::try_create(protocol, move(receive_buffer)));
|
||||||
if (type == SOCK_RAW) {
|
if (type == SOCK_RAW) {
|
||||||
auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, receive_buffer.release_nonnull(), {}));
|
auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, move(receive_buffer), {}));
|
||||||
if (raw_socket)
|
if (raw_socket)
|
||||||
return raw_socket.release_nonnull();
|
return raw_socket.release_nonnull();
|
||||||
return ENOMEM;
|
return ENOMEM;
|
||||||
|
|
|
@ -90,7 +90,7 @@ protected:
|
||||||
void set_local_address(IPv4Address address) { m_local_address = address; }
|
void set_local_address(IPv4Address address) { m_local_address = address; }
|
||||||
void set_peer_address(IPv4Address address) { m_peer_address = address; }
|
void set_peer_address(IPv4Address address) { m_peer_address = address; }
|
||||||
|
|
||||||
static OwnPtr<DoubleBuffer> create_receive_buffer();
|
static KResultOr<NonnullOwnPtr<DoubleBuffer>> try_create_receive_buffer();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
virtual bool is_ipv4() const override { return true; }
|
virtual bool is_ipv4() const override { return true; }
|
||||||
|
|
|
@ -36,16 +36,9 @@ void LocalSocket::for_each(Function<void(const LocalSocket&)> callback)
|
||||||
|
|
||||||
KResultOr<NonnullRefPtr<LocalSocket>> LocalSocket::try_create(int type)
|
KResultOr<NonnullRefPtr<LocalSocket>> LocalSocket::try_create(int type)
|
||||||
{
|
{
|
||||||
auto client_buffer = DoubleBuffer::try_create();
|
auto client_buffer = TRY(DoubleBuffer::try_create());
|
||||||
if (!client_buffer)
|
auto server_buffer = TRY(DoubleBuffer::try_create());
|
||||||
return ENOMEM;
|
return adopt_nonnull_ref_or_enomem(new (nothrow) LocalSocket(type, move(client_buffer), move(server_buffer)));
|
||||||
auto server_buffer = DoubleBuffer::try_create();
|
|
||||||
if (!server_buffer)
|
|
||||||
return ENOMEM;
|
|
||||||
auto socket = adopt_ref_if_nonnull(new (nothrow) LocalSocket(type, client_buffer.release_nonnull(), server_buffer.release_nonnull()));
|
|
||||||
if (socket)
|
|
||||||
return socket.release_nonnull();
|
|
||||||
return ENOMEM;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type)
|
KResultOr<SocketPair> LocalSocket::try_create_connected_pair(int type)
|
||||||
|
|
|
@ -97,10 +97,10 @@ RefPtr<TCPSocket> TCPSocket::create_client(const IPv4Address& new_local_address,
|
||||||
if (table.contains(tuple))
|
if (table.contains(tuple))
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
auto receive_buffer = create_receive_buffer();
|
auto receive_buffer = try_create_receive_buffer();
|
||||||
if (!receive_buffer)
|
if (receive_buffer.is_error())
|
||||||
return {};
|
return {};
|
||||||
auto client_or_error = TCPSocket::try_create(protocol(), receive_buffer.release_nonnull());
|
auto client_or_error = TCPSocket::try_create(protocol(), receive_buffer.release_value());
|
||||||
if (client_or_error.is_error())
|
if (client_or_error.is_error())
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,11 @@ namespace Kernel {
|
||||||
|
|
||||||
RefPtr<MasterPTY> MasterPTY::try_create(unsigned int index)
|
RefPtr<MasterPTY> MasterPTY::try_create(unsigned int index)
|
||||||
{
|
{
|
||||||
auto buffer = DoubleBuffer::try_create();
|
auto buffer_or_error = DoubleBuffer::try_create();
|
||||||
if (!buffer)
|
if (buffer_or_error.is_error())
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
auto master_pty = adopt_ref_if_nonnull(new (nothrow) MasterPTY(index, buffer.release_nonnull()));
|
auto master_pty = adopt_ref_if_nonnull(new (nothrow) MasterPTY(index, buffer_or_error.release_value()));
|
||||||
if (!master_pty)
|
if (!master_pty)
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue