Changeset 5316 for source/ariba/overlay/modules/chord

Timestamp:

Jul 24, 2009, 8:53:41 PM (15 years ago)

Author:

Christoph Mayer

Message:

merge from bootstrap branch

Location:

source/ariba/overlay/modules/chord

Files:

• Chord.cpp (modified) (4 diffs)
• Chord.h (modified) (2 diffs)

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

@@ -61 +61 @@
         stabilize_counter = 0;
         stabilize_finger = 0;
-        bootstrapLink = LinkID::UNSPECIFIED;
 }
 
@@ -112 +111 @@
 void Chord::joinOverlay(const EndpointDescriptor& boot) {
         logging_info( "joining Chord overlay structure through end-point " <<
-                        (boot == EndpointDescriptor::UNSPECIFIED ?
-                                        "local" : boot.toString()) );
+                        (boot.isUnspecified() ? "local" : boot.toString()) );
 
         // initiator? no->setup first link
-        if (!(boot == EndpointDescriptor::UNSPECIFIED))
-                bootstrapLink = setup(boot);
+        if (!boot.isUnspecified())
+                bootstrapLinks.push_back( setup(boot) );
 
         // timer for stabilization management
@@ -176 +174 @@
 }
 
-OverlayInterface::NodeList Chord::getKnownNodes() const {
+OverlayInterface::NodeList Chord::getKnownNodes(bool deep) const {
         OverlayInterface::NodeList nodelist;
-        for (size_t i = 0; i < table->size(); i++)
-                if ((*table)[i]->ref_count != 0
-                                && !(*table)[i]->info.isUnspecified())
-                        nodelist.push_back((*table)[i]->id);
+
+        if( deep ){
+                // all nodes that I know, fingers, succ/pred
+                for (size_t i = 0; i < table->size(); i++){
+                        if ((*table)[i]->ref_count != 0
+                                        && !(*table)[i]->info.isUnspecified())
+                                nodelist.push_back((*table)[i]->id);
+                }
+        } else {
+                // only succ and pred
+                if( table->get_predesessor() != NULL )
+                        nodelist.push_back( *(table->get_predesessor()) );
+
+                if( table->get_successor() != NULL )
+                                        nodelist.push_back( *(table->get_successor()) );
+        }
+
         return nodelist;
 }
@@ -208 +219 @@
         }
 
-        if (!bootstrapLink.isUnspecified() && lnk == bootstrapLink) {
+        vector<LinkID>::iterator it = std::find(bootstrapLinks.begin(), bootstrapLinks.end(), lnk);
+        if( it != bootstrapLinks.end() ) {
                 send_discovery_to(nodeid);
-                bootstrapLink = LinkID::UNSPECIFIED;
+                bootstrapLinks.erase( it );
         }
 }

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

@@ -76 +76 @@
         int stabilize_counter;
         int stabilize_finger;
-        LinkID bootstrapLink;
+        vector<LinkID> bootstrapLinks;
         vector<NodeID> pending;
 
@@ -120 +120 @@
 
         /// @see OverlayInterface.h
-        virtual NodeList getKnownNodes() const;
+        virtual NodeList getKnownNodes(bool deep = true) const;
 
         /// @see CommunicationListener.h or @see OverlayInterface.h