Changeset 3705

Timestamp:

May 26, 2009, 4:27:55 PM (16 years ago)

Author:

Christoph Mayer

Message:

-einige fixed bzgl. link management, fehlerhafte serialisierer, etc.

Location:

source/ariba

Files:

• communication/EndpointDescriptor.cpp (modified) (1 diff)
• communication/EndpointDescriptor.h (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (2 diffs)
• overlay/modules/OverlayInterface.cpp (modified) (1 diff)
• overlay/modules/onehop/OneHop.cpp (modified) (6 diffs)
• overlay/modules/onehop/OneHop.h (modified) (2 diffs)
• overlay/modules/onehop/messages/OneHopMessage.h (modified) (1 diff)
• utility/misc/Demultiplexer.hpp (modified) (3 diffs)
• utility/types/Identifier.cpp (modified) (2 diffs)

source/ariba/communication/EndpointDescriptor.cpp

@@ -112 +112 @@
 bool EndpointDescriptor::operator==(const EndpointDescriptor& rh) const {
 
-        if( locator != NULL && rh.locator != NULL )
-                return ( locator->operator==(*rh.locator) );
+        if( isUnspecified() && rh.isUnspecified() ) {
 
-        if( locator != rh.locator )
+                // both unspec bit set
+                return true;
+
+        } else if( (!isUnspecified()) && (!rh.isUnspecified()) ) {
+
+                //
+                // both are valid, check locators
+                //
+
+                if( locator == NULL && rh.locator == NULL ){
+
+                        // both locators are invalid, ok true
+                        return true;
+
+                } else if( locator == NULL ^ rh.locator == NULL ) {
+
+                        // one locator is invalid, the other not, false
+                        return false;
+
+                } else {
+
+                        // both locators are valid, compare
+                        assert( locator != NULL && rh.locator != NULL );
+                        return ( locator->operator==(*rh.locator) );
+
+                }
+
+        } else {
+
+                // one is unspec, the other not
+                assert( isUnspecified() ^ rh.isUnspecified() );
                 return false;
 
-        return (isUnspec == rh.isUnspec);
+        }
+
 }
 

source/ariba/communication/EndpointDescriptor.h

@@ -100 +100 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-        X && VO(locator);
+        uint8_t unspec = isUnspec;
+
+        X && unspec && VO(locator);
+
+        // when deserializing reset unspec flag
+        if (X.isDeserializer()) isUnspec = unspec;
 } sznEnd();
 

source/ariba/overlay/BaseOverlay.cpp

@@ -820 +820 @@
                 if( iface->onLinkRequest(sourcenode) ){
 
+                        logging_debug("link " << link.toString() <<
+                                        " has been accepted by service " << service.toString());
+
                         // call the notification functions
                         iface->onLinkUp( link, sourcenode );
@@ -825 +828 @@
 
                 } else {
+
+                        logging_debug("link " << link.toString() <<
+                                                                " has been denied by service " << service.toString() << ", dropping link");
+
                         // prevent onLinkDown calls to the service
                         i->second.interface = &CommunicationListener::DEFAULT;

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -75 +75 @@
 bool OverlayInterface::onLinkRequest(const NodeID& remote,
                 const DataMessage& msg) {
+        return true;
 }
 

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

@@ -59 +59 @@
         //
         overlayNodes.insert( make_pair(_nodeid, LinkID::UNSPECIFIED) );
+
+        Timer::setInterval(5000);
+        Timer::start();
 }
 
 OneHop::~OneHop(){
+        Timer::stop();
         deleteOverlay();
 }
@@ -155 +159 @@
 
         //
-        // close all links, this will indicate the other nodes that we left
+        // send leave messages to all nodes. the nodes
+        // will then drop the links
         //
 
@@ -162 +167 @@
 
         for( ; i != iend; i++){
-                if( i->first != nodeid && i->second != LinkID::UNSPECIFIED )
-                        baseoverlay.dropLink( i->second );
+                if( i->first != nodeid && i->second != LinkID::UNSPECIFIED ){
+
+                        OneHopMessage msg (OneHopMessage::OneHopMessageTypeLeave);
+                        baseoverlay.sendMessage( &msg, i->second );
+                }
         }
 
@@ -177 +185 @@
 
         // node went down, remove from overlay mapping
-        logging_debug( "node " << remote.toString() << " left overlay structure" );
+        logging_debug( "link " << lnk.toString() << " to node " << remote.toString() << " went down, removing node" );
 
         OverlayNodeMapping::iterator i = overlayNodes.begin();
@@ -266 +274 @@
                 eventsReceiver->onNodeJoin( remote );
 
