Changeset 22:5936c5426df0 in finroc_plugins_network_transport

Timestamp:

14.05.2017 13:26:43 (3 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Unifies serialization of tConnectorInfo and tUriConnectorInfo with tConnectOptions and tUriConnectOptions (removes redundant code)

Files:

• generic_protocol/tUriConnector.cpp (modified) (1 diff)
• runtime_info/tConnectorInfo.h (modified) (4 diffs)
• runtime_info/tUriConnectorInfo.cpp (modified) (1 diff)
• runtime_info/tUriConnectorInfo.h (modified) (4 diffs)

generic_protocol/tUriConnector.cpp

@@ -87 +87 @@
 local_runtime_info(*plugin.LocalRuntimeInfo())
 {
+  this->flags |= core::tConnectionFlag::NAMED_PARAMETERS;
   assert(plugin.LocalRuntimeInfo());
   this->owner_port = &owner_port;

runtime_info/tConnectorInfo.h

@@ -87 +87 @@
   struct tStaticInfo
   {
-    /*! Flags set for this connector */
-    core::tConnectionFlags flags;
-
-    /*! Conversion operations for this connector */
-    rrlib::rtti::conversion::tConversionOperationSequence conversion_operations;
+    /*! Flags and conversion operations for this connector */
+    core::tConnectOptions flags_and_conversion_operations;
 
     tStaticInfo(const core::tConnector& connector) :
-      flags(connector.Flags()),
-      conversion_operations(connector.ConversionOperations())
+      flags_and_conversion_operations({ connector.ConversionOperations(), connector.Flags() })
     {}
 
@@ -105 +101 @@
     static_info(connector)
   {}
+
+  friend inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tID& info);
+  friend inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tStaticInfo& info);
 
   /*!
@@ -116 +115 @@
   {
     stream << tID(connector);
-    auto& flags = connector.Flags();
-    stream.WriteShort(flags.Raw() & 0xFFFF);
-    if (flags.Get(core::tConnectionFlag::CONVERSION))
-    {
-      stream << connector.ConversionOperations();
-    }
+    stream << tStaticInfo(connector);
   }
 };
@@ -133 +127 @@
 inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tConnectorInfo::tStaticInfo& info)
 {
-  stream.WriteShort(info.flags.Raw() & 0xFFFF);
-  if (info.flags.Get(core::tConnectionFlag::CONVERSION))
-  {
-    stream << info.conversion_operations;
-  }
+  stream << info.flags_and_conversion_operations;
   return stream;
 }

runtime_info/tUriConnectorInfo.cpp

@@ -85 +85 @@
 {
   stream << tID(connector);
-  tStaticInfo::Serialize(stream, connector.Flags(), connector.ConversionOperations(), connector.Uri(), connector.GetSchemeHandler());
+  core::tConnectOptions options = { connector.ConversionOperations(), connector.Flags() };
+  tStaticInfo::Serialize(stream, options, connector.Uri(), connector.GetSchemeHandler());
   stream << tDynamicInfo(connector);
 }
 
-void tUriConnectorInfo::tStaticInfo::Serialize(rrlib::serialization::tOutputStream& stream, const core::tUriConnector::tFlags& flags, const rrlib::rtti::conversion::tConversionOperationSequence& conversion_operations, const rrlib::uri::tURI& uri, const core::tUriConnector::tSchemeHandler& scheme_handler)
+void tUriConnectorInfo::tStaticInfo::Serialize(rrlib::serialization::tOutputStream& stream, const core::tConnectOptions& flags_and_conversion_operations, const rrlib::uri::tURI& uri, const core::tUriConnector::tSchemeHandler& scheme_handler)
 {
-  stream.WriteShort(flags.Raw() & 0xFFFF);
-  if (flags.Get(core::tConnectionFlag::CONVERSION))
-  {
-    stream << conversion_operations;
-  }
+  flags_and_conversion_operations.Serialize(stream, false);
   stream << uri << scheme_handler;
 }

runtime_info/tUriConnectorInfo.h

@@ -74 +74 @@
     core::tFrameworkElement::tHandle owner_handle = 0;
 
-    /*! Index of URI connector */
+    /*! Index of URI connector in owner list */
     uint8_t index = 0;
 
@@ -86 +86 @@
   struct tStaticInfo
   {
-    /*! Flags set for this connector */
-    core::tUriConnector::tFlags flags;
-
-    /*! Conversion operations for this connector */
-    rrlib::rtti::conversion::tConversionOperationSequence conversion_operations;
+    /*! Flags and conversion operations for this connector */
+    core::tConnectOptions flags_and_conversion_operations;
 
     /*! URI of partner port (preferably normalized) */
@@ -99 +96 @@
 
     tStaticInfo(const core::tUriConnector& connector) :
-      flags(connector.Flags()),
-      conversion_operations(connector.ConversionOperations()),
-      uri(connector.Uri()),
-      scheme_handler(&connector.GetSchemeHandler())
+      flags_and_conversion_operations({ connector.ConversionOperations(), connector.Flags() }),
+                                    uri(connector.Uri()),
+                                    scheme_handler(&connector.GetSchemeHandler())
     {}
 
-    static void Serialize(rrlib::serialization::tOutputStream& stream, const core::tUriConnector::tFlags& flags, const rrlib::rtti::conversion::tConversionOperationSequence& conversion_operations,
+    static void Serialize(rrlib::serialization::tOutputStream& stream, const core::tConnectOptions& flags_and_conversion_operations,
                           const rrlib::uri::tURI& uri, const core::tUriConnector::tSchemeHandler& scheme_handler);
 
@@ -153 +149 @@
 inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tUriConnectorInfo::tStaticInfo& info)
 {
-  tUriConnectorInfo::tStaticInfo::Serialize(stream, info.flags, info.conversion_operations, info.uri, *info.scheme_handler);
+  tUriConnectorInfo::tStaticInfo::Serialize(stream, info.flags_and_conversion_operations, info.uri, *info.scheme_handler);
   return stream;
 }