import quincy beta 17.1.0

[ceph.git] / ceph / src / seastar / src / core / alien.cc

diff --git a/ceph/src/seastar/src/core/alien.cc b/ceph/src/seastar/src/core/alien.cc
index 71b9a5a26d9e2357878e9e079f697ee354814edd..3fd6b5da978fd1ab88af7a4e5c0da36f44db9cb1 100644 (file)
--- a/ceph/src/seastar/src/core/alien.cc
+++ b/ceph/src/seastar/src/core/alien.cc
@@ -114,32 +114,32 @@ void message_queue::start() {
 }
 
 
-void smp::qs_deleter::operator()(alien::message_queue* qs) const {
+void internal::qs_deleter::operator()(alien::message_queue* qs) const {
     for (unsigned i = 0; i < count; i++) {
         qs[i].~message_queue();
     }
     ::operator delete[](qs);
 }
 
-smp::qs smp::_qs;
-
-smp::qs smp::create_qs(const std::vector<reactor*>& reactors) {
+instance::qs instance::create_qs(const std::vector<reactor*>& reactors) {
     auto queues = reinterpret_cast<alien::message_queue*>(operator new[] (sizeof(alien::message_queue) * reactors.size()));
     for (unsigned i = 0; i < reactors.size(); i++) {
         new (&queues[i]) alien::message_queue(reactors[i]);
     }
-    return qs{queues, smp::qs_deleter{static_cast<unsigned>(reactors.size())}};
+    return qs{queues, internal::qs_deleter{static_cast<unsigned>(reactors.size())}};
 }
 
-bool smp::poll_queues() {
+bool instance::poll_queues() {
     auto& queue = _qs[this_shard_id()];
     return queue.process_incoming() != 0;
 }
 
-bool smp::pure_poll_queues() {
+bool instance::pure_poll_queues() {
     auto& queue = _qs[this_shard_id()];
     return queue.pure_poll_rx();
 }
 
+instance* internal::default_instance;
+
 }
 }