Changeset 5838 for source/ariba/overlay/OverlayBootstrap.cpp

Timestamp:

Aug 11, 2009, 8:39:47 AM (16 years ago)

Author:

Christoph Mayer

Message:

watchdog bootstrapping und kleine relay fixes

File:

• source/ariba/overlay/OverlayBootstrap.cpp (modified) (4 diffs)

source/ariba/overlay/OverlayBootstrap.cpp

@@ -50 +50 @@
                 spovnetid( SpoVNetID::UNSPECIFIED ),
                 nodeid( NodeID::UNSPECIFIED ),
-                overlay( NULL ){
+                overlay( NULL ),
+                watchtimer(this) {
+
+        srand(time(NULL));
 }
 
@@ -66 +69 @@
         manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+
+        watchtimer.startWatchdog();
 }
 
@@ -78 +83 @@
         manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
         manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+
+        watchtimer.stopWatchdog();
 }
 
@@ -144 +151 @@
 }
 
+void OverlayBootstrap::recordJoin(const EndpointDescriptor& _ep){
+        boost::mutex::scoped_lock lock(lastJoinesMutex);
+
+        EventData data;
+        data.spovnetid = spovnetid;
+        data.nodeid = nodeid;
+        data.endpoint = _ep;
+
+        lastJoines.push_front(JoinData(data));
+}
+
+void OverlayBootstrap::checkOverlayStatus(){
+
+        // if we have no overlay neighbors, try to bootstrap using
+        // bootstrap information that we already used
+
+        {       //limit history to 10 endpoints
+                boost::mutex::scoped_lock lock(lastJoinesMutex);
+                while(lastJoines.size() > 10)
+                        lastJoines.pop_back();
+        }
+
+        // we have overlay neighbors -> ok
+        if(overlay->getOverlayNeighbors().size() > 0) return;
+
+        // no overlay neighbors -> try out already
+        // successfully used bootstrap nodes
+        JoinData data;
+        {
+                boost::mutex::scoped_lock lock(lastJoinesMutex);
+                JoinStack::iterator i = lastJoines.begin();
+                if(i == lastJoines.end()) return;
+
+                // use last used element and then put it into back
+                JoinData data = *i;
+                lastJoines.pop_front();
+                lastJoines.push_back(data);
+        }
+
+        logging_info("no overlay connections detected, " <<
+                                        "trying to join using old bootstrap information");
+
+        // try to join using this node, if the join is successfull
+        // the endpoint will again be inserted using recordJoin
+        overlay->joinSpoVNet( spovnetid, data.data.endpoint );
+}
+
+OverlayBootstrap::WatchdogTimer::WatchdogTimer(OverlayBootstrap* _obj) : obj(_obj) {
+}
+
+void OverlayBootstrap::WatchdogTimer::startWatchdog(){
+        Timer::setInterval(2000);
+        Timer::start();
+}
+
+void OverlayBootstrap::WatchdogTimer::stopWatchdog(){
+        Timer::stop();
+}
+
+void OverlayBootstrap::WatchdogTimer::eventFunction(){
+        if(obj == NULL) return;
+        obj->checkOverlayStatus();
+}
+
 }} // namespace ariba, overlay