Changeset 12060 for source/ariba/communication/EndpointDescriptor.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/communication/EndpointDescriptor.h (modified) (8 diffs)

source/ariba/communication/EndpointDescriptor.h

@@ -42 +42 @@
 #include <string>
 #include <set>
-#include "ariba/utility/serialization.h"
+//#include "ariba/utility/serialization.h"
 #include "ariba/utility/types/PeerID.h"
-#include "ariba/utility/addressing/endpoint_set.hpp"
+
+#include "ariba/utility/addressing2/endpoint_set.hpp"
+
+// reboost messages
+#include "ariba/utility/transport/messages/message.hpp"
+
 
 namespace ariba {
@@ -51 +56 @@
 using_serialization;
 using namespace std;
-using namespace ariba::addressing;
 using ariba::utility::PeerID;
 
-class EndpointDescriptor: public VSerializeable { VSERIALIZEABLE
-        friend class BaseCommunication;
+
+/**
+ * This class is used a transitions helper between the old addressing and
+ * serialization to the new addressing2 and the new message classes
+ * 
+ * Maybe it will be replaced, or at least modified in the future.
+ */
+//class EndpointDescriptor: public VSerializeable { VSERIALIZEABLE
+//    friend class BaseCommunication;
+class EndpointDescriptor
+{
+    friend class BaseCommunication;
 
 public:
@@ -68 +82 @@
 
         /// construct end-points from an endpoint set
-        EndpointDescriptor(const endpoint_set& endpoints );
+        EndpointDescriptor(const PeerID& peer_id, addressing2::EndpointSetPtr endpoints );
 
+        // FIXME NOT WORKING !!
         /// construct end-points from a string
         EndpointDescriptor(const string& str);
@@ -75 +90 @@
         /// convert end-points to string
         string toString() const {
-                return endpoints.to_string();
+                return endpoints->to_string();
         }
 
@@ -90 +105 @@
         }
 
-        /// create endpoint
-        static EndpointDescriptor* fromString(string str) {
-                return new EndpointDescriptor(str);
-        }
+//      /// create endpoint
+//      static EndpointDescriptor* fromString(string str) {
+//              return new EndpointDescriptor(str);
+//      }
 
         bool operator==(const EndpointDescriptor& rh) const {
@@ -113 +128 @@
 
         /// returns the end-points of this descriptor
-        endpoint_set& getEndpoints() {
+        addressing2::const_EndpointSetPtr getEndpoints() const {
                 return endpoints;
         }
-
-        /// returns the end-points of this descriptor
-        const endpoint_set& getEndpoints() const {
-                return endpoints;
+        
+        void replace_endpoint_set(addressing2::EndpointSetPtr new_endpoints)
+        {
+            endpoints = new_endpoints;
         }
-
+        
         /// returns a reference to the peer id
         PeerID& getPeerId() {
@@ -132 +147 @@
                 return peerId;
         }
+        
+        /// returns a message with peerId and endpoints in it
+        reboost::message_t serialize() const;
+        
+        /// deserialite peerId and endpoints
+        reboost::shared_buffer_t deserialize(reboost::shared_buffer_t buff);
+        
 private:
-        endpoint_set endpoints;
+        addressing2::EndpointSetPtr endpoints;
         PeerID peerId;
 };
@@ -139 +161 @@
 }} // namespace ariba, communication
 
-sznBeginDefault( ariba::communication::EndpointDescriptor, X ){
-
-        // serialize peer id
-        X && &peerId;
-
-        // serialize end-points
-        uint16_t len = endpoints.to_bytes_size();
-        X && len;
-        uint8_t* buffer = X.bytes( len );
-        if (buffer!=NULL) {
-                if (X.isDeserializer()) endpoints.assign(buffer,len);
-                else endpoints.to_bytes(buffer);
-        }
-}sznEnd();
+//sznBeginDefault( ariba::communication::EndpointDescriptor, X ){
+//
+//    // TODO
+//    assert(false);
+//    
+//      // serialize peer id
+//      X && &peerId;
+//
+//      // serialize end-points
+//      uint16_t len = endpoints.to_bytes_size();
+//      X && len;
+//      uint8_t* buffer = X.bytes( len );
+//      if (buffer!=NULL) {
+//              if (X.isDeserializer()) endpoints.assign(buffer,len);
+//              else endpoints.to_bytes(buffer);
+//      }
+//}sznEnd();
 
 #endif /*ENDPOINTDESCRIPTOR_H_*/