From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Thu, 11 Jul 2019 09:21:07 +0000 (+0800)
Subject: msg/async/Event: simplfy logical implementation
X-Git-Tag: v15.1.0~1781^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7f87c3ff0580810feaa929d3dbda3ac23db3c19;p=ceph.git

msg/async/Event: simplfy logical implementation

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h
index abd27845c88c..fdfc0a315711 100644
--- a/src/msg/async/Event.h
+++ b/src/msg/async/Event.h
@@ -247,13 +247,12 @@ class EventCenter {
     ceph_assert(i < MAX_EVENTCENTER && global_centers);
     EventCenter *c = global_centers->centers[i];
     ceph_assert(c);
-    if (!nowait && c->in_thread()) {
-      f();
-      return ;
-    }
     if (nowait) {
       C_submit_event<func> *event = new C_submit_event<func>(std::move(f), true);
       c->dispatch_event_external(event);
+    } else if (c->in_thread()) {
+      f();
+      return;
     } else {
       C_submit_event<func> event(std::move(f), false);
       c->dispatch_event_external(&event);