Changeset 12060 for source/ariba/utility/transport/messages/message.hpp

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/transport

Files:

• . (modified) (1 prop)
• messages/message.hpp (modified) (7 diffs)

source/ariba/utility/transport/messages/message.hpp

@@ -17 +17 @@
 
 /// message size type
-typedef signed char mlength_t;
+//typedef signed char mlength_t;  // <--- don't do this!!
+//typedef size_t mlength_t;
+typedef int mlength_t;  // signed int seems necessary
 
 /// maximum number of buffers per message (default is 8)
 const mlength_t message_max_buffers = (1L << 3);
+//const mlength_t message_max_buffers = (1L << 4);
 
 //! A Copy-on-Write Message with Shared Buffers.
@@ -70 +73 @@
         /// Copy message
         inline message_t(const message_t& msg) :
-                imsg(msg.imsg) {
-                imsg->owner = NULL;
+                imsg(msg.imsg)
+        {
+            if ( imsg )
+                imsg->owner = NULL;
         }
 
@@ -142 +147 @@
         /// Returns the number of buffers inside this message.
         inline mlength_t length() const {
+            if ( ! imsg )
+                return 0;
+            
                 return (imsg->length);
         }
@@ -167 +175 @@
         /// Iterates over a partial set of buffers.
         template<typename T>
-        inline void foreach(const T& work, size_t index_ = 0, size_t size_ = 0) const {
+        inline void msg_foreach(const T& work, size_t index_ = 0, size_t size_ = 0) const {
                 T op = work;
                 if (size_ == 0) size_ = size() - index_;
@@ -192 +200 @@
         inline void read(boctet_t* mem, size_t idx = 0, size_t size_ = 0) const {
                 struct read_buffer rb = { mem };
-                foreach(rb, idx, size_);
+                msg_foreach(rb, idx, size_);
         }
 
@@ -198 +206 @@
         inline void write(const boctet_t* mem, size_t idx = 0, size_t size_ = 0) {
                 struct write_buffer wb = { mem };
-                foreach(wb, idx, size_);
+                msg_foreach(wb, idx, size_);
         }
 
@@ -227 +235 @@
                 message_t m;
                 struct sub_message sm = { &m };
-                foreach(sm, index, size);
+                msg_foreach(sm, index, size);
                 return m;
         }