Commit 756a0b0d authored by ttuttle@chromium.org's avatar ttuttle@chromium.org

Simple Cache: Turn some DCHECKs into CHECKs

We're trying to chase down http://crbug.com/317138.  Make some relevant
DCHECKs into CHECKs in hopes of an earlier crash.

BUG=317138

Review URL: https://codereview.chromium.org/70183004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235808 0039d316-1c4b-4281-b951-d872f2087c98
parent b40f54e5
...@@ -258,13 +258,15 @@ void SimpleBackendImpl::OnDeactivated(const SimpleEntryImpl* entry) { ...@@ -258,13 +258,15 @@ void SimpleBackendImpl::OnDeactivated(const SimpleEntryImpl* entry) {
} }
void SimpleBackendImpl::OnDoomStart(uint64 entry_hash) { void SimpleBackendImpl::OnDoomStart(uint64 entry_hash) {
DCHECK_EQ(0u, entries_pending_doom_.count(entry_hash)); // TODO(ttuttle): Revert to DCHECK once http://crbug.com/317138 is fixed.
CHECK_EQ(0u, entries_pending_doom_.count(entry_hash));
entries_pending_doom_.insert( entries_pending_doom_.insert(
std::make_pair(entry_hash, std::vector<Closure>())); std::make_pair(entry_hash, std::vector<Closure>()));
} }
void SimpleBackendImpl::OnDoomComplete(uint64 entry_hash) { void SimpleBackendImpl::OnDoomComplete(uint64 entry_hash) {
DCHECK_EQ(1u, entries_pending_doom_.count(entry_hash)); // TODO(ttuttle): Revert to DCHECK once http://crbug.com/317138 is fixed.
CHECK_EQ(1u, entries_pending_doom_.count(entry_hash));
base::hash_map<uint64, std::vector<Closure> >::iterator it = base::hash_map<uint64, std::vector<Closure> >::iterator it =
entries_pending_doom_.find(entry_hash); entries_pending_doom_.find(entry_hash);
std::vector<Closure> to_run_closures; std::vector<Closure> to_run_closures;
...@@ -290,8 +292,9 @@ void SimpleBackendImpl::DoomEntries(std::vector<uint64>* entry_hashes, ...@@ -290,8 +292,9 @@ void SimpleBackendImpl::DoomEntries(std::vector<uint64>* entry_hashes,
// SimpleSynchronousEntry::DoomEntrySet and delete the files en masse. // SimpleSynchronousEntry::DoomEntrySet and delete the files en masse.
for (int i = mass_doom_entry_hashes->size() - 1; i >= 0; --i) { for (int i = mass_doom_entry_hashes->size() - 1; i >= 0; --i) {
const uint64 entry_hash = (*mass_doom_entry_hashes)[i]; const uint64 entry_hash = (*mass_doom_entry_hashes)[i];
DCHECK(active_entries_.count(entry_hash) == 0 || // TODO(ttuttle): Revert to DCHECK once http://crbug.com/317138 is fixed.
entries_pending_doom_.count(entry_hash) == 0) CHECK(active_entries_.count(entry_hash) == 0 ||
entries_pending_doom_.count(entry_hash) == 0)
<< "The entry 0x" << std::hex << entry_hash << "The entry 0x" << std::hex << entry_hash
<< " is both active and pending doom."; << " is both active and pending doom.";
if (!active_entries_.count(entry_hash) && if (!active_entries_.count(entry_hash) &&
...@@ -312,7 +315,8 @@ void SimpleBackendImpl::DoomEntries(std::vector<uint64>* entry_hashes, ...@@ -312,7 +315,8 @@ void SimpleBackendImpl::DoomEntries(std::vector<uint64>* entry_hashes,
it = to_doom_individually_hashes.begin(), it = to_doom_individually_hashes.begin(),
end = to_doom_individually_hashes.end(); it != end; ++it) { end = to_doom_individually_hashes.end(); it != end; ++it) {
const int doom_result = DoomEntryFromHash(*it, barrier_callback); const int doom_result = DoomEntryFromHash(*it, barrier_callback);
DCHECK_EQ(net::ERR_IO_PENDING, doom_result); // TODO(ttuttle): Revert to DCHECK once http://crbug.com/317138 is fixed.
CHECK_EQ(net::ERR_IO_PENDING, doom_result);
index_->Remove(*it); index_->Remove(*it);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment