Changeset 3699 for source

Timestamp:

May 26, 2009, 1:27:41 PM (16 years ago)

Author:

mies

Message:

fixed some minor bugs

Location:

source/ariba

Files:

• communication/BaseCommunication.cpp (modified) (1 diff)
• overlay/BaseOverlay.cpp (modified) (1 diff)
• overlay/modules/chord/Chord.cpp (modified) (7 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -213 +213 @@
         LinkDescriptor& descriptor = queryLocalLink( link );
         if( descriptor.isUnspecified() ){
-                logging_error( "don't know the link you want to drop" );
+                logging_error( "don't know the link you want to drop "+ link.toString() );
                 return;
         }

source/ariba/overlay/BaseOverlay.cpp

@@ -602 +602 @@
 
         // decapsulate overlay message
-        logging_debug( "go msg " << message->toString());
+        logging_debug( "receiveMessage: " << message->toString());
         OverlayMsg* overlayMsg = const_cast<Message*>(message)->decapsulate<OverlayMsg>();
         if( overlayMsg == NULL ) return false;

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

@@ -49 +49 @@
 
 typedef chord_routing_table::item route_item;
-use_logging_cpp( Chord )
-;
+
+use_logging_cpp( Chord );
 
 Chord::Chord(BaseOverlay& _baseoverlay, const NodeID& _nodeid,
@@ -95 +95 @@
         cmsg.encapsulate(&dmsg);
         msg.encapsulate(&cmsg);
-        logging_debug("" << (int)cmsg.getType());
         this->onMessage(&msg, NodeID::UNSPECIFIED, LinkID::UNSPECIFIED);
 }
@@ -150 +149 @@
         OverlayInterface::NodeList nodelist;
         for (size_t i = 0; i < table->size(); i++)
-                if ((*table)[i]->ref_count != 0) nodelist.push_back((*table)[i]->id);
+                if ((*table)[i]->ref_count != 0
+                                && !(*table)[i]->info.isUnspecified())
+                        nodelist.push_back((*table)[i]->id);
         return nodelist;
 }
@@ -161 +162 @@
         route_item* item = table->insert(remote);
 
+
+        // item added to routing table?
+        if (item != NULL) { // yes-> add to routing table
+                logging_info("new routing neighbor: " << remote.toString()
+                                << " with link " << lnk.toString());
+                item->info = lnk;
+        } else { // no-> add orphan entry to routing table
+                logging_info("new orphan: " << remote.toString()
+                                << " with link " << lnk.toString());
+                table->insert_orphan(remote)->info = lnk;
+        }
+
         if (!bootstrapLink.isUnspecified() && lnk == bootstrapLink) {
                 send_discovery_to(nodeid);
                 bootstrapLink = LinkID::UNSPECIFIED;
-        }
-
-        // item added to routing table?
-        if (item != NULL) { // yes-> add to routing table
-                logging_debug("new routing neighbor: " << remote.toString() );
-                item->info = lnk;
-        } else { // no-> add orphan entry to routing table
-                logging_debug("new orphan: " << remote.toString() );
-                table->insert_orphan(remote)->info = lnk;
         }
 }
@@ -312 +316 @@
                 // leave
         case M::leave: {
-                baseoverlay.dropLink(link);
+                if (link!=LinkID::UNSPECIFIED) {
+                        route_item* item = table->get(remote);
+                        if (item!=NULL) item->info = LinkID::UNSPECIFIED;
+                        table->remove(remote);
+                        baseoverlay.dropLink(link);
+                }
                 break;
         }
@@ -319 +328 @@
 
 void Chord::eventFunction() {
+        if (!LinkID::UNSPECIFIED.isUnspecified())
+                logging_error("LinkID::UNSPECIFIED not unspecified!!!!");
         stabilize_counter++;
         if (stabilize_counter == 3) {
+                size_t numNeighbors = 0;
+                for (size_t i = 0; i < table->size(); i++) {
+                        route_item* it = (*table)[i];
+                        if (it->ref_count != 0 && !it->info.isUnspecified()) numNeighbors++;
+                }
+                logging_info("Running stabilization: #links="
+                                << table->size() << " #neighbors=" << numNeighbors );
                 stabilize_counter = 0;
                 stabilize_finger = ((stabilize_finger+1) % table->get_finger_table_size() );
-                logging_debug("sending discovery message to my neighbors");
-                send_discovery_to(nodeid);
-                send_discovery_to(
-                        table->get_finger_table(stabilize_finger).get_compare().get_center()
-                );
+                logging_debug("Sending discovery message to my neighbors and fingers");
+                NodeID disc1 = nodeid;
+                NodeID disc2 =
+                        table->get_finger_table(stabilize_finger).get_compare().get_center();
+                send_discovery_to(disc1);
+                if (disc1 != disc2) send_discovery_to(disc2);
                 orphan_removal_counter++;
                 if (orphan_removal_counter == 2) {
+                        logging_info("Running orphan removal");
                         orphan_removal_counter = 0;
                         for (size_t i = 0; i < table->size(); i++) {
                                 route_item* it = (*table)[i];
                                 if (it->ref_count == 0 && !it->info.isUnspecified()) {
+                                        logging_info("Dropping orphaned link " << it->info.toString() << " to " << it->id.toString());
                                         baseoverlay.dropLink(it->info);
-                                        logging_debug("dropping orphaned link " << it->info.toString() << " to " << it->id.toString());
+                                        it->info = LinkID::UNSPECIFIED;
                                 }
                         }
@@ -341 +362 @@
         }
         logging_debug("--- chord routing information ----------------------------------");
-        logging_debug("predecessor: " << (table->get_predesessor()==NULL? "<none>" : table->get_predesessor()->toString()) );
+        logging_debug("predecessor: " << (table->get_predesessor()==NULL? "<none>" :
+                table->get_predesessor()->toString()) );
         logging_debug("node_id    : " << nodeid.toString() );
-        logging_debug("successor  : " << (table->get_successor()==NULL? "<none>" : table->get_successor()->toString()));
+        logging_debug("successor  : " << (table->get_successor()==NULL? "<none>" :
+                table->get_successor()->toString()));
         logging_debug("----------------------------------------------------------------");
 }