Skip to content

Commit 4eaa960

Browse files
andreas-abelcopybara-github
authored andcommitted
Make usage_ a local variable
It's only used in one place in the constructor. PiperOrigin-RevId: 782973686 Change-Id: I0535d2305ebca7198eeca3092e63a4b42187344b
1 parent 528ec7f commit 4eaa960

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

fleetbench/tcmalloc/empirical.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ EmpiricalData::EmpiricalData(size_t seed, const absl::Span<const Entry> weights,
8282
: rng_(seed),
8383
alloc_(alloc),
8484
dealloc_(dealloc),
85-
usage_(0),
8685
total_num_allocated_(0),
8786
total_bytes_allocated_(0),
8887
birth_sampler_(BirthRateDistribution(weights)),
@@ -124,9 +123,11 @@ EmpiricalData::EmpiricalData(size_t seed, const absl::Span<const Entry> weights,
124123
absl::discrete_distribution<int> live_dist(avg_counts.begin(),
125124
avg_counts.end());
126125

127-
while (usage_ < total_mem) {
126+
size_t usage = 0;
127+
while (usage < total_mem) {
128128
int i = live_dist(rng_);
129129
DoBirth(i);
130+
usage += state_[i].size;
130131
}
131132

132133
SnapshotLiveObjects();
@@ -151,7 +152,6 @@ void* EmpiricalData::DoBirth(const size_t i) {
151152
// We have an extra live object, so the overall death rate goes up.
152153
death_sampler_.AdjustWeight(i, s.death_rate);
153154
const size_t size = s.size;
154-
usage_ += size;
155155
total_num_allocated_++;
156156
total_bytes_allocated_ += size;
157157
void* p = alloc_(size);
@@ -167,7 +167,6 @@ void EmpiricalData::DoDeath(const size_t i) {
167167
absl::uniform_int_distribution<int>(0, s.objs.size() - 1)(rng_);
168168
death_sampler_.AdjustWeight(i, -s.death_rate);
169169
const size_t size = s.size;
170-
usage_ -= size;
171170
void* p = s.objs[obj];
172171
s.objs[obj] = s.objs.back();
173172
s.objs.pop_back();
@@ -189,7 +188,6 @@ void EmpiricalData::RecordBirth(const size_t i) {
189188
void* EmpiricalData::ReplayBirth(const size_t i) {
190189
SizeState& s = state_[i];
191190
const size_t size = s.size;
192-
usage_ += size;
193191
total_num_allocated_++;
194192
total_bytes_allocated_ += size;
195193
void* p = alloc_(size);

fleetbench/tcmalloc/empirical.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ class EmpiricalData {
266266
absl::FunctionRef<void*(size_t)> alloc_;
267267
absl::FunctionRef<void(void*, size_t)> dealloc_;
268268

269-
size_t usage_;
270269
size_t total_num_allocated_;
271270
size_t total_bytes_allocated_;
272271
std::vector<SizeState> state_;

0 commit comments

Comments
 (0)