update source to Ceph Pacific 16.2.2

[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 5516e7507c1b8b1908d21e702bf1aaf3d7c7d07e..71b9a5a26d9e2357878e9e079f697ee354814edd 100644 (file)
--- a/ceph/src/seastar/src/core/alien.cc
+++ b/ceph/src/seastar/src/core/alien.cc
@@ -21,6 +21,7 @@
  */
 
 #include <seastar/core/alien.hh>
+#include <seastar/core/reactor.hh>
 #include <seastar/core/metrics.hh>
 #include <seastar/core/prefetch.hh>
 
@@ -101,7 +102,7 @@ size_t message_queue::process_incoming() {
 void message_queue::start() {
     namespace sm = seastar::metrics;
     char instance[10];
-    std::snprintf(instance, sizeof(instance), "%u", engine().cpu_id());
+    std::snprintf(instance, sizeof(instance), "%u", this_shard_id());
     _metrics.add_group("alien", {
         // Absolute value of num packets in last tx batch.
         sm::make_queue_length("receive_batch_queue_length", _last_rcv_batch, sm::description("Current receive batch queue length")),
@@ -131,12 +132,12 @@ smp::qs smp::create_qs(const std::vector<reactor*>& reactors) {
 }
 
 bool smp::poll_queues() {
-    auto& queue = _qs[engine().cpu_id()];
+    auto& queue = _qs[this_shard_id()];
     return queue.process_incoming() != 0;
 }
 
 bool smp::pure_poll_queues() {
-    auto& queue = _qs[engine().cpu_id()];
+    auto& queue = _qs[this_shard_id()];
     return queue.pure_poll_rx();
 }