Changeset 12060 for source/ariba/utility/messages/Message.cpp

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/utility/messages/Message.cpp (modified) (2 diffs)

source/ariba/utility/messages/Message.cpp

@@ -41 +41 @@
 #include "ariba/utility/serialization/DataStream.hpp"
 
+#include "ariba/utility/logging/Logging.h"
+
 NAMESPACE_BEGIN
 
@@ -80 +82 @@
 }
 
+
+reboost::message_t Message::wrap_up_for_sending()
+{
+    assert( ! wrapped_up );
+    wrapped_up = true;
+    
+    //// Adapt to new message system ////
+    Data data = data_serialize(this, DEFAULT_V);
+    reboost::shared_buffer_t buf(data.getBuffer(), data.getLength() / 8);
+
+    newstyle_payload.push_front(buf);
+    
+    return newstyle_payload;
+}
+
+reboost::shared_buffer_t Message::serialize_into_shared_buffer()
+{
+    assert ( newstyle_payload.length() == 0 );
+    
+    //// Adapt to new message system ////
+    Data data = data_serialize(this, DEFAULT_V);
+    reboost::shared_buffer_t buf(data.getBuffer(), data.getLength() / 8);
+    
+    return buf;
+}
+
+
+reboost::shared_buffer_t Message::deserialize_from_shared_buffer(reboost::shared_buffer_t buff)
+{
+    // NOTE: legacy payload is not allowed when using shared buffers
+    this->legacy_payload_disabled = true;
+    
+    assert( buff.size() > 0 );
+    
+    // const_cast is necessary here, but without legacy payload we should be save here (more or less)
+    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);
+}
+
+
+
 NAMESPACE_END
 
 std::ostream& operator<<(std::ostream& stream, const ariba::utility::Message& msg ) {
         using_serialization;
-        stream << "msg(type=" << typeid(msg).name();
+        stream << "msg(type=" << typeid(msg).name() << ",";
         stream << "len=" << (data_length(&msg)/8) << ",";
         Data data = data_serialize(&msg);
-        stream << ",data=" << data;
+        stream << "data=" << data;
         data.release();
         stream << ")";
         return stream;
 }
-