]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10090 from yuyuyu101/wip-remove-async-lock
authorHaomai Wang <haomaiwang@gmail.com>
Tue, 12 Jul 2016 16:26:16 +0000 (00:26 +0800)
committerGitHub <noreply@github.com>
Tue, 12 Jul 2016 16:26:16 +0000 (00:26 +0800)
msg/async: remove file event lock

Reviewed-by: Kefu Chai <kefu@redhat.com>
1  2 
src/msg/async/AsyncMessenger.cc
src/msg/async/Event.h

index 7f2417de2fa666fbf4ef2799a15cdd65ae6dd7ed,b0e465c71fed39aaaa44c74f154bd6c914bfadcd..389de7d054f54b009c6d0cb7a9ce7af8dbffa5b1
@@@ -244,8 -244,11 +244,9 @@@ void Processor::start(Worker *w
    // start thread
    if (listen_sd >= 0) {
      worker = w;
-     w->center.create_file_event(listen_sd, EVENT_READABLE, listen_handler);
+     worker->center.submit_to(worker->center.get_id(), [this]() {
+       worker->center.create_file_event(listen_sd, EVENT_READABLE, listen_handler); });
    }
 -
 -  return 0;
  }
  
  void Processor::accept()
Simple merge