Skip to content

fix: skip empty benchmarks to avoid infinite loops when CODSPEED_MODE=off #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OsamaAhmad00 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

fix: skip empty benchmarks to avoid infinite loops when CODSPEED_MODE=off #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions google_benchmark/src/benchmark_runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,11 @@ void RunInThread(const BenchmarkInstance* b, IterationCount iters,

State st = b->__codspeed_root_frame__Run(iters, thread_id, &timer, manager,
perf_counters_measurement, profiler_manager_, is_warmup);
BM_CHECK(st.skipped() || st.iterations() >= st.max_iterations)
<< "Benchmark returned before State::KeepRunning() returned false!";
if (!(st.skipped() || st.iterations() >= st.max_iterations)) {
st.SkipWithError(
"The benchmark didn't run, nor was it explicitly skipped. Please call "
"'SkipWithXXX` in your benchmark as appropriate.");
}
{
MutexLock l(manager->GetBenchmarkMutex());
internal::ThreadManager::Result& results = manager->results;
Expand Down
9 changes: 9 additions & 0 deletions google_benchmark/test/skip_with_error_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,15 @@ ADD_CASES("BM_error_while_paused", {{"/1/threads:1", true, "error message"},
{"/2/threads:4", false, ""},
{"/2/threads:8", false, ""}});

void BM_malformed(benchmark::State&) {
// NOTE: empty body wanted. No thing else.
}
BENCHMARK(BM_malformed);
ADD_CASES("BM_malformed",
{{"", true,
"The benchmark didn't run, nor was it explicitly skipped. Please "
"call 'SkipWithXXX` in your benchmark as appropriate."}});

int main(int argc, char* argv[]) {
benchmark::Initialize(&argc, argv);

Expand Down