Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/disk_cache/simple/simple_synchronous_entry.cc

Issue 1499423004: Remove kint32max. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kint9
Patch Set: rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/disk_cache/simple/simple_synchronous_entry.h ('k') | net/http/mock_http_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/disk_cache/simple/simple_synchronous_entry.cc
diff --git a/net/disk_cache/simple/simple_synchronous_entry.cc b/net/disk_cache/simple/simple_synchronous_entry.cc
index 584efa61da321ca4bbf69ee99386a16cd5afb6c2..bf3a3abdb2f3523b6d4fd0490ea4c09bed37f96f 100644
--- a/net/disk_cache/simple/simple_synchronous_entry.cc
+++ b/net/disk_cache/simple/simple_synchronous_entry.cc
@@ -125,8 +125,8 @@ using simple_util::GetFileIndexFromStreamIndex;
SimpleEntryStat::SimpleEntryStat(base::Time last_used,
base::Time last_modified,
- const int32 data_size[],
- const int32 sparse_data_size)
+ const int32_t data_size[],
+ const int32_t sparse_data_size)
: last_used_(last_used),
last_modified_(last_modified),
sparse_data_size_(sparse_data_size) {
@@ -156,9 +156,9 @@ int SimpleEntryStat::GetLastEOFOffsetInFile(const std::string& key,
return GetOffsetInFile(key, eof_data_offset, stream_index);
}
-int64 SimpleEntryStat::GetFileSize(const std::string& key,
- int file_index) const {
- const int32 total_data_size =
+int64_t SimpleEntryStat::GetFileSize(const std::string& key,
+ int file_index) const {
+ const int32_t total_data_size =
file_index == 0 ? data_size_[0] + data_size_[1] + sizeof(SimpleFileEOF)
: data_size_[2];
return GetFileSizeFromKeyAndDataSize(key, total_data_size);
@@ -182,10 +182,8 @@ SimpleSynchronousEntry::CRCRecord::CRCRecord() : index(-1),
SimpleSynchronousEntry::CRCRecord::CRCRecord(int index_p,
bool has_crc32_p,
- uint32 data_crc32_p)
- : index(index_p),
- has_crc32(has_crc32_p),
- data_crc32(data_crc32_p) {}
+ uint32_t data_crc32_p)
+ : index(index_p), has_crc32(has_crc32_p), data_crc32(data_crc32_p) {}
SimpleSynchronousEntry::EntryOperationData::EntryOperationData(int index_p,
int offset_p,
@@ -206,18 +204,17 @@ SimpleSynchronousEntry::EntryOperationData::EntryOperationData(int index_p,
doomed(doomed_p) {}
SimpleSynchronousEntry::EntryOperationData::EntryOperationData(
- int64 sparse_offset_p,
+ int64_t sparse_offset_p,
int buf_len_p)
- : sparse_offset(sparse_offset_p),
- buf_len(buf_len_p) {}
+ : sparse_offset(sparse_offset_p), buf_len(buf_len_p) {}
// static
void SimpleSynchronousEntry::OpenEntry(
net::CacheType cache_type,
const FilePath& path,
- const uint64 entry_hash,
+ const uint64_t entry_hash,
bool had_index,
- SimpleEntryCreationResults *out_results) {
+ SimpleEntryCreationResults* out_results) {
base::ElapsedTimer open_time;
SimpleSynchronousEntry* sync_entry =
new SimpleSynchronousEntry(cache_type, path, "", entry_hash);
@@ -242,9 +239,9 @@ void SimpleSynchronousEntry::CreateEntry(
net::CacheType cache_type,
const FilePath& path,
const std::string& key,
- const uint64 entry_hash,
+ const uint64_t entry_hash,
bool had_index,
- SimpleEntryCreationResults *out_results) {
+ SimpleEntryCreationResults* out_results) {
DCHECK_EQ(entry_hash, GetEntryHashKey(key));
SimpleSynchronousEntry* sync_entry =
new SimpleSynchronousEntry(cache_type, path, key, entry_hash);
@@ -261,19 +258,19 @@ void SimpleSynchronousEntry::CreateEntry(
}
// static
-int SimpleSynchronousEntry::DoomEntry(
- const FilePath& path,
- uint64 entry_hash) {
+int SimpleSynchronousEntry::DoomEntry(const FilePath& path,
+ uint64_t entry_hash) {
const bool deleted_well = DeleteFilesForEntryHash(path, entry_hash);
return deleted_well ? net::OK : net::ERR_FAILED;
}
// static
int SimpleSynchronousEntry::DoomEntrySet(
- const std::vector<uint64>* key_hashes,
+ const std::vector<uint64_t>* key_hashes,
const FilePath& path) {
const size_t did_delete_count = std::count_if(
- key_hashes->begin(), key_hashes->end(), [&path](const uint64& key_hash) {
+ key_hashes->begin(), key_hashes->end(),
+ [&path](const uint64_t& key_hash) {
return SimpleSynchronousEntry::DeleteFilesForEntryHash(path, key_hash);
});
return (did_delete_count == key_hashes->size()) ? net::OK : net::ERR_FAILED;
@@ -281,12 +278,12 @@ int SimpleSynchronousEntry::DoomEntrySet(
void SimpleSynchronousEntry::ReadData(const EntryOperationData& in_entry_op,
net::IOBuffer* out_buf,
- uint32* out_crc32,
+ uint32_t* out_crc32,
SimpleEntryStat* entry_stat,
int* out_result) const {
DCHECK(initialized_);
DCHECK_NE(0, in_entry_op.index);
- const int64 file_offset =
+ const int64_t file_offset =
entry_stat->GetOffsetInFile(key_, in_entry_op.offset, in_entry_op.index);
int file_index = GetFileIndexFromStreamIndex(in_entry_op.index);
// Zero-length reads and reads to the empty streams of omitted files should
@@ -322,7 +319,7 @@ void SimpleSynchronousEntry::WriteData(const EntryOperationData& in_entry_op,
int buf_len = in_entry_op.buf_len;
bool truncate = in_entry_op.truncate;
bool doomed = in_entry_op.doomed;
- const int64 file_offset = out_entry_stat->GetOffsetInFile(
+ const int64_t file_offset = out_entry_stat->GetOffsetInFile(
key_, in_entry_op.offset, in_entry_op.index);
bool extending_by_write = offset + buf_len > out_entry_stat->data_size(index);
@@ -355,7 +352,7 @@ void SimpleSynchronousEntry::WriteData(const EntryOperationData& in_entry_op,
if (extending_by_write) {
// The EOF record and the eventual stream afterward need to be zeroed out.
- const int64 file_eof_offset =
+ const int64_t file_eof_offset =
out_entry_stat->GetEOFOffsetInFile(key_, index);
if (!files_[file_index].SetLength(file_eof_offset)) {
RecordWriteResult(cache_type_, WRITE_RESULT_PRETRUNCATE_FAILURE);
@@ -400,7 +397,7 @@ void SimpleSynchronousEntry::ReadSparseData(
base::Time* out_last_used,
int* out_result) {
DCHECK(initialized_);
- int64 offset = in_entry_op.sparse_offset;
+ int64_t offset = in_entry_op.sparse_offset;
int buf_len = in_entry_op.buf_len;
char* buf = out_buf->data();
@@ -416,9 +413,10 @@ void SimpleSynchronousEntry::ReadSparseData(
DCHECK_EQ(it->first, found_range->offset);
if (found_range->offset + found_range->length > offset) {
DCHECK_GE(found_range->length, 0);
- DCHECK_LE(found_range->length, kint32max);
+ DCHECK_LE(found_range->length, std::numeric_limits<int32_t>::max());
DCHECK_GE(offset - found_range->offset, 0);
- DCHECK_LE(offset - found_range->offset, kint32max);
+ DCHECK_LE(offset - found_range->offset,
+ std::numeric_limits<int32_t>::max());
int net_offset = static_cast<int>(offset - found_range->offset);
int range_len_after_offset =
static_cast<int>(found_range->length - net_offset);
@@ -457,11 +455,11 @@ void SimpleSynchronousEntry::ReadSparseData(
void SimpleSynchronousEntry::WriteSparseData(
const EntryOperationData& in_entry_op,
net::IOBuffer* in_buf,
- uint64 max_sparse_data_size,
+ uint64_t max_sparse_data_size,
SimpleEntryStat* out_entry_stat,
int* out_result) {
DCHECK(initialized_);
- int64 offset = in_entry_op.sparse_offset;
+ int64_t offset = in_entry_op.sparse_offset;
int buf_len = in_entry_op.buf_len;
const char* buf = in_buf->data();
@@ -473,7 +471,7 @@ void SimpleSynchronousEntry::WriteSparseData(
return;
}
- uint64 sparse_data_size = out_entry_stat->sparse_data_size();
+ uint64_t sparse_data_size = out_entry_stat->sparse_data_size();
// This is a pessimistic estimate; it assumes the entire buffer is going to
// be appended as a new range, not written over existing ranges.
if (sparse_data_size + buf_len > max_sparse_data_size) {
@@ -490,9 +488,10 @@ void SimpleSynchronousEntry::WriteSparseData(
SparseRange* found_range = &it->second;
if (found_range->offset + found_range->length > offset) {
DCHECK_GE(found_range->length, 0);
- DCHECK_LE(found_range->length, kint32max);
+ DCHECK_LE(found_range->length, std::numeric_limits<int32_t>::max());
DCHECK_GE(offset - found_range->offset, 0);
- DCHECK_LE(offset - found_range->offset, kint32max);
+ DCHECK_LE(offset - found_range->offset,
+ std::numeric_limits<int32_t>::max());
int net_offset = static_cast<int>(offset - found_range->offset);
int range_len_after_offset =
static_cast<int>(found_range->length - net_offset);
@@ -554,23 +553,23 @@ void SimpleSynchronousEntry::WriteSparseData(
base::Time modification_time = Time::Now();
out_entry_stat->set_last_used(modification_time);
out_entry_stat->set_last_modified(modification_time);
- int32 old_sparse_data_size = out_entry_stat->sparse_data_size();
+ int32_t old_sparse_data_size = out_entry_stat->sparse_data_size();
out_entry_stat->set_sparse_data_size(old_sparse_data_size + appended_so_far);
*out_result = written_so_far;
}
void SimpleSynchronousEntry::GetAvailableRange(
const EntryOperationData& in_entry_op,
- int64* out_start,
+ int64_t* out_start,
int* out_result) {
DCHECK(initialized_);
- int64 offset = in_entry_op.sparse_offset;
+ int64_t offset = in_entry_op.sparse_offset;
int len = in_entry_op.buf_len;
SparseRangeIterator it = sparse_ranges_.lower_bound(offset);
- int64 start = offset;
- int64 avail_so_far = 0;
+ int64_t start = offset;
+ int64_t avail_so_far = 0;
if (it != sparse_ranges_.end() && it->second.offset < offset + len)
start = it->second.offset;
@@ -592,17 +591,17 @@ void SimpleSynchronousEntry::GetAvailableRange(
++it;
}
- int64 len_from_start = len - (start - offset);
+ int64_t len_from_start = len - (start - offset);
*out_start = start;
*out_result = static_cast<int>(std::min(avail_so_far, len_from_start));
}
void SimpleSynchronousEntry::CheckEOFRecord(int index,
const SimpleEntryStat& entry_stat,
- uint32 expected_crc32,
+ uint32_t expected_crc32,
int* out_result) const {
DCHECK(initialized_);
- uint32 crc32;
+ uint32_t crc32;
bool has_crc32;
int stream_size;
*out_result =
@@ -676,11 +675,11 @@ void SimpleSynchronousEntry::Close(
continue;
files_[i].Close();
- const int64 file_size = entry_stat.GetFileSize(key_, i);
+ const int64_t file_size = entry_stat.GetFileSize(key_, i);
SIMPLE_CACHE_UMA(CUSTOM_COUNTS,
"LastClusterSize", cache_type_,
file_size % 4096, 0, 4097, 50);
- const int64 cluster_loss = file_size % 4096 ? 4096 - file_size % 4096 : 0;
+ const int64_t cluster_loss = file_size % 4096 ? 4096 - file_size % 4096 : 0;
SIMPLE_CACHE_UMA(PERCENTAGE,
"LastClusterLossPercent", cache_type_,
static_cast<base::HistogramBase::Sample>(
@@ -703,7 +702,7 @@ void SimpleSynchronousEntry::Close(
SimpleSynchronousEntry::SimpleSynchronousEntry(net::CacheType cache_type,
const FilePath& path,
const std::string& key,
- const uint64 entry_hash)
+ const uint64_t entry_hash)
: cache_type_(cache_type),
path_(path),
entry_hash_(entry_hash),
@@ -904,7 +903,7 @@ int SimpleSynchronousEntry::InitializeForOpen(
bool had_index,
SimpleEntryStat* out_entry_stat,
scoped_refptr<net::GrowableIOBuffer>* stream_0_data,
- uint32* out_stream_0_crc32) {
+ uint32_t* out_stream_0_crc32) {
DCHECK(!initialized_);
if (!OpenFiles(had_index, out_entry_stat)) {
DLOG(WARNING) << "Could not open platform files for entry.";
@@ -973,7 +972,7 @@ int SimpleSynchronousEntry::InitializeForOpen(
}
}
- int32 sparse_data_size = 0;
+ int32_t sparse_data_size = 0;
if (!OpenSparseFileIfExists(&sparse_data_size)) {
RecordSyncOpenResult(
cache_type_, OPEN_ENTRY_SPARSE_OPEN_FAILED, had_index);
@@ -1055,14 +1054,14 @@ int SimpleSynchronousEntry::ReadAndValidateStream0(
int total_data_size,
SimpleEntryStat* out_entry_stat,
scoped_refptr<net::GrowableIOBuffer>* stream_0_data,
- uint32* out_stream_0_crc32) const {
+ uint32_t* out_stream_0_crc32) const {
// Temporarily assign all the data size to stream 1 in order to read the
// EOF record for stream 0, which contains the size of stream 0.
out_entry_stat->set_data_size(0, 0);
out_entry_stat->set_data_size(1, total_data_size - sizeof(SimpleFileEOF));
bool has_crc32;
- uint32 read_crc32;
+ uint32_t read_crc32;
int stream_0_size;
int ret_value_crc32 = GetEOFRecordData(
0, *out_entry_stat, &has_crc32, &read_crc32, &stream_0_size);
@@ -1088,7 +1087,7 @@ int SimpleSynchronousEntry::ReadAndValidateStream0(
return net::ERR_FAILED;
// Check the CRC32.
- uint32 expected_crc32 =
+ uint32_t expected_crc32 =
stream_0_size == 0
? crc32(0, Z_NULL, 0)
: crc32(crc32(0, Z_NULL, 0),
@@ -1107,7 +1106,7 @@ int SimpleSynchronousEntry::ReadAndValidateStream0(
int SimpleSynchronousEntry::GetEOFRecordData(int index,
const SimpleEntryStat& entry_stat,
bool* out_has_crc32,
- uint32* out_crc32,
+ uint32_t* out_crc32,
int* out_data_size) const {
SimpleFileEOF eof_record;
int file_offset = entry_stat.GetEOFOffsetInFile(key_, index);
@@ -1139,10 +1138,9 @@ void SimpleSynchronousEntry::Doom() const {
}
// static
-bool SimpleSynchronousEntry::DeleteFileForEntryHash(
- const FilePath& path,
- const uint64 entry_hash,
- const int file_index) {
+bool SimpleSynchronousEntry::DeleteFileForEntryHash(const FilePath& path,
+ const uint64_t entry_hash,
+ const int file_index) {
FilePath to_delete = path.AppendASCII(
GetFilenameFromEntryHashAndFileIndex(entry_hash, file_index));
return simple_util::SimpleCacheDeleteFile(to_delete);
@@ -1151,7 +1149,7 @@ bool SimpleSynchronousEntry::DeleteFileForEntryHash(
// static
bool SimpleSynchronousEntry::DeleteFilesForEntryHash(
const FilePath& path,
- const uint64 entry_hash) {
+ const uint64_t entry_hash) {
bool result = true;
for (int i = 0; i < kSimpleEntryFileCount; ++i) {
if (!DeleteFileForEntryHash(path, entry_hash, i) && !CanOmitEmptyFile(i))
@@ -1185,7 +1183,7 @@ FilePath SimpleSynchronousEntry::GetFilenameFromFileIndex(int file_index) {
}
bool SimpleSynchronousEntry::OpenSparseFileIfExists(
- int32* out_sparse_data_size) {
+ int32_t* out_sparse_data_size) {
DCHECK(!sparse_file_open());
FilePath filename = path_.AppendASCII(
@@ -1221,7 +1219,7 @@ void SimpleSynchronousEntry::CloseSparseFile() {
bool SimpleSynchronousEntry::TruncateSparseFile() {
DCHECK(sparse_file_open());
- int64 header_and_key_length = sizeof(SimpleFileHeader) + key_.size();
+ int64_t header_and_key_length = sizeof(SimpleFileHeader) + key_.size();
if (!sparse_file_.SetLength(header_and_key_length)) {
DLOG(WARNING) << "Could not truncate sparse file";
return false;
@@ -1262,10 +1260,10 @@ bool SimpleSynchronousEntry::InitializeSparseFile() {
return true;
}
-bool SimpleSynchronousEntry::ScanSparseFile(int32* out_sparse_data_size) {
+bool SimpleSynchronousEntry::ScanSparseFile(int32_t* out_sparse_data_size) {
DCHECK(sparse_file_open());
- int64 sparse_data_size = 0;
+ int64_t sparse_data_size = 0;
SimpleFileHeader header;
int header_read_result =
@@ -1287,7 +1285,7 @@ bool SimpleSynchronousEntry::ScanSparseFile(int32* out_sparse_data_size) {
sparse_ranges_.clear();
- int64 range_header_offset = sizeof(header) + key_.size();
+ int64_t range_header_offset = sizeof(header) + key_.size();
while (1) {
SimpleFileSparseRangeHeader range_header;
int range_header_read_result =
@@ -1320,7 +1318,7 @@ bool SimpleSynchronousEntry::ScanSparseFile(int32* out_sparse_data_size) {
sparse_data_size += range.length;
}
- *out_sparse_data_size = static_cast<int32>(sparse_data_size);
+ *out_sparse_data_size = static_cast<int32_t>(sparse_data_size);
sparse_tail_offset_ = range_header_offset;
return true;
@@ -1341,9 +1339,8 @@ bool SimpleSynchronousEntry::ReadSparseRange(const SparseRange* range,
// If we read the whole range and we have a crc32, check it.
if (offset == 0 && len == range->length && range->data_crc32 != 0) {
- uint32 actual_crc32 = crc32(crc32(0L, Z_NULL, 0),
- reinterpret_cast<const Bytef*>(buf),
- len);
+ uint32_t actual_crc32 =
+ crc32(crc32(0L, Z_NULL, 0), reinterpret_cast<const Bytef*>(buf), len);
if (actual_crc32 != range->data_crc32) {
DLOG(WARNING) << "Sparse range crc32 mismatch.";
return false;
@@ -1362,7 +1359,7 @@ bool SimpleSynchronousEntry::WriteSparseRange(SparseRange* range,
DCHECK_LE(offset, range->length);
DCHECK_LE(offset + len, range->length);
- uint32 new_crc32 = 0;
+ uint32_t new_crc32 = 0;
if (offset == 0 && len == range->length) {
new_crc32 = crc32(crc32(0L, Z_NULL, 0),
reinterpret_cast<const Bytef*>(buf),
@@ -1396,16 +1393,15 @@ bool SimpleSynchronousEntry::WriteSparseRange(SparseRange* range,
return true;
}
-bool SimpleSynchronousEntry::AppendSparseRange(int64 offset,
+bool SimpleSynchronousEntry::AppendSparseRange(int64_t offset,
int len,
const char* buf) {
DCHECK_GE(offset, 0);
DCHECK_GT(len, 0);
DCHECK(buf);
- uint32 data_crc32 = crc32(crc32(0L, Z_NULL, 0),
- reinterpret_cast<const Bytef*>(buf),
- len);
+ uint32_t data_crc32 =
+ crc32(crc32(0L, Z_NULL, 0), reinterpret_cast<const Bytef*>(buf), len);
SimpleFileSparseRangeHeader header;
header.sparse_range_magic_number = kSimpleSparseRangeMagicNumber;
@@ -1427,7 +1423,7 @@ bool SimpleSynchronousEntry::AppendSparseRange(int64 offset,
DLOG(WARNING) << "Could not append sparse range data.";
return false;
}
- int64 data_file_offset = sparse_tail_offset_;
+ int64_t data_file_offset = sparse_tail_offset_;
sparse_tail_offset_ += bytes_written;
SparseRange range;
« no previous file with comments | « net/disk_cache/simple/simple_synchronous_entry.h ('k') | net/http/mock_http_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698