Simple Cache: DoomEntriesBetween()

net/disk_cache/simple/simple_index.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_DISK_CACHE_SIMPLE_SIMPLE_INDEX_H_
 #define NET_DISK_CACHE_SIMPLE_SIMPLE_INDEX_H_
 
+#include <list>
 #include <map>

[gavinp, 2013/04/17 07:41:18]

While we're here, I believe this isn't needed any more.

[pasko-google - do not use, 2013/04/17 19:47:52]

Done.

+#include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
+#include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 
 class Pickle;
 class PickleIterator;
 
 namespace base {
 class TaskRunner;
 }
 
 namespace disk_cache {
@@ skipping 66 matching lines @@
   bool UpdateEntrySize(const std::string& key, uint64 entry_size);
 
   // TODO(felipeg): This way we are storing the hash_key twice, as the
   // hash_map::key and as a member of EntryMetadata. We could save space if we
   // use a hash_set.
   typedef base::hash_map<uint64, EntryMetadata> EntrySet;
 
   static void InsertInEntrySet(const EntryMetadata& entry_metadata,
                                EntrySet* entry_set);
 
+  // Executes the |callback| when the index is ready. Allows multiple callbacks.
+  int ExecuteWhenReady(const net::CompletionCallback& callback);
+
+  // Takes out entries from the index that have last accessed time matching the
+  // range between |initial_time| and |end_time| where open intervals are
+  // possible according to the definition given in |DoomEntriesBetween()| in the
+  // disk cache backend interface. Returns the set of hashes taken out.
+  std::set<uint64>* PullEntriesBetween(const base::Time initial_time,

[gavinp, 2013/04/17 07:41:18]

Rather than referencing the definition in |DoomEntriesBetween()| maybe it's best
to just repeat it, in case of change?

Naming suggestions: ExtractEntriesBetween ? RemoveAndReturnEntriesBetween ?
Hrrm.  I am not a fan of PullEntriesBetween.

[pasko-google - do not use, 2013/04/17 19:47:52]

That? Will change? C'mon, backend interface changes only for Christmas.
I am not a fan of repetitions.
Thanks, extract sounds OK, and my ear is not sophisticated enough to make the
call. Done.

+                                       const base::Time end_time);
+
+  // Returns amount of indexed entries.

[gavinp, 2013/04/17 07:41:18]

// Returns number of indexed entries.

[pasko-google - do not use, 2013/04/17 19:47:52]

Done.

+  int32 GetEntryCount() const;
+
  private:
   typedef base::Callback<void(scoped_ptr<EntrySet>)> IndexCompletionCallback;
 
   static void LoadFromDisk(
       const base::FilePath& index_filename,
       const scoped_refptr<base::TaskRunner>& io_thread,
       const IndexCompletionCallback& completion_callback);
 
   // Enumerates all entries' files on disk and regenerates the index.
   static scoped_ptr<SimpleIndex::EntrySet> RestoreFromDisk(
@@ skipping 14 matching lines @@
   bool initialized_;
 
   base::FilePath index_filename_;
 
   scoped_refptr<base::TaskRunner> cache_thread_;
   scoped_refptr<base::TaskRunner> io_thread_;
 
   // All nonstatic SimpleEntryImpl methods should always be called on the IO
   // thread, in all cases. |io_thread_checker_| documents and enforces this.
   base::ThreadChecker io_thread_checker_;
+
+  typedef std::list<net::CompletionCallback> CallbackList;

[gavinp, 2013/04/17 07:41:18]

Take it or leave it suggestion: lose this typedef.

[pasko-google - do not use, 2013/04/17 19:47:52]

Please remind me when we transition to C++11, I'd be glad to lose this then.

+  CallbackList initialized_waitlist_;

[gavinp, 2013/04/17 07:41:18]

Naming suggestion: to_run_when_initialized_ (with or without list).

[pasko-google - do not use, 2013/04/17 19:47:52]

OK, taking this. I liked how waitlist sounded, it was short .. and confusing.

 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_SIMPLE_SIMPLE_INDEX_H_