FlashCache refactorings.

net/disk_cache/flash/log_store.cc

 // Copyright (c) 2012 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.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "net/disk_cache/flash/format.h"
 #include "net/disk_cache/flash/log_store.h"
 #include "net/disk_cache/flash/segment.h"
 #include "net/disk_cache/flash/storage.h"
 
 namespace disk_cache {
 
-LogStore::LogStore(Storage* storage)
-    : storage_(storage),
-      num_segments_(storage->size() / kFlashSegmentSize),
+LogStore::LogStore(const base::FilePath& path, int32 size)
+    : storage_(path, size),
+      num_segments_(size / kFlashSegmentSize),
       open_segments_(num_segments_),
       write_index_(0),
       current_entry_id_(-1),
       current_entry_num_bytes_left_to_write_(0),
       init_(false),
       closed_(false) {
-  DCHECK(storage->size() % kFlashSegmentSize == 0);
+  DCHECK(size % kFlashSegmentSize == 0);
 }
 
 LogStore::~LogStore() {
   DCHECK(!init_ || closed_);
   STLDeleteElements(&open_segments_);
 }
 
 bool LogStore::Init() {
   DCHECK(!init_);
+  if (!storage_.Init())
+    return false;
+
   // TODO(agayev): Once we start persisting segment metadata to disk, we will
   // start from where we left off during the last shutdown.
-  scoped_ptr<Segment> segment(new Segment(write_index_, false, storage_));
+  scoped_ptr<Segment> segment(new Segment(write_index_, false, &storage_));
   if (!segment->Init())
     return false;
 
   segment->AddUser();
   open_segments_[write_index_] = segment.release();
   init_ = true;
   return true;
 }
 
 bool LogStore::Close() {
@@ skipping 15 matching lines @@
     if (!open_segments_[write_index_]->Close())
       return false;
 
     open_segments_[write_index_]->ReleaseUser();
     if (open_segments_[write_index_]->HasNoUsers()) {
       delete open_segments_[write_index_];
       open_segments_[write_index_] = NULL;
     }
 
     write_index_ = GetNextSegmentIndex();
-    scoped_ptr<Segment> segment(new Segment(write_index_, false, storage_));
+    scoped_ptr<Segment> segment(new Segment(write_index_, false, &storage_));
     if (!segment->Init())
       return false;
 
     segment->AddUser();
     open_segments_[write_index_] = segment.release();
   }
 
   *id = open_segments_[write_index_]->write_offset();
   open_segments_[write_index_]->StoreOffset(*id);
   current_entry_id_ = *id;
@@ skipping 29 matching lines @@
   int32 index = id / disk_cache::kFlashSegmentSize;
   if (open_segments_[index]) {
     if (!open_segments_[index]->HaveOffset(id))
       return false;
     open_segments_[index]->AddUser();
     open_entries_.insert(id);
     return true;
   }
 
   // Segment is not open.
-  scoped_ptr<Segment> segment(new Segment(index, true, storage_));
+  scoped_ptr<Segment> segment(new Segment(index, true, &storage_));
   if (!segment->Init() || !segment->HaveOffset(id))
     return false;
 
   segment->AddUser();
   open_segments_[index] = segment.release();
   open_entries_.insert(id);
   return true;
 }
 
 bool LogStore::ReadData(int32 id, void* buffer, int32 size,
@@ skipping 40 matching lines @@
   return next_index;
 }
 
 bool LogStore::InUse(int32 index) const {
   DCHECK(init_ && !closed_);
   DCHECK(index >= 0 && index < num_segments_);
   return open_segments_[index] != NULL;
 }
 
 }  // namespace disk_cache