diff options
| author | Kefu Chai <tchaikov@gmail.com> | 2018-11-15 07:13:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 07:13:39 +0100 |
| commit | ac48b5659dd106ba8cb6c617bd59eac690291052 (patch) | |
| tree | b2b311560c4378bc2aec548ae57912f005b18735 /src/common/ceph_context.cc | |
| parent | Merge pull request #24858 from jecluis/wip-pr-19983-tests (diff) | |
| parent | crimson:port perfcounters to seastar (diff) | |
| download | ceph-ac48b5659dd106ba8cb6c617bd59eac690291052.tar.xz ceph-ac48b5659dd106ba8cb6c617bd59eac690291052.zip | |
Merge pull request #24141 from liu-chunmei/ceph_seastar_perfcounter
common,crimson: port perfcounters to seastar
Reviewed-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/common/ceph_context.cc')
| -rw-r--r-- | src/common/ceph_context.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index 3d9ee962ca0..025799dc314 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -13,6 +13,8 @@ * */ +#include "common/ceph_context.h" + #include <mutex> #include <iostream> @@ -22,7 +24,6 @@ #include "include/mempool.h" #include "common/admin_socket.h" -#include "common/perf_counters.h" #include "common/code_environment.h" #include "common/Cond.h" #include "common/config.h" @@ -53,6 +54,7 @@ using ceph::HeartbeatMap; #ifdef WITH_SEASTAR CephContext::CephContext() : _conf{ceph::common::local_conf()}, + _perf_counters_collection{ceph::common::local_perf_coll()}, _crypto_random{std::make_unique<CryptoRandom>()} {} @@ -78,9 +80,9 @@ void CephContext::put() } } -PerfCountersCollection* CephContext::get_perfcounters_collection() +PerfCountersCollectionImpl* CephContext::get_perfcounters_collection() { - throw std::runtime_error("not yet implemented"); + return _perf_counters_collection.get_perf_collection(); } #else // WITH_SEASTAR |