close Warning: Can't use blame annotator:
No changeset 2259 in the repository

source: source/ariba/communication/EndpointDescriptor.h@ 12063

Last change on this file since 12063 was 12060, checked in by hock@…, 11 years ago

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 size: 5.1 KB
RevLine 
1// [License]
2// The Ariba-Underlay Copyright
3//
4// Copyright (c) 2008-2009, Institute of Telematics, UniversitÀt Karlsruhe (TH)
5//
6// Institute of Telematics
7// UniversitÀt Karlsruhe (TH)
8// Zirkel 2, 76128 Karlsruhe
9// Germany
10//
11// Redistribution and use in source and binary forms, with or without
12// modification, are permitted provided that the following conditions are
13// met:
14//
15// 1. Redistributions of source code must retain the above copyright
16// notice, this list of conditions and the following disclaimer.
17// 2. Redistributions in binary form must reproduce the above copyright
18// notice, this list of conditions and the following disclaimer in the
19// documentation and/or other materials provided with the distribution.
20//
21// THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
22// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ARIBA PROJECT OR
25// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
26// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32//
33// The views and conclusions contained in the software and documentation
34// are those of the authors and should not be interpreted as representing
35// official policies, either expressed or implied, of the Institute of
36// Telematics.
37// [License]
38
39#ifndef ENDPOINTDESCRIPTOR_H_
40#define ENDPOINTDESCRIPTOR_H_
41
42#include <string>
43#include <set>
44//#include "ariba/utility/serialization.h"
45#include "ariba/utility/types/PeerID.h"
46
47#include "ariba/utility/addressing2/endpoint_set.hpp"
48
49// reboost messages
50#include "ariba/utility/transport/messages/message.hpp"
51
52
53namespace ariba {
54namespace communication {
55
56using_serialization;
57using namespace std;
58using ariba::utility::PeerID;
59
60
61/**
62 * This class is used a transitions helper between the old addressing and
63 * serialization to the new addressing2 and the new message classes
64 *
65 * Maybe it will be replaced, or at least modified in the future.
66 */
67//class EndpointDescriptor: public VSerializeable { VSERIALIZEABLE
68// friend class BaseCommunication;
69class EndpointDescriptor
70{
71 friend class BaseCommunication;
72
73public:
74 /// creates an empty endpoint descriptor with zero endpoints
75 EndpointDescriptor();
76
77 /// destructor.
78 virtual ~EndpointDescriptor();
79
80 /// copy constructor
81 EndpointDescriptor(const EndpointDescriptor& rh);
82
83 /// construct end-points from an endpoint set
84 EndpointDescriptor(const PeerID& peer_id, addressing2::EndpointSetPtr endpoints );
85
86 // FIXME NOT WORKING !!
87 /// construct end-points from a string
88 EndpointDescriptor(const string& str);
89
90 /// convert end-points to string
91 string toString() const {
92 return endpoints->to_string();
93 }
94
95 static EndpointDescriptor& UNSPECIFIED() {
96 static EndpointDescriptor* unspec = NULL;
97 if(unspec == NULL) unspec = new EndpointDescriptor();
98
99 return *unspec;
100 }
101
102 /// returns true, if this object is the unspecified object
103 bool isUnspecified() const {
104 return (this == &UNSPECIFIED());
105 }
106
107// /// create endpoint
108// static EndpointDescriptor* fromString(string str) {
109// return new EndpointDescriptor(str);
110// }
111
112 bool operator==(const EndpointDescriptor& rh) const {
113 if (rh.isUnspecified() && isUnspecified()) return true;
114 if (rh.isUnspecified() ^ isUnspecified()) return false;
115
116 assert( (!rh.isUnspecified()) && (!isUnspecified()) );
117 return endpoints == rh.endpoints;
118 }
119
120 bool operator!=(const EndpointDescriptor& rh) const {
121 return ( !operator==(rh) );
122 }
123
124 EndpointDescriptor& operator=( const EndpointDescriptor& rhs) {
125 endpoints = rhs.endpoints;
126 return *this;
127 }
128
129 /// returns the end-points of this descriptor
130 addressing2::const_EndpointSetPtr getEndpoints() const {
131 return endpoints;
132 }
133
134 void replace_endpoint_set(addressing2::EndpointSetPtr new_endpoints)
135 {
136 endpoints = new_endpoints;
137 }
138
139 /// returns a reference to the peer id
140 PeerID& getPeerId() {
141 return peerId;
142 }
143
144
145 /// returns a reference to the constant peer id
146 const PeerID& getPeerId() const {
147 return peerId;
148 }
149
150 /// returns a message with peerId and endpoints in it
151 reboost::message_t serialize() const;
152
153 /// deserialite peerId and endpoints
154 reboost::shared_buffer_t deserialize(reboost::shared_buffer_t buff);
155
156private:
157 addressing2::EndpointSetPtr endpoints;
158 PeerID peerId;
159};
160
161}} // namespace ariba, communication
162
163//sznBeginDefault( ariba::communication::EndpointDescriptor, X ){
164//
165// // TODO
166// assert(false);
167//
168// // serialize peer id
169// X && &peerId;
170//
171// // serialize end-points
172// uint16_t len = endpoints.to_bytes_size();
173// X && len;
174// uint8_t* buffer = X.bytes( len );
175// if (buffer!=NULL) {
176// if (X.isDeserializer()) endpoints.assign(buffer,len);
177// else endpoints.to_bytes(buffer);
178// }
179//}sznEnd();
180
181#endif /*ENDPOINTDESCRIPTOR_H_*/
Note: See TracBrowser for help on using the repository browser.