]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10264 from yuyuyu101/wip-async-abstract-backend
authorKefu Chai <tchaikov@gmail.com>
Tue, 16 Aug 2016 18:18:39 +0000 (02:18 +0800)
committerGitHub <noreply@github.com>
Tue, 16 Aug 2016 18:18:39 +0000 (02:18 +0800)
msg/async: allow other async backend implementations

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/CMakeLists.txt
src/common/config_opts.h
src/test/msgr/test_msgr.cc

index acb13d343c6c5120fd20d5461b19e0c3774aba58,0596491aece3fe639a09381b098770a00ff773f4..fc87c4f36d382d336792d1f86629ffe84b14d098
@@@ -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
Simple merge
index f7bf0811c6b0aa129e8dd227c64d5ece39bb0596,05fcbbe4ba43715c0af07eaea24218dc6a500d98..f249c44e371458b7e210781339cfa84a9c837e92
@@@ -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<Session*>(m->get_connection()->get_priv());
      if (!s) {
        s = new Session(m->get_connection());