-        } // if( request != NULL )
+        } // OneHopMessageTypeListingRequest
 
         //
@@ -312 +320 @@
                 } // for( ; i != iend; i++ )
 
-        } // if( reply != NULL )
+        } // OneHopMessageTypeListingReply
+
+        //
+        // handle node leaves
+        //
+
+        if( onemsg->isType(OneHopMessage::OneHopMessageTypeLeave) ){
+
+                logging_debug("received leave message from " <<
+                                remote.toString() << " on link " << lnk.toString());
+
+                // drop the link to the node
+                baseoverlay.dropLink( lnk );
+
+        } // OneHopMessageTypeLeave
+
+        //
+        // handle kbr route messages
+        //
 
         if( onemsg->isType( OneHopMessage::OneHopMessageTypeRoute) ){
                 logging_debug( "Route message arrived at destination node -> delegate to BaseOverlay" );
                 baseoverlay.incomingRouteMessage( onemsg );
-        }
-
+        } // OneHopMessageTypeRoute
+
+}
+
+void OneHop::eventFunction(){
+
+        logging_debug("<<<<<<<<<<<<<<<<onehop-table<<<<<<<<<<<<<<<<<<<");
+
+                OverlayNodeMapping::iterator i = overlayNodes.begin();
+                OverlayNodeMapping::iterator iend = overlayNodes.end();
+
+                for( ; i != iend; i++ ){
+
+                        const NodeID node = i->first;
+                        const LinkID link = i->second;
+                        const EndpointDescriptor& endpoint = baseoverlay.getEndpointDescriptor( link );
+
+                        logging_debug(  "node: " << node.toString() <<
+                                                        ", link_: " << link.toString() << ", endp: " << endpoint.toString());
+                }
+
+        logging_debug(">>>>>>>>>>>>>>>>>onehop-table>>>>>>>>>>>>>>>>>>>>>");
 
 }

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

@@ -43 +43 @@
 #include "ariba/overlay/modules/OverlayInterface.h"
 #include "ariba/utility/logging/Logging.h"
+#include "ariba/utility/system/Timer.h"
 
 using std::map;
+using ariba::utility::Timer;
 
 namespace ariba {
 namespace overlay {
 
-class OneHop: public OverlayInterface {
+class OneHop : public OverlayInterface, protected Timer {
         use_logging_h( OneHop );
 public:
@@ -58 +60 @@
 
 protected:
+
+        /// @see Timer.h
+        virtual void eventFunction();
+
         /// @see OverlayInterface.h
         virtual void createOverlay();

source/ariba/overlay/modules/onehop/messages/OneHopMessage.h

@@ -57 +57 @@
                 OneHopMessageTypeListingRequest = 1,
                 OneHopMessageTypeListingReply   = 2,
-                OneHopMessageTypeRoute          = 3,
+                OneHopMessageTypeLeave          = 3,
+                OneHopMessageTypeRoute          = 4,
         } OneHopMessageType;
 

source/ariba/utility/misc/Demultiplexer.hpp

@@ -80 +80 @@
                         LISTENER_SERVICE_MAP_CITERATOR i = mapListenerService.begin();
                         LISTENER_SERVICE_MAP_CITERATOR iend = mapListenerService.end();
-                        
+
                         for( ; i != iend; i++ )
                                 cout << "xxx" << i->first.toString() << " -> " << i->second << std::endl;
@@ -88 +88 @@
                         SERVICE_LISTENER_MAP_CITERATOR i = mapServiceListener.begin();
                         SERVICE_LISTENER_MAP_CITERATOR iend = mapServiceListener.end();
-                        
+
                         for( ; i != iend; i++ )
                                 cout << "xxx" << i->first << " -> " << i->second.toString() << std::endl;
@@ -112 +112 @@
         void unregisterItem( S id ) {
                 T listener = get( id );
-                
+
                 {
                         boost::mutex::scoped_lock lock( mapMutex );

source/ariba/utility/types/Identifier.cpp

@@ -319 +319 @@
 }
 bool Identifier::operator==(const Identifier& compKey) const {
-        return compareTo(compKey) == 0;
+
+        if( this->isUnspecified() && compKey.isUnspecified() )
+                return true;
+        else
+                return compareTo(compKey) == 0;
 }
 bool Identifier::operator!=(const Identifier& compKey) const {
@@ -599 +603 @@
         //as mpn_random has no seeding function
         // we mess aroung here a little to achive some randomness
-        // using the rand function that _is_ seeded in the 
+        // using the rand function that _is_ seeded in the
         // StartupWrapper::initSystem function