protobuf/echo/Serialization: Replace MakeSharedOnHeap<MethodDeseriali…

…zerDummy> with deserializerFactory.MakeDummyDeserializer
philips-software · Oct 25, 2023 · f7c6f44 · f7c6f44
1 parent aa91ca8
commit f7c6f44
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/protobuf/echo/Serialization.cpp b/protobuf/echo/Serialization.cpp
@@ -25,6 +25,15 @@ namespace services
         return false;
     }
 
+    infra::SharedPtr<MethodDeserializer> MethodDeserializerFactory::MakeDummyDeserializer(Echo& echo)
+    {
+        using Deserializer = MethodDeserializerDummy;
+
+        auto memory = DeserializerMemory(sizeof(Deserializer));
+        auto deserializer = new (memory->begin()) Deserializer(echo);
+        return infra::MakeContainedSharedObject(*deserializer, memory);
+    }
+
     infra::SharedPtr<infra::ByteRange> MethodDeserializerFactory::OnHeap::DeserializerMemory(uint32_t size)
     {
         auto m = reinterpret_cast<uint8_t*>(malloc(size));

diff --git a/protobuf/echo/Serialization.hpp b/protobuf/echo/Serialization.hpp
@@ -88,6 +88,8 @@ namespace services
 
         template<class Message, class... Args>
         infra::SharedPtr<MethodDeserializer> MakeDeserializer(const infra::Function<void(Args...)>& method);
+
+        infra::SharedPtr<MethodDeserializer> MakeDummyDeserializer(Echo& echo);
     };
 
     template<class MessageList>
@@ -111,7 +113,7 @@ namespace services
     template<>
     struct MaxServiceSize<>
     {
-        static constexpr std::size_t maxSize = 0;
+        static constexpr std::size_t maxSize = sizeof(MethodDeserializerDummy);
     };
 
     template<class Front, class... Tail>

diff --git a/protobuf/echo/test_doubles/ServiceStub.cpp b/protobuf/echo/test_doubles/ServiceStub.cpp
@@ -42,7 +42,7 @@ namespace services
                     }));
             default:
                 errorPolicy.MethodNotFound(serviceId, methodId);
-                return infra::MakeSharedOnHeap<services::MethodDeserializerDummy>(Rpc());
+                return deserializerfactory.MakeDummyDeserializer(Rpc());
         }
     }
 

diff --git a/protobuf/protoc_echo_plugin/ProtoCEchoPlugin.cpp b/protobuf/protoc_echo_plugin/ProtoCEchoPlugin.cpp
@@ -1062,7 +1062,7 @@ namespace application
 
             printer.Print(R"(    default:
         errorPolicy.MethodNotFound(serviceId, methodId);
-        return infra::MakeSharedOnHeap<services::MethodDeserializerDummy>(Rpc());
+        return deserializerfactory.MakeDummyDeserializer(Rpc());
 )");
 
             printer.Print("}\n");