Changeset 5628

Timestamp:

Aug 3, 2009, 4:43:36 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (2 diffs)
• overlay/modules/chord/Chord.cpp (modified) (2 diffs)
• overlay/modules/chord/detail/chord_routing_table.hpp (modified) (1 diff)
• overlay/modules/chord/messages/Discovery.h (modified) (4 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -58 +58 @@
 /// adds an endpoint to the list
 void BaseCommunication::add_endpoint( const address_v* endpoint ) {
+        if (endpoint==NULL) return;
         BOOST_FOREACH( endpoint_reference& ref, remote_endpoints ) {
                 if (*ref.endpoint == *endpoint) {
@@ -72 +73 @@
 /// removes an endpoint from the list
 void BaseCommunication::remove_endpoint( const address_v* endpoint ) {
+        if (endpoint==NULL) return;
         for (vector<endpoint_reference>::iterator i = remote_endpoints.begin();
                 i != remote_endpoints.end(); i++) {

source/ariba/overlay/modules/chord/Chord.cpp

@@ -376 +376 @@
                 }
                 }
+                delete dmsg;
                 break;
         }
@@ -393 +394 @@
 
 void Chord::eventFunction() {
+        pending.clear();
         stabilize_counter++;
-        if (stabilize_counter == 3) {
-                pending.clear();
+        if (stabilize_counter == 2) {
                 size_t numNeighbors = 0;
                 for (size_t i = 0; i < table->size(); i++) {

source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp

@@ -253 +253 @@
                 for (size_t i=0; i<table.size(); i++) {
                         item* curr = &table[i];
+
                         // not not include orphans into routing!
                         if (curr->ref_count==0) continue;

source/ariba/overlay/modules/chord/messages/Discovery.h

@@ -74 +74 @@
         explicit Discovery();
         virtual ~Discovery();
-/*
-        typedef pair<NodeID,EndpointDescriptor*> NodeEndpoint;
-        typedef vector<NodeEndpoint> NodeEndpointList;
-
-        void add(const NodeID& node, EndpointDescriptor* endp);
-
-        const NodeEndpointList& getList();
-*/
 
         EndpointDescriptor* getSourceEndpoint() const {
@@ -111 +103 @@
         uint8_t ttl;
         EndpointDescriptor* source_endpoint;
-//      NodeEndpointList descriptors;
 };
 
@@ -117 +108 @@
 
 sznBeginDefault( ariba::overlay::Discovery, X ) {
-
         /// serialize follow-type and time-to-live
         X && follow_type && ttl;
@@ -123 +113 @@
         // serialize end-point
         X && VO(source_endpoint);
-/*
-        // serialize length of descriptor list
-        uint16_t len = descriptors.size();
-        X && len;
-        if (X.isDeserializer()) descriptors.resize(len);
-
-        // serialize descriptors
-        for (int i=0; i<len; i++)
-                X && &descriptors[i].first && VO(descriptors[i].second);
-
-        // serialize payload
-        X && Payload();
-*/
 } sznEnd();