Changeset 5484

Timestamp:

Jul 30, 2009, 2:02:11 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• overlay/BaseOverlay.cpp (modified) (4 diffs)
• utility/messages/Message.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -1538 +1538 @@
                                 logging_force( "Link connection request is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
+                                continue;
                         }
                 }
@@ -1544 +1545 @@
 
                 // drop links that are dropped and not used as relay
-                if (ld->dropWhenRelaysLeft && !ld->usedAsRelay && !ld->autolink)
+                if (ld->dropWhenRelaysLeft && !ld->usedAsRelay && !ld->autolink) {
                         oldlinks.push_back( ld );
-                else
+                        continue;
+                }
 
                 // auto-link time exceeded?
-                if ( ld->autolink && difftime( now, ld->lastuse ) > 30 )
+                if ( ld->autolink && difftime( now, ld->lastuse ) > 30 ) {
                         oldlinks.push_back( ld );
+                        continue;
+                }
 
                 // keep alives missed? yes->
@@ -1562 +1566 @@
                                 logging_force( "Link is stale, closing: " << ld );
                                 oldlinks.push_back( ld );
+                                continue;
                         }
                 }
+        }
+
+        // drop links
+        BOOST_FOREACH( const LinkDescriptor* ld, oldlinks ) {
+
+                vector<LinkID>::iterator it = std::find(
+                                bootstrapLinks.begin(), bootstrapLinks.end(), ld->communicationId);
+
+                if (!ld->communicationId.isUnspecified() && it != bootstrapLinks.end() ){
+                        logging_force( "Not dropping initiator link: " << ld );
+                        continue;
+                }
+                logging_force( "Link timed out. Dropping " << ld );
+                dropLink( ld->overlayId );
         }
 
@@ -1570 +1589 @@
         if (counter>=4) showLinkState();
         if (counter>=4 || counter<0) counter = 0;
-
-        // drop links
-        BOOST_FOREACH( const LinkDescriptor* ld, oldlinks ) {
-
-                vector<LinkID>::iterator it = std::find(
-                                bootstrapLinks.begin(), bootstrapLinks.end(), ld->communicationId);
-
-                if (!ld->communicationId.isUnspecified() && it != bootstrapLinks.end() ){
-                        logging_force( "Not dropping initiator link: " << ld );
-                        continue;
-                }
-                logging_force( "Link timed out. Dropping " << ld );
-                dropLink( ld->overlayId );
-        }
 }
 

source/ariba/utility/messages/Message.h

@@ -209 +209 @@
                         T* payloadMsg = new T();
                         data_deserialize( payloadMsg, payload );
-                        //dropPayload();
                         return payloadMsg;
                 }