Changeset 12060 for source/ariba/utility/types

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.

Location:

source/ariba/utility/types

Files:

• Identifier.h (modified) (2 diffs)
• OverlayParameterSet.h (modified) (1 diff)
• ServiceID.cpp (modified) (1 diff)

source/ariba/utility/types/Identifier.h

@@ -50 +50 @@
 #include "ariba/utility/serialization.h"
 
+// XXX EXPERIMENTAL
+#include "ariba/utility/transport/messages/shared_buffer.hpp"
+
 /**< maximum length of the key */
 #define MAX_KEYLENGTH 192
@@ -69 +72 @@
         use_logging_h( Identifier );
 public:
+        
+        // XXX EXPERIMENTAL
+        reboost::shared_buffer_t serialize() const
+        {
+            Data data = data_serialize(this, DEFAULT_V);
+            reboost::shared_buffer_t buf(data.getBuffer(), data.getLength() / 8);
+            
+            return buf;
+        }
+        
+        reboost::shared_buffer_t deserialize(reboost::shared_buffer_t buff)
+        {
+            Data dat(const_cast<uint8_t*>(buff.data()), buff.size() * 8);
+            
+            size_t len = this->SERIALIZATION_METHOD_NAME(DESERIALIZE, dat) / 8;
+
+            // return remaining sub-buffer
+            return buff(len);
+        }
+        
 
         //-------------------------------------------------------------------------

source/ariba/utility/types/OverlayParameterSet.h

@@ -53 +53 @@
 
         typedef enum _OverlayStructure {
-                OverlayStructureOneHop   = 0,
+                OverlayStructureOneHop   = 0,   // DEPRECATED, DO NOT USE
                 OverlayStructureChord    = 1,
         } OverlayStructure;

source/ariba/utility/types/ServiceID.cpp

@@ -76 +76 @@
 }
 
-string ServiceID::toString() const {
+string ServiceID::toString() const
+{
+    if ( *this == ServiceID::UNSPECIFIED )
+        return "UNSPEC";
+    
         return ariba::utility::Helper::ultos( id );
 }