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

source/ariba/overlay/messages/JoinReply.h

@@ -40 +40 @@
 #define JOIN_REPLY_H__
 
-#include "ariba/utility/messages.h"
+//#include "ariba/utility/messages.h"
+#include "ariba/utility/messages/Message.h"
 #include "ariba/utility/serialization.h"
 #include "ariba/utility/types/SpoVNetID.h"
 #include "ariba/utility/types/NodeID.h"
 #include "ariba/utility/types/OverlayParameterSet.h"
-#include "ariba/communication/EndpointDescriptor.h"
+//#include "ariba/communication/EndpointDescriptor.h"
 
 using ariba::utility::OverlayParameterSet;
@@ -51 +52 @@
 using ariba::utility::SpoVNetID;
 using ariba::utility::NodeID;
-using ariba::communication::EndpointDescriptor;
+//using ariba::communication::EndpointDescriptor;
 
 namespace ariba {
@@ -64 +65 @@
         OverlayParameterSet param; //< overlay parameters
         bool joinAllowed; //< join successfull or access denied
-        EndpointDescriptor bootstrapEp; //< the endpoint for bootstrapping the overlay interface
+//      EndpointDescriptor bootstrapEp; //< the endpoint for bootstrapping the overlay interface
 
 public:
@@ -70 +71 @@
                 const SpoVNetID _spovnetid = SpoVNetID::UNSPECIFIED,
                 const OverlayParameterSet _param = OverlayParameterSet::DEFAULT,
-                bool _joinAllowed = false,
-                const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED()
+                bool _joinAllowed = false  /*,
+                const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED()*/
         );
 
@@ -79 +80 @@
         const OverlayParameterSet& getParam();
         bool getJoinAllowed();
-        const EndpointDescriptor& getBootstrapEndpoint();
+//      const EndpointDescriptor& getBootstrapEndpoint();
 };
 
@@ -86 +87 @@
 sznBeginDefault( ariba::overlay::JoinReply, X ) {
         uint8_t ja = joinAllowed;
-        X && &spovnetid && param && bootstrapEp && ja;
+        X && &spovnetid && param;
+//      X && bootstrapEp;
+        X && ja;
         if (X.isDeserializer()) joinAllowed = ja;
 } sznEnd();