Changeset 12060 for source/ariba/utility/transport/transport_peer.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)
• transport_peer.hpp (modified) (3 diffs)

source/ariba/utility/transport/transport_peer.hpp

@@ -2 +2 @@
 #define TRANSPORT_PEER_HPP_
 
+// ariba
 #include "ariba/config.h"
 #include "ariba/utility/logging/Logging.h"
-#include "transport_protocol.hpp"
-#include "ariba/utility/addressing/endpoint_set.hpp"
+#include "ariba/utility/addressing2/endpoint_set.hpp"
+
+// ariba interfaces
+#include "interfaces/transport_protocol.hpp"
+
+// boost
 #include <boost/shared_ptr.hpp>
-#include "rfcomm/bluetooth_rfcomm.hpp"
+
+// boost-adaption
+//#include "rfcomm/bluetooth_rfcomm.hpp"
 
 
@@ -14 +21 @@
 namespace transport {
 
-using namespace ariba::addressing;
-
-class tcpip;
-
-#ifdef HAVE_LIBBLUETOOTH
-class rfcomm_transport;
-#endif
-
 /**
- * TODO: Doc
+ * This class allocates implementations of various transport
+ * protocols and can send messages to an entire set of endpoints
  *
- * @author Sebastian Mies <mies@tm.uka.de>
+ * @author Sebastian Mies <mies@tm.uka.de>, Mario Hock
  */
-/// this transport peer allocates implementations of various transport
-/// protocols and can send messages to an entire set of endpoints
-class transport_peer : public transport_protocol {
+class transport_peer :
+    public transport_protocol
+{
         use_logging_h(transport_peer);
+        typedef boost::shared_ptr<transport_protocol> TransportProtocolPtr;
+        
 public:
-        transport_peer( endpoint_set& local_set );
+        transport_peer();
+        
+        /**
+         * Adds endpoints on which ariba should listen ("server"-sockets)
+         * 
+         * @return An endpoint_set holding all active endpoints ariba is listening on.   
+         */
+        addressing2::EndpointSetPtr add_listenOn_endpoints(addressing2::EndpointSetPtr endpoints);
+        
         virtual ~transport_peer();
         virtual void start();
@@ -38 +48 @@
         
         virtual void send(
-                const endpoint_set& endpoints,
+                const addressing2::const_EndpointSetPtr endpoints,
                 reboost::message_t message,
-                uint8_t priority = 0);
-        
-        /// @deprecated: Use terminate() from transport_connection instead
-        virtual void terminate( const address_v* remote );
-        
+                uint8_t priority = system_priority::OVERLAY);
+                
         virtual void register_listener( transport_listener* listener );
 
+        
 private:
-        void create_service(tcp::endpoint endp);
-#ifdef HAVE_LIBBLUETOOTH
-        void create_service(boost::asio::bluetooth::rfcomm::endpoint endp);
-#endif
-        
-        endpoint_set&  local;
-        std::vector< boost::shared_ptr<tcpip> > tcps;
-#ifdef HAVE_LIBBLUETOOTH
-        std::vector< boost::shared_ptr<rfcomm_transport> > rfcomms;
-#endif
+        addressing2::EndpointSetPtr local;
+        std::vector<TransportProtocolPtr> transport_streams;
 };