mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-21 10:19:03 +03:00
3b1e063d30
A mistake I've repeatedly made is along these lines: ```c++ auto nread = TRY(source_file->read(buffer)); TRY(destination_file->write(buffer)); ``` It's a little clunky to have to create a Bytes or StringView from the buffer's data pointer and the nread, and easy to forget and just use the buffer. So, this patch changes the read() function to return a Bytes of the data that were just read. The other read_foo() methods will be modified in the same way in subsequent commits. Fixes #13687
87 lines
2.5 KiB
C++
87 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "InspectableProcess.h"
|
|
#include <AK/JsonObject.h>
|
|
#include <LibCore/EventLoop.h>
|
|
|
|
namespace InspectorServer {
|
|
|
|
HashMap<pid_t, NonnullOwnPtr<InspectableProcess>> g_processes;
|
|
|
|
InspectableProcess* InspectableProcess::from_pid(pid_t pid)
|
|
{
|
|
return g_processes.get(pid).value_or(nullptr);
|
|
}
|
|
|
|
InspectableProcess::InspectableProcess(pid_t pid, NonnullOwnPtr<Core::Stream::LocalSocket> socket)
|
|
: m_pid(pid)
|
|
, m_socket(move(socket))
|
|
{
|
|
// FIXME: Propagate errors
|
|
MUST(m_socket->set_blocking(true));
|
|
|
|
m_socket->on_ready_to_read = [this] {
|
|
char c;
|
|
[[maybe_unused]] auto buffer = m_socket->read({ &c, 1 });
|
|
if (m_socket->is_eof()) {
|
|
Core::deferred_invoke([pid = this->m_pid] { g_processes.remove(pid); });
|
|
return;
|
|
}
|
|
};
|
|
}
|
|
|
|
String InspectableProcess::wait_for_response()
|
|
{
|
|
if (m_socket->is_eof()) {
|
|
dbgln("InspectableProcess disconnected: PID {}", m_pid);
|
|
m_socket->close();
|
|
return {};
|
|
}
|
|
|
|
u32 length {};
|
|
auto length_bytes_read = m_socket->read({ (u8*)&length, sizeof(length) }).release_value_but_fixme_should_propagate_errors();
|
|
if (length_bytes_read.size() != sizeof(length)) {
|
|
dbgln("InspectableProcess got malformed data: PID {}", m_pid);
|
|
m_socket->close();
|
|
return {};
|
|
}
|
|
|
|
auto data_buffer = ByteBuffer::create_uninitialized(length).release_value_but_fixme_should_propagate_errors();
|
|
auto remaining_data_buffer = data_buffer.bytes();
|
|
|
|
while (!remaining_data_buffer.is_empty()) {
|
|
auto maybe_bytes_read = m_socket->read(remaining_data_buffer);
|
|
if (maybe_bytes_read.is_error()) {
|
|
dbgln("InspectableProcess::wait_for_response: Failed to read data: {}", maybe_bytes_read.error());
|
|
break;
|
|
}
|
|
|
|
auto bytes_read = maybe_bytes_read.release_value();
|
|
if (bytes_read.is_empty())
|
|
break;
|
|
|
|
remaining_data_buffer = remaining_data_buffer.slice(bytes_read.size());
|
|
}
|
|
|
|
VERIFY(data_buffer.size() == length);
|
|
dbgln("Got data size {} and read that many bytes", length);
|
|
|
|
return String::copy(data_buffer);
|
|
}
|
|
|
|
void InspectableProcess::send_request(JsonObject const& request)
|
|
{
|
|
auto serialized = request.to_string();
|
|
u32 length = serialized.length();
|
|
|
|
// FIXME: Propagate errors
|
|
MUST(m_socket->write({ (u8 const*)&length, sizeof(length) }));
|
|
MUST(m_socket->write(serialized.bytes()));
|
|
}
|
|
|
|
}
|