From 38f78abffa92fad9340e7df82892f58e87e84135 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 5 Mar 2020 12:23:08 +0100 Subject: [PATCH] msg/async: s/nowait/always_async/ in EventCenter::submit_to(). Signed-off-by: Radoslaw Zarzynski --- src/msg/async/Event.h | 4 ++-- src/msg/async/ProtocolV1.cc | 2 +- src/msg/async/ProtocolV2.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h index d7dba443956dc..5d6d04c9e8ecc 100644 --- a/src/msg/async/Event.h +++ b/src/msg/async/Event.h @@ -244,11 +244,11 @@ class EventCenter { public: template - void submit_to(int i, func &&f, bool nowait = false) { + void submit_to(int i, func &&f, bool always_async = false) { ceph_assert(i < MAX_EVENTCENTER && global_centers); EventCenter *c = global_centers->centers[i]; ceph_assert(c); - if (nowait) { + if (always_async) { C_submit_event *event = new C_submit_event(std::move(f), true); c->dispatch_event_external(event); } else if (c->in_thread()) { diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc index a082d187a7f5e..4560cb5a031d1 100644 --- a/src/msg/async/ProtocolV1.cc +++ b/src/msg/async/ProtocolV1.cc @@ -1276,7 +1276,7 @@ void ProtocolV1::reset_recv_state() std::lock_guard l(connection->lock); std::lock_guard wl(connection->write_lock); reset_security(); - }, /* nowait = */true); + }, /* always_async = */true); } else { reset_security(); } diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index f258eb12ee074..8fc02db6e559a 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -248,7 +248,7 @@ void ProtocolV2::reset_recv_state() { std::lock_guard l(connection->lock); std::lock_guard wl(connection->write_lock); reset_security(); - }, /* nowait = */true); + }, /* always_async = */true); } else { reset_security(); } -- 2.39.5