Changeset 12060 for source/ariba/overlay/LinkDescriptor.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/ariba/overlay/LinkDescriptor.h (modified) (12 diffs)

source/ariba/overlay/LinkDescriptor.h

@@ -12 +12 @@
 #include "ariba/communication/EndpointDescriptor.h"
 #include "ariba/CommunicationListener.h"
+
+// reboost messages
+#include "ariba/utility/transport/messages/message.hpp"
+#include <ariba/utility/misc/sha1.h>
+
+#include "ariba/overlay/SequenceNumber.h"
+
 
 namespace ariba {
@@ -37 +44 @@
 class LinkDescriptor {
 public:
+    struct message_queue_entry
+    {
+        reboost::message_t message;
+        uint8_t priority;
+    };
+    
         // ctor
         LinkDescriptor() {
+            time_t now = time(NULL);
+            
                 // default values
                 this->up = false;
+//         this->closing = false;
+        this->failed = false;
                 this->fromRemote = false;
                 this->remoteNode = NodeID::UNSPECIFIED;
@@ -46 +63 @@
                 this->communicationUp = false;
                 this->communicationId = LinkID::UNSPECIFIED;
-                this->keepAliveTime = time(NULL);
-                this->keepAliveMissed = 0;
+                this->keepAliveReceived = now;
+                this->keepAliveSent = now;
                 this->relaying     = false;
-                this->timeRelaying = time(NULL);
+                this->timeRelaying = now;
                 this->dropAfterRelaying = false;
                 this->service  = ServiceID::UNSPECIFIED;
@@ -56 +73 @@
                 this->remoteLink = LinkID::UNSPECIFIED;
                 this->autolink = false;
-                this->lastuse = time(NULL);
+                this->lastuse = now;
                 this->retryCounter = 0;
+                this->hops = -1;
+        
+        this->transmit_seqnums = false; // XXX
         }
 
@@ -67 +87 @@
         // general information about the link --------------------------------------
         bool up;           ///< flag whether this link is up and running
+//      bool closing;      ///< flag, whether this link is in the regular process of closing
+        bool failed;       ///< flag, whether communication is (assumed to be) not/no longer possible on this link
         bool fromRemote;   ///< flag, whether this link was requested from remote
         NodeID remoteNode; ///< remote end-point node
-        bool isVital() {
-                return up && keepAliveMissed == 0;
-        }
-        bool isDirectVital() {
-                return isVital() && communicationUp && !relayed;
-        }
 
 
@@ -82 +98 @@
         bool   communicationUp;   ///< flag, whether the communication is up
 
+        // sequence numbers --------------------------------------------------------
+        SequenceNumber last_sent_seqnum;
+    bool transmit_seqnums;
+    
         // direct link retries -----------------------------------------------------
         EndpointDescriptor endpoint;
@@ -87 +107 @@
 
         // link alive information --------------------------------------------------
-        time_t keepAliveTime; ///< the last time a keep-alive message was received
-        int keepAliveMissed;  ///< the number of missed keep-alive messages
+        time_t keepAliveReceived; ///< the last time a keep-alive message was received
+        time_t keepAliveSent;  ///< the number of missed keep-alive messages
         void setAlive() {
-                keepAliveMissed = 0;
-                keepAliveTime = time(NULL);
+//              keepAliveSent = time(NULL);
+                keepAliveReceived = time(NULL);
         }
 
@@ -98 +118 @@
         LinkID remoteLink; ///< the remote link id
         vector<NodeID> routeRecord;
+        int hops;
 
         // relay state -------------------------------------------------------------
@@ -114 +135 @@
         // auto links --------------------------------------------------------------
         bool autolink;  ///< flag, whether this link is a auto-link
-        time_t lastuse; ///< time, when the link was last used
-        deque<Message*> messageQueue; ///< waiting messages to be delivered
+        time_t lastuse; ///< time, when the link was last used XXX AUTO_LINK-ONLY
+        deque<message_queue_entry> messageQueue; ///< waiting messages to be delivered
         void setAutoUsed() {
                 if (autolink) lastuse = time(NULL);
@@ -121 +142 @@
         /// drops waiting auto-link messages
         void flushQueue() {
-                BOOST_FOREACH( Message* msg, messageQueue )     delete msg;
+//              BOOST_FOREACH( Message* msg, messageQueue )     delete msg;  // XXX MARIO: shouldn't be necessary anymore, since we're using shared pointers
                 messageQueue.clear();
         }
@@ -127 +148 @@
         // string representation ---------------------------------------------------
         std::string to_string() const {
+            time_t now = time(NULL);
+            
                 std::ostringstream s;
+        if ( relayed )
+            s << "[RELAYED-";
+        else
+            s << "[DIRECT-";
+        s << "LINK] ";
+        s << "id=" << overlayId.toString().substr(0,4) << " ";
+        s << "serv=" << service.toString() << " ";
                 s << "up=" << up << " ";
                 s << "init=" << !fromRemote << " ";
-                s << "id=" << overlayId.toString().substr(0,4) << " ";
-                s << "serv=" << service.toString() << " ";
                 s << "node=" << remoteNode.toString().substr(0,4) << " ";
                 s << "relaying=" << relaying << " ";
-                s << "miss=" << keepAliveMissed << " ";
+                s << "last_received=" << now - keepAliveReceived << "s ";
                 s << "auto=" << autolink << " ";
+                s << "hops=" << hops << " ";
                 if ( relayed ) {
                         s << "| Relayed: ";
@@ -146 +175 @@
                 } else {
                         s << "| Direct: ";
-                        s << "using id=" << communicationId.toString().substr(0,4) << " ";
+                        s << "using [COMMUNICATION-LINK] id=" << communicationId.toString().substr(0,4) << " ";
                         s << "(up=" << communicationUp << ") ";
                 }