Changeset 12060 for source/services/ariba_dht/messages/DhtMessage.h

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/services/ariba_dht/messages/DhtMessage.h (modified) (6 diffs)

source/services/ariba_dht/messages/DhtMessage.h

@@ -3 +3 @@
 
 #include "ariba/utility/messages.h"
+#include "ariba/utility/types/NodeID.h"
 #include "ariba/utility/serialization.h"
 #include "ariba/Name.h"
@@ -10 +11 @@
 
 using ariba::utility::Message;
+using ariba::utility::NodeID;
 using_serialization;
 
@@ -21 +23 @@
                 DhtRemove = 4,
                 DhtRepublish = 5,
-                DhtAnswer = 8
+                DhtAnswer = 8,
+                DhtReplica = 9
         } DhtMessageType;
         
         DhtMessage();
-        DhtMessage( DhtMessageType type, const std::string& key );
+        DhtMessage( DhtMessageType type, const std::string& key, const NodeID& sourceNodeID = NodeID::UNSPECIFIED);
         DhtMessage( DhtMessageType type, const std::string& key,
-                        const std::string& value, uint16_t ttl = 0 );
+                        const std::string& value, uint16_t ttl = 0, const NodeID& sourceNodeID = NodeID::UNSPECIFIED );
         
         DhtMessage( DhtMessageType type, const std::string& key,
-                        const vector<std::string>& values, uint16_t ttl = 0 );
+                        const vector<std::string>& values, uint16_t ttl = 0, const NodeID& sourceNodeID = NodeID::UNSPECIFIED );
         
         virtual ~DhtMessage();
@@ -77 +80 @@
         }
 
+        NodeID getSourceNode() const {
+                return sourceNode;
+        }
+
         bool doReplace() const {
                 return replace;
         }
 
+        static string DhtMessageTypeToString(DhtMessageType type);
 
-private:
+protected:
         uint8_t type;
         uint16_t ttl;
@@ -88 +96 @@
         std::string key;
         vector<std::string> values;
+        NodeID sourceNode;
+
+private:
 };
 
@@ -100 +111 @@
         // key serialization
         X && T(key);
+
+        X && &sourceNode;
 
         // store number of values