Changeset 7744 for source/ariba/overlay

Timestamp:

Mar 11, 2010, 9:28:24 AM (15 years ago)

Author:

Christoph Mayer

Message:

-branch merge back

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (5 diffs)
• modules/chord/Chord.cpp (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -135 +135 @@
                 for (vector<ValueEntry>::iterator i = values.begin();
                                 i != values.end(); i++ )
-                        if (i->is_ttl_elapsed()) i = values.erase(i);
+                        if (i->is_ttl_elapsed()) i = values.erase(i)-1;
         }
 };
@@ -214 +214 @@
                         // found? yes-> delete entry
                         if ( equals(entry.key, key) ) {
-                                i = entries.erase(i);
+                                i = entries.erase(i)-1;
                                 return true;
                         }
@@ -233 +233 @@
                                         // value found? yes-> delete
                                         if (equals(j->get_value(), value)) {
-                                                j = entry.values.erase(j);
+                                                j = entry.values.erase(j)-1;
                                                 return true;
                                         }
@@ -252 +252 @@
                                 // value found? yes-> delete
                                 if (j->is_ttl_elapsed())
-                                        j = entry.values.erase(j);
+                                        j = entry.values.erase(j)-1;
                         }
 
-                        if (entry.values.size()==0) i = entries.erase(i);
+                        if (entry.values.size()==0) i = entries.erase(i)-1;
                 }
         }
@@ -1911 +1911 @@
                         "in the overlay from service " + service.toString() );
 
+        if(message == NULL) return;
+        message->setReleasePayload(false);
+
         OverlayInterface::NodeList nodes = overlayInterface->getKnownNodes(true);
-        OverlayInterface::NodeList::iterator i = nodes.begin();
-        for(; i != nodes.end(); i++ ) {
-                if( *i == nodeId) continue; // don't send to ourselfs
-                sendMessage( message, *i, service );
+        for(size_t i=0; i<nodes.size(); i++){
+                NodeID& id = nodes.at(i);
+                if(id == this->nodeId) continue; // don't send to ourselfs
+                if(i+1 == nodes.size()) message->setReleasePayload(true); // release payload on last send
+                sendMessage( message, id, service );
         }
 }

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

@@ -250 +250 @@
                 logging_info("new routing neighbor: " << remote.toString()
                                 << " with link " << lnk.toString());
-                // replace with new link
-                if (item->info!=lnk && item->info.isUnspecified()==false)
-                        baseoverlay.dropLink(item->info);
-                item->info = lnk;
+
+                // replace with new link if link is "better"
+                if (item->info!=lnk && item->info.isUnspecified()==false) {
+                        if (baseoverlay.compare( item->info, lnk ) == 1) {
+                                logging_info("Replacing link due to concurrent link establishment.");
+                                baseoverlay.dropLink(item->info);
+                                item->info = lnk;
+                        }
+                } else {
+                        item->info = lnk;
+                }
 
                 // discover neighbors of new overlay neighbor