Changeset 6854

Timestamp:

Nov 5, 2009, 6:58:38 PM (14 years ago)

Author:

mies

Message:

added additional debug info on error in base overlay

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (3 diffs)
• BaseOverlay.h (modified) (1 diff)
• modules/OverlayInterface.cpp (modified) (1 diff)
• modules/OverlayInterface.h (modified) (1 diff)
• modules/chord/Chord.cpp (modified) (1 diff)
• modules/chord/Chord.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -567 +567 @@
         if (!ldr->up && !ignore_down) {
                 logging_error("Can not send message. Link not up:" << ldr );
+                logging_error("DEBUG_INFO: " << debugInformation() );
                 return -1;
         }
@@ -578 +579 @@
                 if (ld==NULL) {
                         logging_error("No relay path found to link " << ldr );
+                        logging_error("DEBUG_INFO: " << debugInformation() );
                         return -1;
                 }
@@ -2239 +2241 @@
 }
 
+std::string BaseOverlay::debugInformation() {
+        std::stringstream s;
+        int i=0;
+
+        // dump overlay information
+        s << "--- overlay information ----------------------" << endl;
+        s << overlayInterface->debugInformation() << endl;
+        s << "----------------------------------------------" << endl;
+
+        // dump link state
+        s << "--- link state -------------------------------" << endl;
+        BOOST_FOREACH( LinkDescriptor* ld, links ) {
+                s << "link " << i << ": " << ld << endl;
+                i++;
+        }
+        s << endl;
+
+        return s.str();
+}
 
 }} // namespace ariba, overlay

source/ariba/overlay/BaseOverlay.h

@@ -506 +506 @@
         // misc --------------------------------------------------------------------
 
+        std::string debugInformation();
+
         /**
          * nodes with pending joines. TODO: should be cleaned every

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -83 +83 @@
 }
 
+std::string OverlayInterface::debugInformation() const {
+        return "No Information Available.";
+}
+
 const OverlayParameterSet& OverlayInterface::getParameters() const {
         return parameters;

source/ariba/overlay/modules/OverlayInterface.h

@@ -173 +173 @@
         const OverlayParameterSet& getParameters() const;
 
+        virtual std::string debugInformation() const;
+
 protected:
         /// Reference to an active base overlay

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

@@ -473 +473 @@
 }
 
+/// @see OverlayInterface.h
+std::string Chord::debugInformation() const {
+        std::ostringstream s;
+        s << "protocol   : Chord" << endl;
+        s << "node_id    : " << nodeid.toString() << endl;
+        s << "predecessor: " << (table->get_predesessor()==NULL? "<none>" :
+                table->get_predesessor()->toString()) << endl;
+        s << "successor  : " << (table->get_successor()==NULL? "<none>" :
+                table->get_successor()->toString()) << endl;
+        s << "nodes: " << endl;
+        for (size_t i = 0; i < table->size(); i++) {
+                route_item* it = (*table)[i];
+                if (it->ref_count != 0 && !it->info.isUnspecified()) {
+                        s << it->id.toString().substr(0,6)
+                          << " using " << it->info.toString().substr(0,6) << endl;
+                }
+        }
+        return s.str();
+}
+
+
+
 }} // namespace ariba, overlay

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

@@ -138 +138 @@
                         const LinkID& lnk = LinkID::UNSPECIFIED);
 
+        /// @see OverlayInterface.h
+        virtual std::string debugInformation() const;
+
         /// @see Timer.h
         virtual void eventFunction();