From 82f9896e08748666c8fa3327aac1abd153f4286d Mon Sep 17 00:00:00 2001 From: jakub-racek-swi Date: Thu, 12 Sep 2024 16:22:33 +0000 Subject: [PATCH] Bump abseil and grpc Signed-off-by: jakub-racek-swi --- reducer/ingest/tcp_server.h | 2 +- reducer/load_balancer.h | 4 ++-- reducer/worker.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reducer/ingest/tcp_server.h b/reducer/ingest/tcp_server.h index 73b5f416..e9057ffa 100644 --- a/reducer/ingest/tcp_server.h +++ b/reducer/ingest/tcp_server.h @@ -108,7 +108,7 @@ class TcpServer { std::vector> workers_; std::unique_ptr> worker_balancer_; - Stats stats_ GUARDED_BY(stats_mu_); + Stats stats_ ABSL_GUARDED_BY(stats_mu_); mutable absl::Mutex stats_mu_; }; diff --git a/reducer/load_balancer.h b/reducer/load_balancer.h index 0b13b098..0d0c0af3 100644 --- a/reducer/load_balancer.h +++ b/reducer/load_balancer.h @@ -41,8 +41,8 @@ template class LoadBalancer { using EntrySet = std::multiset; using EntryIterator = typename EntrySet::const_iterator; - EntrySet entries_ GUARDED_BY(mu_); - absl::flat_hash_map elem_to_entry_it_ GUARDED_BY(mu_); + EntrySet entries_ ABSL_GUARDED_BY(mu_); + absl::flat_hash_map elem_to_entry_it_ ABSL_GUARDED_BY(mu_); mutable absl::Mutex mu_; }; diff --git a/reducer/worker.h b/reducer/worker.h index 8be30f24..b2a5f0b5 100644 --- a/reducer/worker.h +++ b/reducer/worker.h @@ -108,12 +108,12 @@ class Worker { // Various fields that deal with the queueing and processing of // newly-assigned TCP sockets. uv_async_t open_tcp_socks_async_; - std::vector tcp_sock_fds_ GUARDED_BY(mu_); + std::vector tcp_sock_fds_ ABSL_GUARDED_BY(mu_); mutable absl::Mutex mu_; // The queue of visitors. uv_async_t visit_async_; - std::vector visitors_ GUARDED_BY(mu_); + std::vector visitors_ ABSL_GUARDED_BY(mu_); // The async used to stop this thread. uv_async_t stop_async_;