Changeset 3693 for source/ariba

Timestamp:

May 26, 2009, 9:35:48 AM (16 years ago)

Author:

mies

Message:

fixed <unspec> errors with chord

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (2 diffs)
• modules/chord/Chord.cpp (modified) (3 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -454 +454 @@
         if( state == BaseOverlayStateJoinInitiated && id == initiatorLink){
 
-                logging_info( "join has been initiated by me and the link is now up. " <<
-                                "sending out join request for spovnet " <<
-                                spovnetId.toString() );
+                logging_info(
+                        "Join has been initiated by me and the link is now up. " <<
+                        "sending out join request for SpoVNet " << spovnetId.toString()
+                );
 
                 OverlayMsg overMsg( OverlayMsg::OverlayMessageTypeJoinRequest, nodeId );
@@ -636 +637 @@
                                                 state == BaseOverlayStateInitiator){
 
-                logging_debug( "baseoverlay received message of type OverlayMessageTypeJoinRequest" );
+                logging_debug(
+                        "baseoverlay received message of type OverlayMessageTypeJoinRequest"
+                );
 
                 JoinRequest* joinReq = overlayMsg->decapsulate<JoinRequest>();

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

@@ -70 +70 @@
 }
 
-// helper: sets up a link using the base overlay
+/// helper: sets up a link using the base overlay
 LinkID Chord::setup(const EndpointDescriptor& endp) {
 
@@ -78 +78 @@
 }
 
-// helper: sends a message using the "base overlay"
+/// helper: sends a message using the "base overlay"
 seqnum_t Chord::send(Message* msg, const LinkID& link) {
+        if (link.isUnspecified()) return 0;
         return baseoverlay.sendMessage(msg, link);
 }
 
+/// sends a discovery message
 void Chord::send_discovery_to(const NodeID& destination, int ttl) {
         logging_debug("Initiating discovery of " << destination.toString() );
@@ -192 +194 @@
         M* m = msg.getMessage()->convert<ChordMessage> ();
         if (m == NULL) return;
-
-        logging_debug("onMessage: type=" << (int)m->getType() );
 
         // handle messages