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

SpiceAgent: Reduce copying of potentially large byte buffers

Browse source 
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:
Timothy Flynn 2023-05-21 13:48:04 -04:00 • committed by Andreas Kling
parent b865277275
commit 36d61c01bc
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/SpiceAgent/Message.cpp
View file

@ -275,7 +275,7 @@ ErrorOr<FileTransferDataMessage> FileTransferDataMessage::read_from_stream(AK::S
auto contents = TRY(ByteBuffer::create_uninitialized(size)); auto contents = TRY(ByteBuffer::create_uninitialized(size));
TRY(stream.read_until_filled(contents)); TRY(stream.read_until_filled(contents));
return FileTransferDataMessage(id, contents); return FileTransferDataMessage(id, move(contents));
} }
ErrorOr<String> FileTransferDataMessage::debug_description() ErrorOr<String> FileTransferDataMessage::debug_description()

20
Userland/Services/SpiceAgent/Message.h
View file

@ -172,13 +172,19 @@ private:
// Used to send the clipboard's contents to the client/server. // Used to send the clipboard's contents to the client/server.
class ClipboardMessage : public Message { class ClipboardMessage : public Message {
public: public:
ClipboardMessage(ClipboardDataType data_type, ByteBuffer const& contents) ClipboardMessage(ClipboardDataType data_type, ByteBuffer contents)
: Message(Type::Clipboard) : Message(Type::Clipboard)
, m_data_type(data_type) , 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); static ErrorOr<ClipboardMessage> read_from_stream(AK::Stream& stream);
ErrorOr<void> write_to_stream(AK::Stream& stream); ErrorOr<void> write_to_stream(AK::Stream& stream);
@ -247,16 +253,22 @@ class FileTransferDataMessage : public Message {
public: public:
static ErrorOr<FileTransferDataMessage> read_from_stream(AK::Stream& stream); 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; ErrorOr<String> debug_description() override;
u32 id() const { return m_id; } u32 id() const { return m_id; }
ByteBuffer const& contents() { return m_contents; } ByteBuffer const& contents() { return m_contents; }
private: private:
FileTransferDataMessage(u32 id, ByteBuffer const& contents) FileTransferDataMessage(u32 id, ByteBuffer contents)
: Message(Type::FileTransferData) : Message(Type::FileTransferData)
, m_id(id) , m_id(id)
, m_contents(contents) , m_contents(move(contents))
{ {
} }

4
Userland/Services/SpiceAgent/SpiceAgent.cpp
View file

@ -91,8 +91,8 @@ ErrorOr<void> SpiceAgent::send_clipboard_contents(ClipboardDataType data_type)
clipboard_data = TRY(Gfx::PNGWriter::encode(*bitmap)); clipboard_data = TRY(Gfx::PNGWriter::encode(*bitmap));
} }
auto message = ClipboardMessage(data_type, clipboard_data); auto message = ClipboardMessage(data_type, move(clipboard_data));
TRY(this->send_message(message)); TRY(this->send_message(move(message)));
return {}; return {};
} }