Changeset 22:5936c5426df0 in finroc_plugins_network_transport
- Timestamp:
- 14.05.2017 13:26:43 (4 years ago)
- Branch:
- 17.03
- Phase:
- public
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
generic_protocol/tUriConnector.cpp
r19 r22 87 87 local_runtime_info(*plugin.LocalRuntimeInfo()) 88 88 { 89 this->flags |= core::tConnectionFlag::NAMED_PARAMETERS; 89 90 assert(plugin.LocalRuntimeInfo()); 90 91 this->owner_port = &owner_port; -
runtime_info/tConnectorInfo.h
r18 r22 87 87 struct tStaticInfo 88 88 { 89 /*! Flags set for this connector */ 90 core::tConnectionFlags flags; 91 92 /*! Conversion operations for this connector */ 93 rrlib::rtti::conversion::tConversionOperationSequence conversion_operations; 89 /*! Flags and conversion operations for this connector */ 90 core::tConnectOptions flags_and_conversion_operations; 94 91 95 92 tStaticInfo(const core::tConnector& connector) : 96 flags(connector.Flags()), 97 conversion_operations(connector.ConversionOperations()) 93 flags_and_conversion_operations({ connector.ConversionOperations(), connector.Flags() }) 98 94 {} 99 95 … … 105 101 static_info(connector) 106 102 {} 103 104 friend inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tID& info); 105 friend inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tStaticInfo& info); 107 106 108 107 /*! … … 116 115 { 117 116 stream << tID(connector); 118 auto& flags = connector.Flags(); 119 stream.WriteShort(flags.Raw() & 0xFFFF); 120 if (flags.Get(core::tConnectionFlag::CONVERSION)) 121 { 122 stream << connector.ConversionOperations(); 123 } 117 stream << tStaticInfo(connector); 124 118 } 125 119 }; … … 133 127 inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tConnectorInfo::tStaticInfo& info) 134 128 { 135 stream.WriteShort(info.flags.Raw() & 0xFFFF); 136 if (info.flags.Get(core::tConnectionFlag::CONVERSION)) 137 { 138 stream << info.conversion_operations; 139 } 129 stream << info.flags_and_conversion_operations; 140 130 return stream; 141 131 } -
runtime_info/tUriConnectorInfo.cpp
r18 r22 85 85 { 86 86 stream << tID(connector); 87 tStaticInfo::Serialize(stream, connector.Flags(), connector.ConversionOperations(), connector.Uri(), connector.GetSchemeHandler()); 87 core::tConnectOptions options = { connector.ConversionOperations(), connector.Flags() }; 88 tStaticInfo::Serialize(stream, options, connector.Uri(), connector.GetSchemeHandler()); 88 89 stream << tDynamicInfo(connector); 89 90 } 90 91 91 void tUriConnectorInfo::tStaticInfo::Serialize(rrlib::serialization::tOutputStream& stream, const core::t UriConnector::tFlags& flags, const rrlib::rtti::conversion::tConversionOperationSequence&conversion_operations, const rrlib::uri::tURI& uri, const core::tUriConnector::tSchemeHandler& scheme_handler)92 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) 92 93 { 93 stream.WriteShort(flags.Raw() & 0xFFFF); 94 if (flags.Get(core::tConnectionFlag::CONVERSION)) 95 { 96 stream << conversion_operations; 97 } 94 flags_and_conversion_operations.Serialize(stream, false); 98 95 stream << uri << scheme_handler; 99 96 } -
runtime_info/tUriConnectorInfo.h
r18 r22 74 74 core::tFrameworkElement::tHandle owner_handle = 0; 75 75 76 /*! Index of URI connector */76 /*! Index of URI connector in owner list */ 77 77 uint8_t index = 0; 78 78 … … 86 86 struct tStaticInfo 87 87 { 88 /*! Flags set for this connector */ 89 core::tUriConnector::tFlags flags; 90 91 /*! Conversion operations for this connector */ 92 rrlib::rtti::conversion::tConversionOperationSequence conversion_operations; 88 /*! Flags and conversion operations for this connector */ 89 core::tConnectOptions flags_and_conversion_operations; 93 90 94 91 /*! URI of partner port (preferably normalized) */ … … 99 96 100 97 tStaticInfo(const core::tUriConnector& connector) : 101 flags(connector.Flags()), 102 conversion_operations(connector.ConversionOperations()), 103 uri(connector.Uri()), 104 scheme_handler(&connector.GetSchemeHandler()) 98 flags_and_conversion_operations({ connector.ConversionOperations(), connector.Flags() }), 99 uri(connector.Uri()), 100 scheme_handler(&connector.GetSchemeHandler()) 105 101 {} 106 102 107 static void Serialize(rrlib::serialization::tOutputStream& stream, const core::t UriConnector::tFlags& flags, const rrlib::rtti::conversion::tConversionOperationSequence&conversion_operations,103 static void Serialize(rrlib::serialization::tOutputStream& stream, const core::tConnectOptions& flags_and_conversion_operations, 108 104 const rrlib::uri::tURI& uri, const core::tUriConnector::tSchemeHandler& scheme_handler); 109 105 … … 153 149 inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tUriConnectorInfo::tStaticInfo& info) 154 150 { 155 tUriConnectorInfo::tStaticInfo::Serialize(stream, info.flags , info.conversion_operations, info.uri, *info.scheme_handler);151 tUriConnectorInfo::tStaticInfo::Serialize(stream, info.flags_and_conversion_operations, info.uri, *info.scheme_handler); 156 152 return stream; 157 153 }
Note: See TracChangeset
for help on using the changeset viewer.