Index: /sample/pingpong/main.cpp =================================================================== --- /sample/pingpong/main.cpp (revision 4853) +++ /sample/pingpong/main.cpp (revision 4866) @@ -7,5 +7,35 @@ using ariba::application::pingpong::PingPong; + + + + + +#include "ariba/utility/bootstrap/BootstrapManager.h" +using ariba::utility::BootstrapManager; + +void debug(){ + StartupWrapper::startSystem(); + BootstrapManager& manager = BootstrapManager::instance(); + manager.registerModule(BootstrapManager::BootstrapTypePeriodicBroadcast); + manager.publish("testname", "testinfo1", "testinfo2", "testinfo3"); + + getchar(); + + manager.revoke("testname"); + manager.unregisterModule(BootstrapManager::BootstrapTypePeriodicBroadcast); + StartupWrapper::stopSystem(); +} + + + + + int main( int argc, char** argv ) { + + debug(); + return 0; + + // get config file Index: /source/ariba/overlay/OverlayBootstrap.cpp =================================================================== --- /source/ariba/overlay/OverlayBootstrap.cpp (revision 4853) +++ /source/ariba/overlay/OverlayBootstrap.cpp (revision 4866) @@ -44,4 +44,5 @@ use_logging_cpp(OverlayBootstrap); +SystemEventType OverlayBootstrapMethodType("OverlayBootstrapMethodType"); OverlayBootstrap::OverlayBootstrap() @@ -61,5 +62,5 @@ manager.registerCallback( this ); - manager.registerAllModules(); + manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast ); } void OverlayBootstrap::stop(){ @@ -69,5 +70,21 @@ manager.unregisterCallback( this ); - manager.unregisterAllModules(); + manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast ); +} + +void OverlayBootstrap::handleSystemEvent(const SystemEvent& event){ + + + EventData* data = event.getData(); + + // 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,7 +112,16 @@ 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 ); } Index: /source/ariba/overlay/OverlayBootstrap.h =================================================================== --- /source/ariba/overlay/OverlayBootstrap.h (revision 4853) +++ /source/ariba/overlay/OverlayBootstrap.h (revision 4866) @@ -47,4 +47,8 @@ #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,4 +59,8 @@ 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,5 +69,5 @@ class BaseOverlay; -class OverlayBootstrap : public BootstrapInformationCallback { +class OverlayBootstrap : public BootstrapInformationCallback, public SystemEventListener { use_logging_h(OverlayBootstrap); public: @@ -74,7 +82,14 @@ 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; Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (revision 4853) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (revision 4866) @@ -59,4 +59,5 @@ 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,4 +131,59 @@ 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 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(); + } } Index: /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h =================================================================== --- /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 4853) +++ /source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (revision 4866) @@ -44,4 +44,5 @@ #include #include +#include #include #include @@ -56,4 +57,5 @@ using std::map; using std::string; +using std::cout; using boost::asio::ip::udp; @@ -83,5 +85,6 @@ 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,4 +95,9 @@ string info2; string info3; + time_t lastseen; + + _Service() + : name(""), info1(""), info2(""), info3(""), lastseen(0){ + } } Service; @@ -133,6 +141,8 @@ 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,4 +182,6 @@ data_deserialize( msg, data ); + cout << "-----------> received " << data << std::endl; + { // insert new found service boost::mutex::scoped_lock( *servicesmutex ); @@ -182,4 +194,5 @@ s.info2 = msg.getInfo2(); s.info3 = msg.getInfo3(); + s.lastseen = time(NULL); services->insert( std::make_pair(msg.getName(), s) ); }