From 410e13ba43cda01150a1c866253cb4b729eb015b Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 28 Sep 2022 16:16:20 +0800 Subject: [PATCH] crimson: merge files in tools/crimson into crimson/tools Signed-off-by: Yingxin Cheng --- src/crimson/tools/CMakeLists.txt | 9 +++++++++ src/{tools/crimson => crimson/tools}/perf_async_msgr.cc | 0 .../crimson => crimson/tools}/perf_crimson_msgr.cc | 0 .../crimson => crimson/tools}/perf_staged_fltree.cc | 0 src/tools/CMakeLists.txt | 4 ---- src/tools/crimson/CMakeLists.txt | 8 -------- 6 files changed, 9 insertions(+), 12 deletions(-) rename src/{tools/crimson => crimson/tools}/perf_async_msgr.cc (100%) rename src/{tools/crimson => crimson/tools}/perf_crimson_msgr.cc (100%) rename src/{tools/crimson => crimson/tools}/perf_staged_fltree.cc (100%) delete mode 100644 src/tools/crimson/CMakeLists.txt diff --git a/src/crimson/tools/CMakeLists.txt b/src/crimson/tools/CMakeLists.txt index 52436c62dc48..d57c3f9cfc44 100644 --- a/src/crimson/tools/CMakeLists.txt +++ b/src/crimson/tools/CMakeLists.txt @@ -7,3 +7,12 @@ add_executable(crimson-store-nbd target_link_libraries(crimson-store-nbd crimson-os) install(TARGETS crimson-store-nbd DESTINATION bin) + +add_executable(perf-crimson-msgr perf_crimson_msgr.cc) +target_link_libraries(perf-crimson-msgr crimson) + +add_executable(perf-async-msgr perf_async_msgr.cc) +target_link_libraries(perf-async-msgr ceph-common global ${ALLOC_LIBS}) + +add_executable(perf-staged-fltree perf_staged_fltree.cc) +target_link_libraries(perf-staged-fltree crimson-seastore) diff --git a/src/tools/crimson/perf_async_msgr.cc b/src/crimson/tools/perf_async_msgr.cc similarity index 100% rename from src/tools/crimson/perf_async_msgr.cc rename to src/crimson/tools/perf_async_msgr.cc diff --git a/src/tools/crimson/perf_crimson_msgr.cc b/src/crimson/tools/perf_crimson_msgr.cc similarity index 100% rename from src/tools/crimson/perf_crimson_msgr.cc rename to src/crimson/tools/perf_crimson_msgr.cc diff --git a/src/tools/crimson/perf_staged_fltree.cc b/src/crimson/tools/perf_staged_fltree.cc similarity index 100% rename from src/tools/crimson/perf_staged_fltree.cc rename to src/crimson/tools/perf_staged_fltree.cc diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 4fe63fe4686e..aeb9d0248ea6 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -148,10 +148,6 @@ if(WITH_RBD) endif() endif(WITH_RBD) -if(WITH_SEASTAR) - add_subdirectory(crimson) -endif() - add_subdirectory(immutable_object_cache) add_subdirectory(ceph-dencoder) add_subdirectory(erasure-code) diff --git a/src/tools/crimson/CMakeLists.txt b/src/tools/crimson/CMakeLists.txt deleted file mode 100644 index 19a2cfa9170c..000000000000 --- a/src/tools/crimson/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_executable(perf-crimson-msgr perf_crimson_msgr.cc) -target_link_libraries(perf-crimson-msgr crimson) - -add_executable(perf-async-msgr perf_async_msgr.cc) -target_link_libraries(perf-async-msgr ceph-common global ${ALLOC_LIBS}) - -add_executable(perf-staged-fltree perf_staged_fltree.cc) -target_link_libraries(perf-staged-fltree crimson-seastore) -- 2.47.3