diff options
| author | pkasting <pkasting@chromium.org> | 2014-10-01 20:01:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-02 03:01:21 +0000 |
| commit | 89a19f1430afa495acfccbc3ed7da9f51a7911d1 (patch) | |
| tree | c0034324912fd6e1057cbd57b7cacb6555f72a95 /base/metrics | |
| parent | 413cdda9719e7e8b4e9410a9b9630e684e29fc0c (diff) | |
| download | chromium_src-89a19f1430afa495acfccbc3ed7da9f51a7911d1.zip chromium_src-89a19f1430afa495acfccbc3ed7da9f51a7911d1.tar.gz chromium_src-89a19f1430afa495acfccbc3ed7da9f51a7911d1.tar.bz2 | |
Add Read/WriteSizeT() functions to the pickle layer, plus one consumer.
This eliminates the need for callers to do explicit conversions, and also
ensures callers don't try to implement pickling of a size_t using a 32-bit type,
leading to truncation on 64-bit targets. The pickle layer will ensure 64-bit
types are always used.
I'll be changing other callsites to use this in future patches.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/601563003
Cr-Commit-Position: refs/heads/master@{#297774}
Diffstat (limited to 'base/metrics')
| -rw-r--r-- | base/metrics/histogram.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc index 6bab0eb..0a4fcc0 100644 --- a/base/metrics/histogram.cc +++ b/base/metrics/histogram.cc @@ -37,13 +37,13 @@ bool ReadHistogramArguments(PickleIterator* iter, int* flags, int* declared_min, int* declared_max, - uint64* bucket_count, + size_t* bucket_count, uint32* range_checksum) { if (!iter->ReadString(histogram_name) || !iter->ReadInt(flags) || !iter->ReadInt(declared_min) || !iter->ReadInt(declared_max) || - !iter->ReadUInt64(bucket_count) || + !iter->ReadSizeT(bucket_count) || !iter->ReadUInt32(range_checksum)) { DLOG(ERROR) << "Pickle error decoding Histogram: " << *histogram_name; return false; @@ -297,7 +297,7 @@ bool Histogram::SerializeInfoImpl(Pickle* pickle) const { pickle->WriteInt(flags()) && pickle->WriteInt(declared_min()) && pickle->WriteInt(declared_max()) && - pickle->WriteUInt64(bucket_count()) && + pickle->WriteSizeT(bucket_count()) && pickle->WriteUInt32(bucket_ranges()->checksum()); } @@ -347,7 +347,7 @@ HistogramBase* Histogram::DeserializeInfoImpl(PickleIterator* iter) { int flags; int declared_min; int declared_max; - uint64 bucket_count; + size_t bucket_count; uint32 range_checksum; if (!ReadHistogramArguments(iter, &histogram_name, &flags, &declared_min, @@ -636,7 +636,7 @@ HistogramBase* LinearHistogram::DeserializeInfoImpl(PickleIterator* iter) { int flags; int declared_min; int declared_max; - uint64 bucket_count; + size_t bucket_count; uint32 range_checksum; if (!ReadHistogramArguments(iter, &histogram_name, &flags, &declared_min, @@ -691,7 +691,7 @@ HistogramBase* BooleanHistogram::DeserializeInfoImpl(PickleIterator* iter) { int flags; int declared_min; int declared_max; - uint64 bucket_count; + size_t bucket_count; uint32 range_checksum; if (!ReadHistogramArguments(iter, &histogram_name, &flags, &declared_min, @@ -786,7 +786,7 @@ HistogramBase* CustomHistogram::DeserializeInfoImpl(PickleIterator* iter) { int flags; int declared_min; int declared_max; - uint64 bucket_count; + size_t bucket_count; uint32 range_checksum; if (!ReadHistogramArguments(iter, &histogram_name, &flags, &declared_min, |