Changeset 5316 for source/ariba/overlay/modules

Timestamp:

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

Author:

Christoph Mayer

Message:

merge from bootstrap branch

Location:

source/ariba/overlay/modules

Files:

• OverlayInterface.h (modified) (1 diff)
• chord/Chord.cpp (modified) (4 diffs)
• chord/Chord.h (modified) (2 diffs)
• onehop/OneHop.cpp (modified) (12 diffs)
• onehop/OneHop.h (modified) (2 diffs)

source/ariba/overlay/modules/OverlayInterface.h

@@ -149 +149 @@
          * @return The list of all known nodes
          */
-        virtual NodeList getKnownNodes() const = 0;
+        virtual NodeList getKnownNodes(bool deep = true) const = 0;
 
         /**

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

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -52 +52 @@
                 OverlayStructureEvents* _eventsReceiver, const OverlayParameterSet& param)
         :       OverlayInterface( _baseoverlay, _nodeid, _eventsReceiver, param ),
-                state           ( OneHopStateInvalid ),
-                bootstrapLink   ( LinkID::UNSPECIFIED ),
-                pendingLinks    ( 0 ) {
+                state( OneHopStateInvalid ) {
 
         //
@@ -88 +86 @@
         logging_debug( "routing message to node " << destnode.toString() );
 
+        // msg for ourselfs
+        if(destnode == nodeid)
+                baseoverlay.incomingRouteMessage( msg, LinkID::UNSPECIFIED, nodeid );
+
+        // msg for other node
         OverlayNodeMapping::const_iterator i = overlayNodes.find( destnode );
         if (i == overlayNodes.end()) {
@@ -116 +119 @@
         // the create and join process is completed now.
         logging_info( "creating onehop overlay structure" );
-        state = OneHopStateCompleted;
 }
 
@@ -123 +125 @@
         logging_info( "deleting onehop overlay structure" );
         state = OneHopStateInvalid;
-        pendingLinks = 0;
-}
-
-OverlayInterface::NodeList OneHop::getKnownNodes() const {
+}
+
+OverlayInterface::NodeList OneHop::getKnownNodes(bool deep) const {
 
         OverlayInterface::NodeList retlist;
@@ -142 +143 @@
 
         logging_info( "joining onehop overlay structure through end-point " <<
-                        (bootstrapEp == EndpointDescriptor::UNSPECIFIED ?
-                                        "local" : bootstrapEp.toString()) );
-
-        state = OneHopStateJoinInitiated;
-        pendingLinks = 0;
-
-        if( bootstrapEp == EndpointDescriptor::UNSPECIFIED ){
+                        (bootstrapEp.isUnspecified() ? "local" : bootstrapEp.toString()) );
+
+        if( bootstrapEp.isUnspecified() ){
 
                 // we are the initiator and we are to bootstrap against
@@ -156 +153 @@
                 state = OneHopStateCompleted;
         } else {
-                bootstrapLink = baseoverlay.establishLink( bootstrapEp,
-                                        OverlayInterface::OVERLAY_SERVICE_ID );
+                bootstrapLinks.push_back(
+                                baseoverlay.establishLink( bootstrapEp,
+                                        OverlayInterface::OVERLAY_SERVICE_ID )
+                                        );
         }
 }
@@ -187 +186 @@
                 }
         }
-
-        pendingLinks = 0;
 }
 
@@ -210 +207 @@
                 }
         }
+
+        vector<LinkID>::iterator it = std::find( bootstrapLinks.begin(), bootstrapLinks.end(), lnk );
+        if( it != bootstrapLinks.end() ) bootstrapLinks.erase( it );
 }
 
 void OneHop::onLinkUp(const LinkID& lnk, const NodeID& remote){
-
-        //
-        // as soon as a link goes up, we always request the node listing.
-        // and try to get connections to as much nodes as possible in a greedy way.
-        //
-
-        if( lnk != bootstrapLink ){
-                if( pendingLinks > 0 )  pendingLinks--;
-                if( pendingLinks == 0 ) state = OneHopStateCompleted;
-        }
 
         logging_debug( "link is up, sending out node listing request" );
@@ -230 +220 @@
         onemsg.encapsulate( &requestmsg );
 
-        state = OneHopStateJoinListingRequested;
         baseoverlay.sendMessage( &onemsg, lnk );
 }
@@ -309 +298 @@
                 const NodeListingReply::NodeEndpointList& endpoints = reply->getList();
                 logging_debug( "received " << endpoints.size() << " nodes in listing" );
-                pendingLinks = 0;
 
                 NodeListingReply::NodeEndpointList::const_iterator i = endpoints.begin();
@@ -330 +318 @@
 
                         overlayNodes.insert( make_pair(node, link) );
-                        pendingLinks++;
 
                 } // for( ; i != iend; i++ )
@@ -356 +343 @@
         if( onemsg->isType( OneHopMessage::OneHopMessageTypeRoute) ){
                 logging_debug( "Route message arrived at destination node -> delegate to BaseOverlay" );
-                baseoverlay.incomingRouteMessage( onemsg );
+                baseoverlay.incomingRouteMessage( onemsg, lnk, remote);
         } // OneHopMessageTypeRoute
 

source/ariba/overlay/modules/onehop/OneHop.h

@@ -90 +90 @@
 
         /// @see OverlayInterface.h
-        virtual NodeList getKnownNodes() const;
+        virtual NodeList getKnownNodes(bool deep = true) const;
 
         /// @see CommunicationListener.h or @see OverlayInterface.h
@@ -110 +110 @@
         typedef enum _OneHopState {
                 OneHopStateInvalid = 0,
-                OneHopStateJoinInitiated = 1,
-                OneHopStateJoinListingRequested = 2,
-                OneHopStateCompleted = 3,
+                OneHopStateCompleted = 1,
         } OneHopState;
 
         OneHopState state;
-        uint16_t pendingLinks;
-        LinkID bootstrapLink;
+        vector<LinkID> bootstrapLinks;
 };