From: Kefu Chai Date: Tue, 16 Aug 2016 18:18:39 +0000 (+0800) Subject: Merge pull request #10264 from yuyuyu101/wip-async-abstract-backend X-Git-Tag: ses5-milestone5~107 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e354918ec8da6b6990251d9e07b4eede35ba5778;p=ceph.git Merge pull request #10264 from yuyuyu101/wip-async-abstract-backend msg/async: allow other async backend implementations Reviewed-by: Kefu Chai --- e354918ec8da6b6990251d9e07b4eede35ba5778 diff --cc src/CMakeLists.txt index acb13d343c6,0596491aece..fc87c4f36d3 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@@ -436,7 -422,10 +436,9 @@@ set(libcommon_file msg/async/AsyncConnection.cc msg/async/AsyncMessenger.cc msg/async/Event.cc - msg/async/EventEpoll.cc msg/async/EventSelect.cc + msg/async/Stack.cc + msg/async/PosixStack.cc msg/async/net_handler.cc ${xio_common_srcs} msg/msg_types.cc diff --cc src/test/msgr/test_msgr.cc index f7bf0811c6b,05fcbbe4ba4..f249c44e371 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@@ -173,8 -175,10 +173,9 @@@ class FakeDispatcher : public Dispatche s->put(); } got_remote_reset = true; + cond.Signal(); } void ms_fast_dispatch(Message *m) { - Mutex::Locker l(lock); Session *s = static_cast(m->get_connection()->get_priv()); if (!s) { s = new Session(m->get_connection());