Changeset 4866 for source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp

Timestamp:

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

Author:

Christoph Mayer

Message:

periodic bootstrap vervollständigt

File:

• source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp (modified) (2 diffs)

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();
+        }
 }