Changeset 12060 for source/ariba/utility/transport/messages

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.

Location:

source/ariba/utility/transport

Files:

• . (modified) (1 prop)
• messages/message.cpp (modified) (1 diff)
• messages/message.hpp (modified) (7 diffs)
• messages/shared_buffer.hpp (modified) (4 diffs)

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

@@ -24 +24 @@
         os << "message({size=" << m.size() << ",buffers=" << (int) m.length()
                         << ",hash=" << m.hash() << "},";
-        m.foreach(ts);
+        m.msg_foreach(ts);
         os << ")";
         return os;

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;
         }

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

@@ -9 +9 @@
 
 #include <cstring>
+#include <string>
 #include <boost/shared_ptr.hpp>
 
@@ -18 +19 @@
 #include "buffer.hpp"
 
+#include <stdexcept> 
+
 namespace reboost {
+
+class illegal_sub_buffer: public std::runtime_error
+{
+public:
+    /** Takes a character string describing the error.  */
+    explicit illegal_sub_buffer(const std::string& __arg)  :
+        std::runtime_error(__arg)
+    {
+    }
+    
+    virtual ~illegal_sub_buffer() throw() {}
+};
 
 /**
@@ -104 +119 @@
                 parent(new deleteable_buffer(buffer, size))
         {
+        }
+
+//    /// XXX debug... copy!
+//      /// create shared buffer from buffer
+//      inline shared_buffer_t(const char* buffer, bsize_t size) :
+//              buffer_t(), parent(new deleteable_buffer(size)) {
 //              memcpy(parent->mutable_data(), buffer, parent->size());
-//              data(parent->mutable_data());
-//              this->size(parent->size());
-        }
+//              data(parent->mutable_data()); this->size(parent->size());
+//      }
 
         /// clone data from a normal buffer
@@ -129 +149 @@
 
         /// return sub-buffer.
-        inline self operator()(bsize_t index, bsize_t size = 0) const {
+        inline self operator()(bsize_t index, bsize_t size = 0) const
+        {
+            // special cases
+            if ( index + size > size_ )
+            {
+                // empty sub-buffer
+            if ( index == size_ )
+            {
+                self n;
+                return n;
+            }
+         
+            // ERROR: index out of bounds
+            throw illegal_sub_buffer("Index or size out of bounds in shared_buffer"); 
+            }
+
+            // regular case
                 self n(*this);
                 n.data_ += index;