Skip to content

cleanup: Replace deprecated thread annotations macros #14150

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

Merged
mattklein123 merged 1 commit into from
Nov 23, 2020
Merged

cleanup: Replace deprecated thread annotations macros #14150

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
2 changes: 1 addition & 1 deletion source/common/common/assert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class EnvoyBugRegistrationImpl : public ActionRegistration {

using EnvoyBugMap = absl::flat_hash_map<std::string, uint64_t>;
static absl::Mutex mutex_;
static EnvoyBugMap counters_ GUARDED_BY(mutex_);
static EnvoyBugMap counters_ ABSL_GUARDED_BY(mutex_);
};

std::function<void()> ActionRegistrationImpl::debug_assertion_failure_record_action_;
Expand Down
4 changes: 2 additions & 2 deletions source/extensions/common/wasm/wasm_extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class WasmExtension : Logger::Loggable<Logger::Id::wasm> {
virtual void onEvent(WasmEvent event, const PluginSharedPtr& plugin) = 0;
virtual void onRemoteCacheEntriesChanged(int remote_cache_entries) = 0;
virtual void createStats(const Stats::ScopeSharedPtr& scope, const PluginSharedPtr& plugin)
EXCLUSIVE_LOCKS_REQUIRED(mutex_) = 0;
virtual void resetStats() EXCLUSIVE_LOCKS_REQUIRED(mutex_) = 0; // Delete stats pointers
ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_) = 0;
virtual void resetStats() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mutex_) = 0; // Delete stats pointers

// NB: the Scope can become invalid if, for example, the owning FilterChain is deleted. When that
// happens the stats must be recreated. This hook verifies the Scope of any existing stats and if
Expand Down
4 changes: 2 additions & 2 deletions test/integration/autonomous_upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ class AutonomousStream : public FakeStream {
AutonomousUpstream& upstream, bool allow_incomplete_streams);
~AutonomousStream() override;

void setEndStream(bool set) EXCLUSIVE_LOCKS_REQUIRED(lock_) override;
void setEndStream(bool set) ABSL_EXCLUSIVE_LOCKS_REQUIRED(lock_) override;

private:
AutonomousUpstream& upstream_;
void sendResponse() EXCLUSIVE_LOCKS_REQUIRED(lock_);
void sendResponse() ABSL_EXCLUSIVE_LOCKS_REQUIRED(lock_);
const bool allow_incomplete_streams_{false};
std::unique_ptr<Http::MetadataMapVector> pre_response_headers_metadata_;
};
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fake_upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ class FakeStream : public Http::RequestDecoder,
void onAboveWriteBufferHighWatermark() override {}
void onBelowWriteBufferLowWatermark() override {}

virtual void setEndStream(bool end) EXCLUSIVE_LOCKS_REQUIRED(lock_) { end_stream_ = end; }
virtual void setEndStream(bool end) ABSL_EXCLUSIVE_LOCKS_REQUIRED(lock_) { end_stream_ = end; }

Event::TestTimeSystem& timeSystem() { return time_system_; }

Expand Down