From cff248390f1b8ec1a591f92b8a79f5c038755498 Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Mon, 23 Nov 2020 10:07:50 -0800 Subject: [PATCH] cleanup: Replace deprecated thread annotations macros Abseil thread annotation macros are now prefixed by `ABSL_`. There is no semantic change; this is just a rename. Signed-off-by: Teju Nareddy --- source/common/common/assert.cc | 2 +- source/extensions/common/wasm/wasm_extension.h | 4 ++-- test/integration/autonomous_upstream.h | 4 ++-- test/integration/fake_upstream.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/common/common/assert.cc b/source/common/common/assert.cc index 1daf69b9abb90..5eab3ef608758 100644 --- a/source/common/common/assert.cc +++ b/source/common/common/assert.cc @@ -83,7 +83,7 @@ class EnvoyBugRegistrationImpl : public ActionRegistration { using EnvoyBugMap = absl::flat_hash_map; static absl::Mutex mutex_; - static EnvoyBugMap counters_ GUARDED_BY(mutex_); + static EnvoyBugMap counters_ ABSL_GUARDED_BY(mutex_); }; std::function ActionRegistrationImpl::debug_assertion_failure_record_action_; diff --git a/source/extensions/common/wasm/wasm_extension.h b/source/extensions/common/wasm/wasm_extension.h index 22ae373162f27..1061fd1cf1cf2 100644 --- a/source/extensions/common/wasm/wasm_extension.h +++ b/source/extensions/common/wasm/wasm_extension.h @@ -77,8 +77,8 @@ class WasmExtension : Logger::Loggable { 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 diff --git a/test/integration/autonomous_upstream.h b/test/integration/autonomous_upstream.h index 6f82fac9a5f6b..385d275ea5be5 100644 --- a/test/integration/autonomous_upstream.h +++ b/test/integration/autonomous_upstream.h @@ -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 pre_response_headers_metadata_; }; diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h index 091edf70478dc..07b0dc64322f9 100644 --- a/test/integration/fake_upstream.h +++ b/test/integration/fake_upstream.h @@ -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_; }