mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 23:17:45 +00:00
SpiceAgent: Reduce copying of potentially large byte buffers
This moves buffers around instead of implicitly copying them, and marks the message types that hold these buffers as move-only.
This commit is contained in:
parent
b865277275
commit
36d61c01bc
3 changed files with 19 additions and 7 deletions
|
@ -275,7 +275,7 @@ ErrorOr<FileTransferDataMessage> FileTransferDataMessage::read_from_stream(AK::S
|
|||
auto contents = TRY(ByteBuffer::create_uninitialized(size));
|
||||
TRY(stream.read_until_filled(contents));
|
||||
|
||||
return FileTransferDataMessage(id, contents);
|
||||
return FileTransferDataMessage(id, move(contents));
|
||||
}
|
||||
|
||||
ErrorOr<String> FileTransferDataMessage::debug_description()
|
||||
|
|
|
@ -172,13 +172,19 @@ private:
|
|||
// Used to send the clipboard's contents to the client/server.
|
||||
class ClipboardMessage : public Message {
|
||||
public:
|
||||
ClipboardMessage(ClipboardDataType data_type, ByteBuffer const& contents)
|
||||
ClipboardMessage(ClipboardDataType data_type, ByteBuffer contents)
|
||||
: Message(Type::Clipboard)
|
||||
, m_data_type(data_type)
|
||||
, m_contents(contents)
|
||||
, m_contents(move(contents))
|
||||
{
|
||||
}
|
||||
|
||||
ClipboardMessage(ClipboardMessage const&) = delete;
|
||||
ClipboardMessage& operator=(ClipboardMessage const&) = delete;
|
||||
|
||||
ClipboardMessage(ClipboardMessage&&) = default;
|
||||
ClipboardMessage& operator=(ClipboardMessage&&) = default;
|
||||
|
||||
static ErrorOr<ClipboardMessage> read_from_stream(AK::Stream& stream);
|
||||
|
||||
ErrorOr<void> write_to_stream(AK::Stream& stream);
|
||||
|
@ -247,16 +253,22 @@ class FileTransferDataMessage : public Message {
|
|||
public:
|
||||
static ErrorOr<FileTransferDataMessage> read_from_stream(AK::Stream& stream);
|
||||
|
||||
FileTransferDataMessage(FileTransferDataMessage const&) = delete;
|
||||
FileTransferDataMessage& operator=(FileTransferDataMessage const&) = delete;
|
||||
|
||||
FileTransferDataMessage(FileTransferDataMessage&&) = default;
|
||||
FileTransferDataMessage& operator=(FileTransferDataMessage&&) = default;
|
||||
|
||||
ErrorOr<String> debug_description() override;
|
||||
|
||||
u32 id() const { return m_id; }
|
||||
ByteBuffer const& contents() { return m_contents; }
|
||||
|
||||
private:
|
||||
FileTransferDataMessage(u32 id, ByteBuffer const& contents)
|
||||
FileTransferDataMessage(u32 id, ByteBuffer contents)
|
||||
: Message(Type::FileTransferData)
|
||||
, m_id(id)
|
||||
, m_contents(contents)
|
||||
, m_contents(move(contents))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -91,8 +91,8 @@ ErrorOr<void> SpiceAgent::send_clipboard_contents(ClipboardDataType data_type)
|
|||
clipboard_data = TRY(Gfx::PNGWriter::encode(*bitmap));
|
||||
}
|
||||
|
||||
auto message = ClipboardMessage(data_type, clipboard_data);
|
||||
TRY(this->send_message(message));
|
||||
auto message = ClipboardMessage(data_type, move(clipboard_data));
|
||||
TRY(this->send_message(move(message)));
|
||||
|
||||
return {};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue