From 5ec16ca839e438fad6dada1e06d827feb7065e03 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 19 May 2021 12:26:15 +0800 Subject: [PATCH] crimson/os: move ctor of SeaStore into .cc so the ctor and dtor are colocated in the same file. for better readability. Signed-off-by: Kefu Chai --- src/crimson/os/seastore/seastore.cc | 14 ++++++++++++++ src/crimson/os/seastore/seastore.h | 10 +--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc index b7823c25ce7..d2b39bb0e0b 100644 --- a/src/crimson/os/seastore/seastore.cc +++ b/src/crimson/os/seastore/seastore.cc @@ -29,6 +29,20 @@ using crimson::common::local_conf; namespace crimson::os::seastore { +SeaStore::SeaStore( + SegmentManagerRef sm, + TransactionManagerRef tm, + CollectionManagerRef cm, + OnodeManagerRef om) + : segment_manager(std::move(sm)), + transaction_manager(std::move(tm)), + collection_manager(std::move(cm)), + onode_manager(std::move(om)), + perf_service(std::move(p_service)) +{ + perf_service->add_to_collection(); +} + SeaStore::~SeaStore() { perf_service->remove_from_collection(); } diff --git a/src/crimson/os/seastore/seastore.h b/src/crimson/os/seastore/seastore.h index f340e401567..30f23de6161 100644 --- a/src/crimson/os/seastore/seastore.h +++ b/src/crimson/os/seastore/seastore.h @@ -39,15 +39,7 @@ public: TransactionManagerRef tm, CollectionManagerRef cm, OnodeManagerRef om, - PerfServiceRef p_service - ) : segment_manager(std::move(sm)), - transaction_manager(std::move(tm)), - collection_manager(std::move(cm)), - onode_manager(std::move(om)), - perf_service(std::move(p_service)) { - perf_service->add_to_collection(); - } - + PerfServiceRef p_service); ~SeaStore(); seastar::future<> stop() final; -- 2.39.5