Changeset 9964

Timestamp:

Jul 8, 2011, 5:02:48 PM (13 years ago)

Author:

Christoph Mayer

Message:

 

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (7 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -110 +110 @@
 
                 // return true, if ttl is elapsed
-                return ( difftime( time(NULL), this->last_update ) >= ttl );
+                return ( difftime( time(NULL), this->last_update ) > ttl );
         }
 
@@ -128 +128 @@
                 vector<Data> vect;
                 BOOST_FOREACH( ValueEntry& e, values )
-                vect.push_back( e.get_value() );
+                        vect.push_back( e.get_value() );
                 return vect;
         }
@@ -154 +154 @@
 
         void put( const Data& key, const Data& value, uint16_t ttl = 0 ) {
+                cleanup();
 
                 // find entry
@@ -209 +210 @@
 
         bool remove( const Data& key ) {
+                cleanup();
+
                 // find entry
                 for (Entries::iterator i = entries.begin(); i != entries.end(); i++) {
@@ -215 +218 @@
                         // found? yes-> delete entry
                         if ( equals(entry.key, key) ) {
-                                i = entries.erase(i)-1;
+                                entries.erase(i);
                                 return true;
                         }
@@ -223 +226 @@
 
         bool remove( const Data& key, const Data& value ) {
+                cleanup();
                 // find entry
                 for (Entries::iterator i = entries.begin(); i != entries.end(); i++) {
@@ -244 +248 @@
 
         void cleanup() {
-                // find entry
                 for (Entries::iterator i = entries.begin(); i != entries.end(); i++) {
                         DHTEntry& entry = *i;
-
-                        for (Values::iterator j = entry.values.begin();
-                                        j != entry.values.end(); j++) {
-
-                                // value found? yes-> delete
-                                if (j->is_ttl_elapsed())
-                                        j = entry.values.erase(j)-1;
-                        }
-
-                        if (entry.values.size()==0) i = entries.erase(i)-1;
+                        entry.erase_expired_entries();
+                        if (entry.values.size()==0)
+                                i = entries.erase(i)-1;
                 }
         }