RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:37:46 +00:00
Code Issues Activity Actions

LibIPC: Move IPC::Encoder functions out of line

Browse source 
Compiling anything that includes generated IPC messages is painfully
slow at the moment. This moves the encoding helpers out of line, which
helps a bit. Doing the same for decoding will help more.
This commit is contained in:
Andreas Kling 2020-02-15 11:27:47 +01:00
parent ef01af1cb2
commit 2ae9a56c3f
4 changed files with 157 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

9
DevTools/IPCCompiler/main.cpp
View file

@ -392,14 +392,7 @@ int main(int argc, char** argv)
dbg() << " stream << endpoint_magic();"; dbg() << " stream << endpoint_magic();";
dbg() << " stream << (int)MessageID::" << name << ";"; dbg() << " stream << (int)MessageID::" << name << ";";
for (auto& parameter : parameters) { for (auto& parameter : parameters) {
if (parameter.type == "String") { if (parameter.type == "Gfx::Color") {
dbg() << " if (m_" << parameter.name << ".is_null()) {";
dbg() << " stream << (i32)-1;";
dbg() << " } else {";
dbg() << " stream << static_cast<i32>(m_" << parameter.name << ".length());";
dbg() << " stream << m_" << parameter.name << ";";
dbg() << " }";
} else if (parameter.type == "Gfx::Color") {
dbg() << " stream << m_" << parameter.name << ".value();"; dbg() << " stream << m_" << parameter.name << ".value();";
} else if (parameter.type == "Gfx::Size") { } else if (parameter.type == "Gfx::Size") {
dbg() << " stream << m_" << parameter.name << ".width();"; dbg() << " stream << m_" << parameter.name << ".width();";

142
Libraries/LibIPC/Encoder.cpp Normal file
View file

@ -0,0 +1,142 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/String.h>
#include <LibIPC/Encoder.h>
namespace IPC {
Encoder& Encoder::operator<<(bool value)
{
return *this << (u8)value;
}
Encoder& Encoder::operator<<(u8 value)
{
m_buffer.append(value);
return *this;
}
Encoder& Encoder::operator<<(u16 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 2);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
return *this;
}
Encoder& Encoder::operator<<(u32 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 4);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
return *this;
}
Encoder& Encoder::operator<<(u64 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 8);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
m_buffer.unchecked_append((u8)(value >> 32));
m_buffer.unchecked_append((u8)(value >> 40));
m_buffer.unchecked_append((u8)(value >> 48));
m_buffer.unchecked_append((u8)(value >> 56));
return *this;
}
Encoder& Encoder::operator<<(i8 value)
{
m_buffer.append((u8)value);
return *this;
}
Encoder& Encoder::operator<<(i16 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 2);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
return *this;
}
Encoder& Encoder::operator<<(i32 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 4);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
return *this;
}
Encoder& Encoder::operator<<(i64 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 8);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
m_buffer.unchecked_append((u8)(value >> 32));
m_buffer.unchecked_append((u8)(value >> 40));
m_buffer.unchecked_append((u8)(value >> 48));
m_buffer.unchecked_append((u8)(value >> 56));
return *this;
}
Encoder& Encoder::operator<<(float value)
{
union bits {
float as_float;
u32 as_u32;
} u;
u.as_float = value;
return *this << u.as_u32;
}
Encoder& Encoder::operator<<(const char* value)
{
return *this << StringView(value);
}
Encoder& Encoder::operator<<(const StringView& value)
{
m_buffer.append((const u8*)value.characters_without_null_termination(), value.length());
return *this;
}
Encoder& Encoder::operator<<(const String& value)
{
if (value.is_null())
return *this << (i32)-1;
*this << static_cast<i32>(value.length());
return *this << value.view();
}
}

114
Libraries/LibIPC/Encoder.h
View file

@ -37,107 +37,19 @@ public:
{ {
} }
Encoder& operator<<(bool value) Encoder& operator<<(bool);
{ Encoder& operator<<(u8);
return *this << (u8)value; Encoder& operator<<(u16);
} Encoder& operator<<(u32);
Encoder& operator<<(u64);
Encoder& operator<<(u8 value) Encoder& operator<<(i8);
{ Encoder& operator<<(i16);
m_buffer.append(value); Encoder& operator<<(i32);
return *this; Encoder& operator<<(i64);
} Encoder& operator<<(float);
Encoder& operator<<(const char*);
Encoder& operator<<(u16 value) Encoder& operator<<(const StringView&);
{ Encoder& operator<<(const String&);
m_buffer.ensure_capacity(m_buffer.size() + 2);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
return *this;
}
Encoder& operator<<(u32 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 4);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
return *this;
}
Encoder& operator<<(u64 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 8);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
m_buffer.unchecked_append((u8)(value >> 32));
m_buffer.unchecked_append((u8)(value >> 40));
m_buffer.unchecked_append((u8)(value >> 48));
m_buffer.unchecked_append((u8)(value >> 56));
return *this;
}
Encoder& operator<<(i8 value)
{
m_buffer.append((u8)value);
return *this;
}
Encoder& operator<<(i16 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 2);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
return *this;
}
Encoder& operator<<(i32 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 4);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
return *this;
}
Encoder& operator<<(i64 value)
{
m_buffer.ensure_capacity(m_buffer.size() + 8);
m_buffer.unchecked_append((u8)value);
m_buffer.unchecked_append((u8)(value >> 8));
m_buffer.unchecked_append((u8)(value >> 16));
m_buffer.unchecked_append((u8)(value >> 24));
m_buffer.unchecked_append((u8)(value >> 32));
m_buffer.unchecked_append((u8)(value >> 40));
m_buffer.unchecked_append((u8)(value >> 48));
m_buffer.unchecked_append((u8)(value >> 56));
return *this;
}
Encoder& operator<<(float value)
{
union bits {
float as_float;
u32 as_u32;
} u;
u.as_float = value;
return *this << u.as_u32;
}
Encoder& operator<<(const char* value)
{
return *this << StringView(value);
}
Encoder& operator<<(const StringView& value)
{
m_buffer.append((const u8*)value.characters_without_null_termination(), value.length());
return *this;
}
private: private:
MessageBuffer& m_buffer; MessageBuffer& m_buffer;

1
Libraries/LibIPC/Makefile
View file

@ -1,4 +1,5 @@
OBJS = \ OBJS = \
Encoder.o \
Endpoint.o \ Endpoint.o \
Message.o Message.o