dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from pleroy/DestructionPure 

Fix a bug in the destruction of BenchmarkFamilies.
This commit is contained in:
Dominic Hamon 2014-06-10 22:20:33 -07:00
parent 35da167b9e 10dc155372
commit 6a6fc70cf0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/benchmark.cc
View File

@ -343,6 +343,14 @@ BenchmarkFamilies::~BenchmarkFamilies() {
int BenchmarkFamilies::AddBenchmark(Benchmark* family) {
mutex_lock l(&benchmark_mutex);
// This loop attempts to reuse an entry that was previously removed to avoid
// unncessary growth of the vector.
for (int index = 0; index < families_.size(); ++index) {
if (families_[index] == nullptr) {
families_[index] = family;
return index;
}
}
int index = families_.size();
families_.push_back(family);
return index;
@ -351,11 +359,8 @@ int BenchmarkFamilies::AddBenchmark(Benchmark* family) {
void BenchmarkFamilies::RemoveBenchmark(int index) {
mutex_lock l(&benchmark_mutex);
families_[index] = NULL;
// Shrink the vector if convenient.
while (!families_.empty() && families_.back() == NULL) {
families_.pop_back();
}
// Don't shrink families_ here, we might be called by the destructor of
// BenchmarkFamilies which iterates over the vector.
}
void BenchmarkFamilies::FindBenchmarks(