Changeset 3037 for source/ariba/overlay/BaseOverlay.cpp

Timestamp:

Apr 22, 2009, 9:07:53 PM (15 years ago)

Author:

Christoph Mayer

Message:

-jede Menge fixes und Umstellungen
-angefangen ariba/interface los zu werden, erste dateien sind weg

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (9 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -107 +107 @@
 
         logging_info( "leaving spovnet " << spovnetId );
+        bool ret = ( state != this->BaseOverlayStateInvalid );
 
         logging_debug( "dropping all auto-links ..." );
-        
+
         BOOST_FOREACH( LinkPair item, linkMapping ){
-                if( item.second.autolink ) 
+                if( item.second.autolink )
                         dropLink( item.first );
         }
@@ -135 +136 @@
         // inform all registered services of the event
         BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                i->onOverlayDestroy( spovnetId );
+                if( ret ) i->onLeaveSuccess( spovnetId );
+                else      i->onLeaveFail( spovnetId );
         }
 }
@@ -159 +161 @@
 
         //
-        // create the overlay
-        //
-
-        overlayInterface->createOverlay();
-        BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                i->onOverlayCreate( spovnetId );
-        }
-
-        //
         // bootstrap against ourselfs
         //
@@ -286 +279 @@
                                 node.toString() << " for service " << service.toString() <<
                                 ". creating auto link ...");
-                
+
                 const LinkID link = establishLink( node, service );
                 LinkMapping::iterator i = linkMapping.find( link );
@@ -328 +321 @@
         ServiceInterface* iface = listenerMux.get( sid );
         listenerMux.unregisterItem( sid );
-        
+
         return NULL; //iface;
 }
@@ -385 +378 @@
                                 " on link " << id.toString() );
 
-                OverlayMsg overMsg( 
-                        OverlayMsg::OverlayMessageTypeUpdate, 
-                        i->second.service, 
-                        nodeId 
+                OverlayMsg overMsg(
+                        OverlayMsg::OverlayMessageTypeUpdate,
+                        i->second.service,
+                        nodeId
                         );
 
@@ -655 +648 @@
 
                 overlayInterface->createOverlay();
-
-                // inform all registered services of the event
-                BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                        i->onOverlayCreate( spovnetId );
-                }
-
                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
 
@@ -765 +752 @@
                         // inform all registered services of the event
                         BOOST_FOREACH( ServiceInterface* i, listenerMux.getOneList() ){
-                                i->onOverlayDestroy( spovnetId );
+                                i->onLeaveFail( spovnetId );
                         }
 
@@ -815 +802 @@
                 sendMessage( message, *i, service ); // TODO: sollte auto links aufbauen fÃŒr sowas
         }
+}
+
+vector<NodeID> BaseOverlay::getOverlayNeighbors() const {
+        // the known nodes _can_ also include our
+        // node, so we remove ourselfs
+
+        vector<NodeID> nodes = overlayInterface->getKnownNodes();
+        vector<NodeID>::iterator i = find( nodes.begin(), nodes.end(), this->nodeId );
+        if( i != nodes.end() ) nodes.erase( i );
+
+        return nodes;
 }