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

source/ariba/utility/messages/Message.h

@@ -62 +62 @@
 #include "ariba/utility/serialization.h"
 
+// reboost messages
+#include "ariba/utility/transport/messages/message.hpp"
+
+
 std::ostream& operator<<(std::ostream& stream, const ariba::utility::Message& msg );
 
@@ -82 +86 @@
         friend std::ostream& ::operator<<(std::ostream& stream, const ariba::utility::Message& msg );
 
-        // root binary data
-        shared_array<uint8_t> root;
-
         // payload
+        bool legacy_payload_disabled;
         bool releasePayload;
         Data payload; //< messages binary data
+        
+        // XXX testing...
+        reboost::message_t newstyle_payload;
+        bool wrapped_up;
 
         // addresses and control info
@@ -98 +104 @@
          */
         inline Message() :
-                root(), releasePayload(true), payload(), srcAddr(NULL),destAddr(NULL) {
+            legacy_payload_disabled(false), releasePayload(true), payload(),
+            newstyle_payload(), wrapped_up(false), srcAddr(NULL),destAddr(NULL) {
         }
 
@@ -106 +113 @@
          */
         explicit inline Message( const Data& data ) :
-                releasePayload(true), srcAddr(NULL),destAddr(NULL) {
+        legacy_payload_disabled(false), releasePayload(true),
+        newstyle_payload(), wrapped_up(false), srcAddr(NULL),destAddr(NULL) {  // FIXME newstyle_payload..?
                 this->payload = data.clone();
 //              this->root = shared_array<uint8_t>((uint8_t*)data.getBuffer());
@@ -225 +233 @@
                 return decapsulate<T>();
         }
+        
+        
+        // XXX testing
+        void set_payload_message(reboost::message_t msg)
+        {
+            newstyle_payload = msg;
+        }
+        
+        void append_buffer(reboost::shared_buffer_t buff)
+        {
+            newstyle_payload.push_back(buff);
+        }
+        
+        
+        // XXX testing... packs this message into the payload message (do not use twice!!)
+        virtual reboost::message_t wrap_up_for_sending();
+        
+        
+        /**
+         * Uses the old serialization system to serialize itself into a (new style) shared buffer.
+         */
+        virtual reboost::shared_buffer_t serialize_into_shared_buffer();
+        
+        /*
+         * XXX experimental
+         * 
+         * Uses the old serialization system to deserialize itself out of a (new style) shared buffer.
+         * @return remaining sub-buffer (the "payload")
+         * 
+         * Note: This is some kind of a hack! handle with care.
+         */
+        virtual reboost::shared_buffer_t deserialize_from_shared_buffer(reboost::shared_buffer_t buff);
+        
 
 protected:
@@ -262 +303 @@
          * @return A explicit payload serializer
          */
-        finline PayloadSerializer Payload( size_t length = ~0 ) {
+        finline PayloadSerializer Payload( size_t length = ~0 )
+        {
+//          assert( ! legacy_payload_disabled );  // FIXME aktuell
+            
                 return PayloadSerializer( this, length );
         }