Changeset 4866 for source

Timestamp:

Jul 13, 2009, 9:42:32 AM (15 years ago)

Author:

Christoph Mayer

Message:

periodic bootstrap vervollständigt

Location:

source/ariba

Files:

• overlay/OverlayBootstrap.cpp (modified) (4 diffs)
• overlay/OverlayBootstrap.h (modified) (4 diffs)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (modified) (2 diffs)
• utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (modified) (7 diffs)

source/ariba/overlay/OverlayBootstrap.cpp

@@ -44 +44 @@
 
 use_logging_cpp(OverlayBootstrap);
+SystemEventType OverlayBootstrapMethodType("OverlayBootstrapMethodType");
 
 OverlayBootstrap::OverlayBootstrap()
@@ -61 +62 @@
 
         manager.registerCallback( this );
-        manager.registerAllModules();
+        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
 }
 void OverlayBootstrap::stop(){
@@ -69 +70 @@
 
         manager.unregisterCallback( this );
-        manager.unregisterAllModules();
+        manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
+}
+
+void OverlayBootstrap::handleSystemEvent(const SystemEvent& event){
+
+
+        EventData* data = event.getData<EventData>();
+
+        // announcement for our spovnet
+        logging_info( "found bootstrap node for our SpoVNetID " << data->spovnetid.toString()
+                        << " on NodeID " << data->nodeid.toString() << " with endpoint " << data->endpoint.toString() );
+
+
+        // TODO: do stuff on overlay
+
+
+        delete data;
 }
 
@@ -95 +112 @@
         if( nid == this->nodeid ) return;
 
-        // announcement for our spovnet
-        logging_info( "found bootstrap node for our SpoVNetID " << sid.toString()
-                        << " on NodeID " << nid << " with endpoint " << ep.toString() );
+        //
+        // send out the bootstrap information as
+        // event to synchronize into the system queue
+        //
+
+        EventData* data = new EventData();
+        data->spovnetid = sid;
+        data->nodeid = nid;
+        data->endpoint = ep;
+
+        SystemQueue::instance().scheduleEvent(
+                        SystemEvent( this, OverlayBootstrapMethodType, data), 0 );
 }
 

source/ariba/overlay/OverlayBootstrap.h

@@ -47 +47 @@
 #include "ariba/utility/bootstrap/BootstrapInformationCallback.h"
 #include "ariba/communication/EndpointDescriptor.h"
+#include "ariba/utility/system/SystemEventListener.h"
+#include "ariba/utility/system/SystemQueue.h"
+#include "ariba/utility/system/SystemEvent.h"
+#include "ariba/utility/system/SystemEventType.h"
 
 using std::string;
@@ -55 +59 @@
 using ariba::utility::BootstrapInformationCallback;
 using ariba::communication::EndpointDescriptor;
+using ariba::utility::SystemEventType;
+using ariba::utility::SystemEvent;
+using ariba::utility::SystemQueue;
+using ariba::utility::SystemEventListener;
 
 namespace ariba {
@@ -61 +69 @@
 class BaseOverlay;
 
-class OverlayBootstrap : public BootstrapInformationCallback {
+class OverlayBootstrap : public BootstrapInformationCallback, public SystemEventListener {
         use_logging_h(OverlayBootstrap);
 public:
@@ -74 +82 @@
 
 protected:
+        virtual void handleSystemEvent(const SystemEvent& event);
         virtual void onBootstrapServiceFound(string name, string info1, string info2, string info);
 
 private:
+        typedef struct _EventData {
+                SpoVNetID spovnetid;
+                NodeID nodeid;
+                EndpointDescriptor endpoint;
+        } EventData;
+
         BootstrapManager& manager;
         SpoVNetID spovnetid;

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp

@@ -59 +59 @@
 use_logging_cpp(PeriodicBroadcast);
 const long PeriodicBroadcast::timerinterval = 1000;
+const long PeriodicBroadcast::servicetimeout = 3000;
 const unsigned int PeriodicBroadcast::serverport_v4 = 5634;
 const unsigned int PeriodicBroadcast::serverport_v6 = 5636;
@@ -130 +131 @@
 void PeriodicBroadcast::updateRemoteServices(){
 
+        // cleanup the services that timed out
+        // so they are seen of as new after timeout
+        {
+                boost::mutex::scoped_lock lock( remoteServicesMutex );
+                bool deleted;
+
+                do {
+                        deleted = false;
+
+                        ServiceList::iterator i = remoteServices.begin();
+                        ServiceList::iterator iend = remoteServices.end();
+
+                        for( ; i != iend; i++ ){
+
+                                if( time(NULL) > (i->second.lastseen + servicetimeout) ){
+                                        remoteServices.erase( i );
+                                        deleted = true;
+                                        break;
+                                }
+                        }
+
+                }while(deleted);
+        }
+
+        // check if we received new services:
+        // check remoteServices against newRemoteServices
+        {
+                boost::mutex::scoped_lock lock( newRemoteServicesMutex );
+                typedef std::pair<string,Service> mapitem;
+
+                BOOST_FOREACH( mapitem item, newRemoteServices ){
+
+                        string name = item.first;
+                        Service service = item.second;
+
+                        ServiceList::iterator i = remoteServices.find( name );
+                        if( i != remoteServices.end() ) {
+                                // update the item lastseen time
+                                i->second.lastseen = service.lastseen;
+                                continue;
+                        }
+
+                        {
+                                // insert the new item as new, lastseen has been set in the
+                                // receive function, as this timer only runs in intervals
+                                boost::mutex::scoped_lock lock2( remoteServicesMutex );
+                                remoteServices.insert( std::make_pair(name, service) );
+                        }
+
+                        callback->onBootstrapServiceFound(name, service.info1, service.info2, service.info3);
+                }
+
+                // we have checked and transfered all new items
+                newRemoteServices.clear();
+        }
 }
 

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h

@@ -44 +44 @@
 #include <map>
 #include <string>
+#include <ctime>
 #include <iostream>
 #include <boost/asio.hpp>
@@ -56 +57 @@
 using std::map;
 using std::string;
+using std::cout;
 using boost::asio::ip::udp;
 
@@ -83 +85 @@
         void updateRemoteServices();
 
-        static const long timerinterval;
+        static const long timerinterval; // used to send out updates on our services and check for new services
+        static const long servicetimeout; // timeout after that a service is dead when we did not receive updates
         static const unsigned int serverport_v4;
         static const unsigned int serverport_v6;
@@ -92 +95 @@
                 string info2;
                 string info3;
+                time_t lastseen;
+
+                _Service()
+                        : name(""), info1(""), info2(""), info3(""), lastseen(0){
+                }
         } Service;
 
@@ -133 +141 @@
                         Data data = data_serialize( msg, DEFAULT_V );
                         uint8_t* pnt = data.getBuffer();
-                        size_t len = data.getLength();
+                        size_t len = data.getLength() / 8;
                         boost::system::error_code ignored_error;
+
+                        cout << "-----------> sending out " << data << std::endl;
 
                         {
@@ -172 +182 @@
                                 data_deserialize( msg, data );
 
+                                cout << "-----------> received " << data << std::endl;
+
                                 { // insert new found service
                                         boost::mutex::scoped_lock( *servicesmutex );
@@ -182 +194 @@
                                         s.info2 = msg.getInfo2();
                                         s.info3 = msg.getInfo3();
+                                        s.lastseen = time(NULL);
                                         services->insert( std::make_pair(msg.getName(), s) );
                                 }