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

LibIPC: Rename IMessage id/name to message_id/message_name

Browse source 
Hogging "id" and "name" makes it impossible to use these as message
parameter names, which seems silly. :^)
This commit is contained in:
Andreas Kling 2019-12-02 11:07:05 +01:00
parent b780dcf353
commit 8ae62c57ee
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
DevTools/IPCCompiler/main.cpp
View file

@ -265,10 +265,10 @@ int main(int argc, char** argv)
dbg() << " virtual ~" << name << "() override {}"; dbg() << " virtual ~" << name << "() override {}";
dbg() << " virtual i32 endpoint_magic() const override { return " << endpoint.magic << "; }"; dbg() << " virtual i32 endpoint_magic() const override { return " << endpoint.magic << "; }";
dbg() << " static i32 static_endpoint_magic() { return " << endpoint.magic << "; }"; dbg() << " static i32 static_endpoint_magic() { return " << endpoint.magic << "; }";
dbg() << " virtual i32 id() const override { return (int)MessageID::" << name << "; }"; dbg() << " virtual i32 message_id() const override { return (int)MessageID::" << name << "; }";
dbg() << " static i32 static_message_id() { return (int)MessageID::" << name << "; }"; dbg() << " static i32 static_message_id() { return (int)MessageID::" << name << "; }";
dbg() << " virtual String name() const override { return \"" << endpoint.name << "::" << name << "\"; }"; dbg() << " virtual String message_name() const override { return \"" << endpoint.name << "::" << name << "\"; }";
dbg() << " static String static_name() { return \"" << endpoint.name << "::" << name << "\"; }"; dbg() << " static String static_message_name() { return \"" << endpoint.name << "::" << name << "\"; }";
dbg() << " static OwnPtr<" << name << "> decode(BufferStream& stream, size_t& size_in_bytes)"; dbg() << " static OwnPtr<" << name << "> decode(BufferStream& stream, size_t& size_in_bytes)";
dbg() << " {"; dbg() << " {";
@ -463,7 +463,7 @@ int main(int argc, char** argv)
dbg(); dbg();
dbg() << " virtual OwnPtr<IMessage> handle(const IMessage& message) override"; dbg() << " virtual OwnPtr<IMessage> handle(const IMessage& message) override";
dbg() << " {"; dbg() << " {";
dbg() << " switch (message.id()) {"; dbg() << " switch (message.message_id()) {";
for (auto& message : endpoint.messages) { for (auto& message : endpoint.messages) {
auto do_decode_message = [&](const String& name, bool returns_something) { auto do_decode_message = [&](const String& name, bool returns_something) {
dbg() << " case (int)" << endpoint.name << "::MessageID::" << name << ":"; dbg() << " case (int)" << endpoint.name << "::MessageID::" << name << ":";

4
Libraries/LibIPC/IMessage.h
View file

@ -8,8 +8,8 @@ public:
virtual ~IMessage(); virtual ~IMessage();
virtual int endpoint_magic() const = 0; virtual int endpoint_magic() const = 0;
virtual int id() const = 0; virtual int message_id() const = 0;
virtual String name() const = 0; virtual String message_name() const = 0;
virtual ByteBuffer encode() const = 0; virtual ByteBuffer encode() const = 0;
protected: protected:

4
Libraries/LibIPC/IServerConnection.h
View file

@ -55,7 +55,7 @@ public:
// Double check we don't already have the event waiting for us. // Double check we don't already have the event waiting for us.
// Otherwise we might end up blocked for a while for no reason. // Otherwise we might end up blocked for a while for no reason.
for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) { for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
if (m_unprocessed_messages[i]->id() == MessageType::static_message_id()) { if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
auto message = move(m_unprocessed_messages[i]); auto message = move(m_unprocessed_messages[i]);
m_unprocessed_messages.remove(i); m_unprocessed_messages.remove(i);
return message; return message;
@ -74,7 +74,7 @@ public:
if (!drain_messages_from_server()) if (!drain_messages_from_server())
return nullptr; return nullptr;
for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) { for (ssize_t i = 0; i < m_unprocessed_messages.size(); ++i) {
if (m_unprocessed_messages[i]->id() == MessageType::static_message_id()) { if (m_unprocessed_messages[i]->message_id() == MessageType::static_message_id()) {
auto message = move(m_unprocessed_messages[i]); auto message = move(m_unprocessed_messages[i]);
m_unprocessed_messages.remove(i); m_unprocessed_messages.remove(i);
return message; return message;