Commit 940aec84 authored by Matt Dordal's avatar Matt Dordal Committed by Sara Golemon

Rename shadowing local variables in various stats objects

Summary:
The GCC shadow variable detector is quite zealous in warning about
shadowed members. Here, we have local variables that share the name
of member functions. Rename them so that -Wshadow doesn't complain.

Test Plan:
It didn't build, and now it does.

`fbconfig -r folly && fbmake runtests`

Reviewed By: njormrod@fb.com

Subscribers: fbcode-common-diffs@, njormrod

FB internal diff: D1534033
parent 95f17b52
...@@ -23,23 +23,23 @@ ...@@ -23,23 +23,23 @@
namespace folly { namespace folly {
template <typename VT, typename TT> template <typename VT, typename TT>
BucketedTimeSeries<VT, TT>::BucketedTimeSeries(size_t numBuckets, BucketedTimeSeries<VT, TT>::BucketedTimeSeries(size_t nBuckets,
TimeType duration) TimeType maxDuration)
: firstTime_(1), : firstTime_(1),
latestTime_(0), latestTime_(0),
duration_(duration) { duration_(maxDuration) {
// For tracking all-time data we only use total_, and don't need to bother // For tracking all-time data we only use total_, and don't need to bother
// with buckets_ // with buckets_
if (!isAllTime()) { if (!isAllTime()) {
// Round numBuckets down to duration_.count(). // Round nBuckets down to duration_.count().
// //
// There is no point in having more buckets than our timestamp // There is no point in having more buckets than our timestamp
// granularity: otherwise we would have buckets that could never be used. // granularity: otherwise we would have buckets that could never be used.
if (numBuckets > duration_.count()) { if (nBuckets > duration_.count()) {
numBuckets = duration_.count(); nBuckets = duration_.count();
} }
buckets_.resize(numBuckets, Bucket()); buckets_.resize(nBuckets, Bucket());
} }
} }
...@@ -57,7 +57,7 @@ bool BucketedTimeSeries<VT, TT>::addValue(TimeType now, ...@@ -57,7 +57,7 @@ bool BucketedTimeSeries<VT, TT>::addValue(TimeType now,
template <typename VT, typename TT> template <typename VT, typename TT>
bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now, bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now,
const ValueType& sum, const ValueType& total,
int64_t nsamples) { int64_t nsamples) {
if (isAllTime()) { if (isAllTime()) {
if (UNLIKELY(empty())) { if (UNLIKELY(empty())) {
...@@ -68,7 +68,7 @@ bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now, ...@@ -68,7 +68,7 @@ bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now,
} else if (now < firstTime_) { } else if (now < firstTime_) {
firstTime_ = now; firstTime_ = now;
} }
total_.add(sum, nsamples); total_.add(total, nsamples);
return true; return true;
} }
...@@ -93,8 +93,8 @@ bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now, ...@@ -93,8 +93,8 @@ bool BucketedTimeSeries<VT, TT>::addValueAggregated(TimeType now,
bucketIdx = getBucketIdx(now); bucketIdx = getBucketIdx(now);
} }
total_.add(sum, nsamples); total_.add(total, nsamples);
buckets_[bucketIdx].add(sum, nsamples); buckets_[bucketIdx].add(total, nsamples);
return true; return true;
} }
...@@ -239,52 +239,52 @@ TT BucketedTimeSeries<VT, TT>::elapsed(TimeType start, TimeType end) const { ...@@ -239,52 +239,52 @@ TT BucketedTimeSeries<VT, TT>::elapsed(TimeType start, TimeType end) const {
template <typename VT, typename TT> template <typename VT, typename TT>
VT BucketedTimeSeries<VT, TT>::sum(TimeType start, TimeType end) const { VT BucketedTimeSeries<VT, TT>::sum(TimeType start, TimeType end) const {
ValueType sum = ValueType(); ValueType total = ValueType();
forEachBucket(start, end, [&](const Bucket& bucket, forEachBucket(start, end, [&](const Bucket& bucket,
TimeType bucketStart, TimeType bucketStart,
TimeType nextBucketStart) -> bool { TimeType nextBucketStart) -> bool {
sum += this->rangeAdjust(bucketStart, nextBucketStart, start, end, total += this->rangeAdjust(bucketStart, nextBucketStart, start, end,
bucket.sum); bucket.sum);
return true; return true;
}); });
return sum; return total;
} }
template <typename VT, typename TT> template <typename VT, typename TT>
uint64_t BucketedTimeSeries<VT, TT>::count(TimeType start, TimeType end) const { uint64_t BucketedTimeSeries<VT, TT>::count(TimeType start, TimeType end) const {
uint64_t count = 0; uint64_t sample_count = 0;
forEachBucket(start, end, [&](const Bucket& bucket, forEachBucket(start, end, [&](const Bucket& bucket,
TimeType bucketStart, TimeType bucketStart,
TimeType nextBucketStart) -> bool { TimeType nextBucketStart) -> bool {
count += this->rangeAdjust(bucketStart, nextBucketStart, start, end, sample_count += this->rangeAdjust(bucketStart, nextBucketStart, start, end,
bucket.count); bucket.count);
return true; return true;
}); });
return count; return sample_count;
} }
template <typename VT, typename TT> template <typename VT, typename TT>
template <typename ReturnType> template <typename ReturnType>
ReturnType BucketedTimeSeries<VT, TT>::avg(TimeType start, TimeType end) const { ReturnType BucketedTimeSeries<VT, TT>::avg(TimeType start, TimeType end) const {
ValueType sum = ValueType(); ValueType total = ValueType();
uint64_t count = 0; uint64_t sample_count = 0;
forEachBucket(start, end, [&](const Bucket& bucket, forEachBucket(start, end, [&](const Bucket& bucket,
TimeType bucketStart, TimeType bucketStart,
TimeType nextBucketStart) -> bool { TimeType nextBucketStart) -> bool {
sum += this->rangeAdjust(bucketStart, nextBucketStart, start, end, total += this->rangeAdjust(bucketStart, nextBucketStart, start, end,
bucket.sum); bucket.sum);
count += this->rangeAdjust(bucketStart, nextBucketStart, start, end, sample_count += this->rangeAdjust(bucketStart, nextBucketStart, start, end,
bucket.count); bucket.count);
return true; return true;
}); });
if (count == 0) { if (sample_count == 0) {
return ReturnType(0); return ReturnType(0);
} }
return detail::avgHelper<ReturnType>(sum, count); return detail::avgHelper<ReturnType>(total, sample_count);
} }
/* /*
......
...@@ -382,9 +382,9 @@ class BucketedTimeSeries { ...@@ -382,9 +382,9 @@ class BucketedTimeSeries {
private: private:
template <typename ReturnType=double, typename Interval=TimeType> template <typename ReturnType=double, typename Interval=TimeType>
ReturnType rateHelper(ReturnType numerator, TimeType elapsed) const { ReturnType rateHelper(ReturnType numerator, TimeType elapsedTime) const {
return detail::rateHelper<ReturnType, TimeType, Interval>(numerator, return detail::rateHelper<ReturnType, TimeType, Interval>(numerator,
elapsed); elapsedTime);
} }
TimeType getEarliestTimeNonEmpty() const; TimeType getEarliestTimeNonEmpty() const;
......
...@@ -23,23 +23,23 @@ namespace folly { ...@@ -23,23 +23,23 @@ namespace folly {
template <typename VT, typename TT> template <typename VT, typename TT>
MultiLevelTimeSeries<VT, TT>::MultiLevelTimeSeries( MultiLevelTimeSeries<VT, TT>::MultiLevelTimeSeries(
size_t numBuckets, size_t nBuckets,
size_t numLevels, size_t nLevels,
const TimeType levelDurations[]) const TimeType levelDurations[])
: cachedTime_(0), : cachedTime_(0),
cachedSum_(0), cachedSum_(0),
cachedCount_(0) { cachedCount_(0) {
CHECK_GT(numLevels, 0); CHECK_GT(nLevels, 0);
CHECK(levelDurations); CHECK(levelDurations);
levels_.reserve(numLevels); levels_.reserve(nLevels);
for (int i = 0; i < numLevels; ++i) { for (int i = 0; i < nLevels; ++i) {
if (levelDurations[i] == TT(0)) { if (levelDurations[i] == TT(0)) {
CHECK_EQ(i, numLevels - 1); CHECK_EQ(i, nLevels - 1);
} else if (i > 0) { } else if (i > 0) {
CHECK(levelDurations[i-1] < levelDurations[i]); CHECK(levelDurations[i-1] < levelDurations[i]);
} }
levels_.emplace_back(numBuckets, levelDurations[i]); levels_.emplace_back(nBuckets, levelDurations[i]);
} }
} }
...@@ -58,13 +58,13 @@ void MultiLevelTimeSeries<VT, TT>::addValue(TimeType now, ...@@ -58,13 +58,13 @@ void MultiLevelTimeSeries<VT, TT>::addValue(TimeType now,
template <typename VT, typename TT> template <typename VT, typename TT>
void MultiLevelTimeSeries<VT, TT>::addValueAggregated(TimeType now, void MultiLevelTimeSeries<VT, TT>::addValueAggregated(TimeType now,
const ValueType& sum, const ValueType& total,
int64_t nsamples) { int64_t nsamples) {
if (cachedTime_ != now) { if (cachedTime_ != now) {
flush(); flush();
cachedTime_ = now; cachedTime_ = now;
} }
cachedSum_ += sum; cachedSum_ += total;
cachedCount_ += nsamples; cachedCount_ += nsamples;
} }
......
...@@ -28,13 +28,13 @@ template <class T, class TT, class C> ...@@ -28,13 +28,13 @@ template <class T, class TT, class C>
template <typename ReturnType> template <typename ReturnType>
ReturnType TimeseriesHistogram<T, TT, C>::avg(int level) const { ReturnType TimeseriesHistogram<T, TT, C>::avg(int level) const {
ValueType total = ValueType(); ValueType total = ValueType();
int64_t count = 0; int64_t nsamples = 0;
for (int b = 0; b < buckets_.getNumBuckets(); ++b) { for (int b = 0; b < buckets_.getNumBuckets(); ++b) {
const auto& levelObj = buckets_.getByIndex(b).getLevel(level); const auto& levelObj = buckets_.getByIndex(b).getLevel(level);
total += levelObj.sum(); total += levelObj.sum();
count += levelObj.count(); nsamples += levelObj.count();
} }
return folly::detail::avgHelper<ReturnType>(total, count); return folly::detail::avgHelper<ReturnType>(total, nsamples);
} }
template <class T, class TT, class C> template <class T, class TT, class C>
...@@ -42,13 +42,13 @@ template <typename ReturnType> ...@@ -42,13 +42,13 @@ template <typename ReturnType>
ReturnType TimeseriesHistogram<T, TT, C>::avg(TimeType start, ReturnType TimeseriesHistogram<T, TT, C>::avg(TimeType start,
TimeType end) const { TimeType end) const {
ValueType total = ValueType(); ValueType total = ValueType();
int64_t count = 0; int64_t nsamples = 0;
for (int b = 0; b < buckets_.getNumBuckets(); ++b) { for (int b = 0; b < buckets_.getNumBuckets(); ++b) {
const auto& levelObj = buckets_.getByIndex(b).getLevel(start, end); const auto& levelObj = buckets_.getByIndex(b).getLevel(start, end);
total += levelObj.sum(start, end); total += levelObj.sum(start, end);
count += levelObj.count(start, end); nsamples += levelObj.count(start, end);
} }
return folly::detail::avgHelper<ReturnType>(total, count); return folly::detail::avgHelper<ReturnType>(total, nsamples);
} }
template <class T, class TT, class C> template <class T, class TT, class C>
......
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