Changeset 3037 for source/ariba/overlay

Timestamp:

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

Author:

Christoph Mayer

Message:

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

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (9 diffs)
• BaseOverlay.h (modified) (7 diffs)
• OverlayEvents.cpp (modified) (2 diffs)
• OverlayEvents.h (modified) (2 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;
 }
 

source/ariba/overlay/BaseOverlay.h

@@ -44 +44 @@
 #include <algorithm>
 #include <ctime>
+#include <list>
+#include <vector>
 #include <boost/foreach.hpp>
 
@@ -66 +68 @@
 #include "ariba/overlay/messages/JoinReply.h"
 
+using std::vector;
+using std::list;
 using std::cout;
 using std::map;
 using std::make_pair;
 using std::pair;
+using std::find;
 
 using ariba::communication::EndpointDescriptor;
@@ -103 +108 @@
 // in different namespace
 namespace ariba {
-namespace interface {
-        class UnderlayAbstraction;
-}}
+        class Node;
+}
 
 namespace ariba {
@@ -117 +121 @@
 
         use_logging_h( BaseOverlay );
-        friend class ariba::interface::UnderlayAbstraction;
+        friend class ariba::Node;
 
 public:
@@ -166 +170 @@
                 const ServiceID& service
         );
+
+        /**
+         * Get a list of overlay neighboring nodes.
+         */
+        vector<NodeID> getOverlayNeighbors() const;
 
         /**
@@ -324 +333 @@
                 static const LinkItem UNSPECIFIED;
 
-                LinkItem( const LinkID& _link, const NodeID& _node, 
+                LinkItem( const LinkID& _link, const NodeID& _node,
                                 const ServiceID& _service, ServiceInterface* _interface )
-                        : link( _link ), node( _node ), service( _service ), interface( _interface ), 
+                        : link( _link ), node( _node ), service( _service ), interface( _interface ),
                                 autolink( false ), lastuse( time(NULL) ) {
                 }
@@ -350 +359 @@
         typedef pair<const LinkID,LinkItem> LinkPair;
         LinkMapping linkMapping;
-        
+
         // nodes with pending joines. TODO: should be cleaned every some seconds
         // add timestamps to each, and check on occasion

source/ariba/overlay/OverlayEvents.cpp

@@ -48 +48 @@
 }
 
-void OverlayEvents::onOverlayCreate( const SpoVNetID& id ){
-}
-
-void OverlayEvents::onOverlayDestroy( const SpoVNetID& id ){
-}
-
 bool OverlayEvents::isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid ){
         // default: allow all nodes to join
@@ -71 +65 @@
 }
 
+void OverlayEvents::onLeaveSuccess( const SpoVNetID& spovnetid ){
+}
+
+void OverlayEvents::onLeaveFail( const SpoVNetID& spovnetid ){
+}
+
 void OverlayEvents::onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote ){
 }

source/ariba/overlay/OverlayEvents.h

@@ -58 +58 @@
 
 protected:
-
-        virtual void onOverlayCreate( const SpoVNetID& id );
-        virtual void onOverlayDestroy( const SpoVNetID& id );
-
         /// for initiator about remote nodes
         virtual bool isJoinAllowed( const NodeID& nodeid, const SpoVNetID& spovnetid );
@@ -70 +66 @@
         virtual void onJoinSuccess( const SpoVNetID& spovnetid );
         virtual void onJoinFail( const SpoVNetID& spovnetid );
+        virtual void onLeaveSuccess( const SpoVNetID& spovnetid );
+        virtual void onLeaveFail( const SpoVNetID& spovnetid );
 
         virtual void onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote );