github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-29 14:30:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Second thread sanitzer try"

Browse Source 
and "Improve thread sanitzer statements"
This commit is contained in:
Olaf Krzikalla 2023-10-19 14:18:15 +02:00
parent a8fc4af294
commit c333d804ad
2 changed files with 3 additions and 3 deletions

2
src/benchmark_api_internal.cc
View File

@ -121,7 +121,7 @@ void BenchmarkInstance::Teardown() const {
}
void MergeResults(const State& st, const ThreadTimer* timer,
ThreadManager* manager) REQUIRES(manager->benchmark_mutex_) {
ThreadManager* manager) NO_THREAD_SAFETY_ANALYSIS {
ThreadManager::Result& results = manager->results;
results.iterations += st.iterations();
results.cpu_time_used += timer->cpu_time_used();

4
src/benchmark_api_internal.h
View File

@ -10,7 +10,6 @@
#include "benchmark/benchmark.h"
#include "commandlineflags.h"
#include "thread_manager.h"
#include "mutex.h"
namespace benchmark {
@ -85,8 +84,9 @@ bool FindBenchmarksInternal(const std::string& re,
bool IsZero(double n);
// only call while holding benchmark_mutex_:
void MergeResults(const State& st, const ThreadTimer* timer,
ThreadManager* manager) REQUIRES(manager->benchmark_mutex_);
ThreadManager* manager) NO_THREAD_SAFETY_ANALYSIS;
BENCHMARK_EXPORT
ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);