Changeset 5916

Timestamp:

Aug 13, 2009, 1:26:27 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (7 diffs)
• BaseOverlay.h (modified) (1 diff)
• LinkDescriptor.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -201 +201 @@
 }
 
+
+std::string BaseOverlay::getLinkHTMLInfo() {
+        std::ostringstream s;
+
+        s << "<h2 color=\"#606060\">Links</h2>";
+        s << "<table cellpadding=\"0\" border=\"0\" cellspacing=\"0\">";
+        s << "<tr background=\"#e0e0e0\">";
+        s << "<td>Id</td><td>Remote</td><td>Path</td>";
+        s << "</tr>";
+
+        BOOST_FOREACH( LinkDescriptor* ld, links ) {
+                if (!ld->isVital() || ld->service != OverlayInterface::OVERLAY_SERVICE_ID) continue;
+                s << "<tr>";
+                s << "<td>" << ld->overlayId.toString().substr(0,4) << "..</td>";
+                s << "<td>" << ld->remoteNode.toString().substr(0,4) << "..</td>";
+                s << "<td>";
+                if (ld->routeRecord.size()>0) {
+                        for (size_t i=0; i<ld->routeRecord.size(); i++)
+                                s << ld->routeRecord[i].toString().substr(0,4) << ".. ";
+                }
+                s << "</td>";
+                s << "</tr>";
+        }
+        s << "</table>";
+
+        return s.str();
+}
+
 /// shows the current link state
 void BaseOverlay::showLinks() {
@@ -278 +306 @@
                         return bc->sendMessage(next_link->communicationId, message);
                 } else {
-                        logging_error("Could not send message. No relay hop found to "
+                        logging_warn("Could not send message. No relay hop found to "
                                         << destination)
                         return -1;
@@ -289 +317 @@
                 LinkID next_id = overlayInterface->getNextLinkId( destination );
                 if (next_id.isUnspecified()) {
-                        logging_error("Could not send message. No next hop found to " <<
+                        logging_warn("Could not send message. No next hop found to " <<
                                 destination );
                         return -1;
@@ -303 +331 @@
                 // no-> error, dropping message
                 else {
-                        logging_error("Could not send message. Link not known or up");
+                        logging_warn("Could not send message. Link not known or up");
                         return -1;
                 }
@@ -386 +414 @@
                 relay_route& route = *i;
                 LinkDescriptor* ld = getDescriptor(route.link);
+
+                // relay link still used and alive?
                 if (ld==NULL
-                        || !ld->up
-                        || ld->keepAliveMissed != 0
-                        || !ld->communicationUp
-                        || difftime(route.used, time(NULL)) > 4) {
+                        || !ld->isDirectVital()
+                        || difftime(route.used, time(NULL)) > 8) {
                         logging_info("Forgetting relay information to node "
                                         << route.node.toString() );
@@ -449 +477 @@
                                 // refresh timer
                                 route.used = time(NULL);
-
-                                // route has a shorter hop count? yes-> replace
-                                if (route.hops > message->getNumHops() ) {
+                                LinkDescriptor* rld = getDescriptor(route.link);
+
+                                // route has a shorter hop count or old link is dead? yes-> replace
+                                if (route.hops > message->getNumHops()
+                                        || rld == NULL
+                                        || !rld->isDirectVital()) {
                                         logging_info("Updating relay information to node "
                                                 << route.node.toString()
@@ -480 +511 @@
                 if (route.node == remote ) {
                         LinkDescriptor* ld = getDescriptor( route.link );
-                        if (ld==NULL || !ld->up || !ld->communicationUp) return NULL; else {
+                        if (ld==NULL || !ld->isDirectVital()) return NULL; else {
                                 route.used = time(NULL);
                                 return ld;

source/ariba/overlay/BaseOverlay.h

@@ -347 +347 @@
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+        std::string getLinkHTMLInfo();
 
 private:

source/ariba/overlay/LinkDescriptor.h

@@ -66 +66 @@
         bool fromRemote;   ///< flag, whether this link was requested from remote
         NodeID remoteNode; ///< remote end-point node
+        bool isVital() {
+                return up && keepAliveMissed == 0;
+        }
+        bool isDirectVital() {
+                return isVital() && communicationUp && !relayed;
+        }
+
 
         // link identifiers --------------------------------------------------------