Skip to content

Commit

Permalink
Google-specific change.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 655211676
  • Loading branch information
ussuri authored and copybara-github committed Jul 23, 2024
1 parent 7de78fe commit 17f8bba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions centipede/periodic_action.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ PeriodicAction::~PeriodicAction() { Stop(); }

void PeriodicAction::Stop() {
StopAsync();
// The run-loop should exit the next time it checks `stop_`. Note that if
// the loop is currently in the middle of an invocation of `action_`, it
// will wait for the invocation to finish, so we might block here for an
// `action_`-dependent amount of time.
if (thread_.joinable()) {
// The run-loop should exit the next time it checks `stop_`. Note that if
// the loop is currently in the middle of an invocation of `action_`, it
// will wait for the invocation to finish, so we might block here for an
// `action_`-dependent amount of time.
thread_.join();
}
}
Expand Down
3 changes: 1 addition & 2 deletions centipede/periodic_action.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
#ifndef FUZZTEST_CENTIPEDE_PERIODIC_ACTION_H_
#define FUZZTEST_CENTIPEDE_PERIODIC_ACTION_H_

#include <memory>
#include <thread> // NOLINT
#include <thread>

#include "absl/base/thread_annotations.h"
#include "absl/functional/any_invocable.h"
Expand Down

0 comments on commit 17f8bba

Please sign in to comment.