Changeset 12060 for source/ariba/communication/EndpointDescriptor.cpp

Timestamp:

Jun 19, 2013, 11:05:49 AM (11 years ago)

Author:

hock@…

Message:

Reintegrate branch: 20130111-hock-message_classes

improvements:

• new message classes (reboost, zero-copy)
• "fast path" for direct links (skip overlay layer)
• link-properties accessible from the application
• SystemQueue can call boost::bind functions
• protlib compatibility removed (32bit overhead saved in every message)
• addressing2
• AddressDiscovery discoveres only addresses on which we're actually listening
• ariba serialization usage reduced (sill used in OverlayMsg)
• Node::connect, easier and cleaner interface to start-up ariba from the application
• ariba configs via JSON, XML, etc (boost::property_tree)
• keep-alive overhead greatly reduced
• (relayed) overlay links can actually be closed now
• lost messages are detected in most cases
• notification to the application when link is transformed into direct-link
• overlay routing: send message to second best hop if it would be dropped otherwise
• SequenceNumbers (only mechanisms, so for: upward compatibility)
• various small fixes

regressions:

• bluetooth is not yet working again
• bootstrap modules deactivated
• liblog4xx is not working (use cout-logging)

This patch brings great performance and stability improvements at cost of backward compatibility.
Also bluetooth and the bootstrap modules have not been ported to the new interfaces, yet.

File:

• source/ariba/communication/EndpointDescriptor.cpp (modified) (2 diffs)

source/ariba/communication/EndpointDescriptor.cpp

@@ -42 +42 @@
 namespace communication {
 
-vsznDefault(EndpointDescriptor);
+//vsznDefault(EndpointDescriptor);
 
-EndpointDescriptor::EndpointDescriptor(){
+EndpointDescriptor::EndpointDescriptor()  :
+        endpoints(new addressing2::endpoint_set())
+{
 }
 
@@ -55 +57 @@
 }
 
-EndpointDescriptor::EndpointDescriptor(const endpoint_set& endpoints ) :
-        endpoints(endpoints){
+EndpointDescriptor::EndpointDescriptor(
+        const PeerID& peer_id,
+        addressing2::EndpointSetPtr endpoints ) :
+    peerId(peer_id),
+        endpoints(endpoints)
+{
 }
 
-EndpointDescriptor::EndpointDescriptor(const string& str) : endpoints(str){
+EndpointDescriptor::EndpointDescriptor(const string& str)  :
+        endpoints(new addressing2::endpoint_set())
+{
+    cout << "ERROR: Construction of EndpointDescriptor from String is not functional!!" << endl;
+    assert( false );
 }
 
+
+reboost::message_t EndpointDescriptor::serialize() const
+{
+    reboost::message_t msg;
+    msg.push_back(peerId.serialize());
+    msg.push_back(endpoints->serialize());
+    
+    return msg;
+}
+
+reboost::shared_buffer_t EndpointDescriptor::deserialize(reboost::shared_buffer_t buff)
+{
+    buff = peerId.deserialize(buff);
+    buff = endpoints->deserialize(buff);
+    
+    return buff;
+}
+
+
 }} // namespace ariba, communication