Changeset 12060 for source/ariba/overlay/modules/chord/Chord.h

Timestamp:

Jun 19, 2013, 11:05:49 AM (12 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/overlay/modules/chord/Chord.h (modified) (4 diffs)

source/ariba/overlay/modules/chord/Chord.h

@@ -45 +45 @@
 #include "../OverlayInterface.h"
 #include <vector>
+#include <stdexcept>
 
 class chord_routing_table;
@@ -87 +88 @@
                 const NodeID& node = NodeID::UNSPECIFIED );
 
-        // helper: sends a message using the "base overlay"
-        seqnum_t send( OverlayMsg* msg, const LinkID& link );
+        // helper: sends a message over a link using the "base overlay"
+        void send( OverlayMsg* msg, const LinkID& link );
 
+        // helper: sends a message to a node using the "base overlay"
+        void send_node( OverlayMsg* message, const NodeID& remote );
+                
         // stabilization: sends a discovery message to the specified neighborhood
         void send_discovery_to( const NodeID& destination, int ttl = 3 );
@@ -105 +109 @@
         virtual const LinkID& getNextLinkId( const NodeID& id ) const;
         
+    /// @see OverlayInterface.h
+    /// NOTE: This implementation excepts num == 2
+    virtual std::vector<const LinkID*> getSortedLinkIdsTowardsNode(
+        const NodeID& id, int num = 0 ) const;
+
         /// @see OverlayInterface.h
         virtual const NodeID& getNextNodeId( const NodeID& id ) const;
@@ -138 +147 @@
 
         /// @see CommunicationListener.h or @see OverlayInterface.h
-        virtual void onMessage(const DataMessage& msg, const NodeID& remote,
+        virtual void onMessage(OverlayMsg* msg,
+                reboost::shared_buffer_t sub_msg,
+                const NodeID& remote,
                         const LinkID& lnk = LinkID::UNSPECIFIED);