Merge pull request ceph#63796 from tchaikov/wip-memstore-silence-warning

cmake: suppress -Wmaybe-uninitialized warning in memstore PageSet

Reviewed-by: Matan Breizman <[email protected]>

Author: tchaikov

src/CMakeLists.txt

@@ -873,8 +873,6 @@ if(WITH_TESTS)
   add_subdirectory(test)
 endif()
 
-add_subdirectory(crypto)
-
 if(WITH_TESTS)
   install(PROGRAMS
     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-debugpack
@@ -1147,6 +1145,7 @@ if(WITH_RADOSGW)
     endif(WITH_SYSTEM_ARROW)
   endif(WITH_RADOSGW_SELECT_PARQUET OR WITH_RADOSGW_ARROW_FLIGHT)
 
+  add_subdirectory(crypto)
   add_subdirectory(libkmip)
   add_subdirectory(rgw)
 endif(WITH_RADOSGW)

src/crypto/CMakeLists.txt

@@ -1,4 +1,5 @@
-add_custom_target(crypto_plugins)
+# crypto plugins are loaded at runtime by rgw_crypt.cc
+add_custom_target(crypto_plugins ALL)
 set(crypto_plugin_dir ${CEPH_INSTALL_PKGLIBDIR}/crypto)
 
 add_subdirectory(openssl)

src/os/CMakeLists.txt

@@ -1,91 +1,51 @@
-set(libos_srcs
+add_library(os STATIC
   ObjectStore.cc
-  Transaction.cc
-  memstore/MemStore.cc
-  kstore/KStore.cc
-  kstore/kstore_types.cc
-  fs/FS.cc)
+  Transaction.cc)
 
-if(WITH_BLUESTORE)
-  list(APPEND libos_srcs
-    bluestore/Allocator.cc
-    bluestore/AllocatorBase.cc
-    bluestore/BitmapFreelistManager.cc
-    bluestore/BlueFS.cc
-    bluestore/bluefs_types.cc
-    bluestore/BlueRocksEnv.cc
-    bluestore/BlueStore.cc
-    bluestore/BlueStore_debug.cc
-    bluestore/simple_bitmap.cc
-    bluestore/bluestore_types.cc
-    bluestore/fastbmap_allocator_impl.cc
-    bluestore/FreelistManager.cc
-    bluestore/StupidAllocator.cc
-    bluestore/BitmapAllocator.cc
-    bluestore/AvlAllocator.cc
-    bluestore/BtreeAllocator.cc
-    bluestore/Btree2Allocator.cc
-    bluestore/HybridAllocator.cc
-    bluestore/Writer.cc
-    bluestore/Compression.cc
-    bluestore/BlueAdmin.cc
-    bluestore/BlueEnv.cc
-  )
-endif(WITH_BLUESTORE)
-
-if(WITH_FUSE)
-  list(APPEND libos_srcs
-    FuseStore.cc)
-endif(WITH_FUSE)
-
-if(HAVE_LIBXFS)
-  list(APPEND libos_srcs
-    fs/XFS.cc)
-endif()
+target_link_libraries(os
+  PRIVATE
+    legacy-option-headers
+    ${FMT_LIB})
 
-add_library(os STATIC ${libos_srcs})
+add_subdirectory(memstore)
 target_link_libraries(os
-  legacy-option-headers
-  blk
-  ${FMT_LIB})
+  PRIVATE memstore)
 
-target_compile_definitions(os PRIVATE -DWITH_KSTORE)
-target_link_libraries(os heap_profiler kv)
+add_subdirectory(kstore)
+target_link_libraries(os
+  PRIVATE
+    kstore)
 
-if(WITH_BLUEFS)
-  add_library(bluefs SHARED 
-    bluestore/BlueRocksEnv.cc)
-  target_include_directories(bluefs SYSTEM PUBLIC
-    $<TARGET_PROPERTY:RocksDB::RocksDB,INTERFACE_INCLUDE_DIRECTORIES>)
-  target_link_libraries(bluefs global)
-  install(TARGETS bluefs DESTINATION lib)
-endif(WITH_BLUEFS)
+if(WITH_BLUESTORE)
+  add_subdirectory(bluestore)
+  target_link_libraries(os
+    PRIVATE bluestore)
+endif()
 
 if(WITH_FUSE)
-  target_link_libraries(os FUSE::FUSE)
+  add_library(fusestore
+    FuseStore.cc)
+  target_link_libraries(fusestore
+    PRIVATE FUSE::FUSE)
+  target_link_libraries(os
+    PRIVATE fusestore)
 endif()
 
 if(WITH_LTTNG)
   add_dependencies(os objectstore-tp)
-  add_dependencies(os bluestore-tp)
 endif()
 
 if(WITH_JAEGER)
   add_dependencies(os jaeger_base)
-  target_link_libraries(os jaeger_base)
+  target_link_libraries(os
+    PRIVATE jaeger_base)
 endif()
 
-target_link_libraries(os kv)
-
-add_dependencies(os compressor_plugins)
-add_dependencies(os crypto_plugins)
-
-
 if(WITH_BLUESTORE)
   add_executable(ceph-bluestore-tool
     bluestore/bluestore_tool.cc)
   target_link_libraries(ceph-bluestore-tool
-    os global)
+    global kv os)
   install(TARGETS ceph-bluestore-tool
     DESTINATION bin)
 endif()

src/os/bluestore/CMakeLists.txt

@@ -0,0 +1,41 @@
+add_library(bluestore OBJECT
+  Allocator.cc
+  AllocatorBase.cc
+  BitmapFreelistManager.cc
+  BlueFS.cc
+  bluefs_types.cc
+  BlueRocksEnv.cc
+  BlueStore.cc
+  BlueStore_debug.cc
+  simple_bitmap.cc
+  bluestore_types.cc
+  fastbmap_allocator_impl.cc
+  FreelistManager.cc
+  StupidAllocator.cc
+  BitmapAllocator.cc
+  AvlAllocator.cc
+  BtreeAllocator.cc
+  Btree2Allocator.cc
+  HybridAllocator.cc
+  Writer.cc
+  Compression.cc
+  BlueAdmin.cc
+  BlueEnv.cc)
+
+target_link_libraries(bluestore
+  PRIVATE
+    blk heap_profiler kv ${FMT_LIB})
+
+add_dependencies(bluestore compressor_plugins)
+if(WITH_LTTNG)
+  add_dependencies(bluestore bluestore-tp)
+endif()
+
+if(WITH_BLUEFS)
+  add_library(bluefs SHARED
+    BlueRocksEnv.cc)
+  target_include_directories(bluefs SYSTEM PUBLIC
+    $<TARGET_PROPERTY:RocksDB::RocksDB,INTERFACE_INCLUDE_DIRECTORIES>)
+  target_link_libraries(bluefs global)
+  install(TARGETS bluefs DESTINATION lib)
+endif()

src/os/fs/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(fs_srcs
+  FS.cc)
+
+if(HAVE_LIBXFS)
+  list_(APPEND fs_srcs
+    XFS.cc)
+endif()

src/os/kstore/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library(kstore STATIC
+  KStore.cc
+  kstore_types.cc)
+target_compile_definitions(kstore
+  PUBLIC WITH_KSTORE)
+target_link_libraries(kstore
+  PUBLIC kv)

src/os/memstore/CMakeLists.txt

@@ -0,0 +1,10 @@
+include(CheckCXXCompilerFlag)
+
+add_library(memstore
+  MemStore.cc)
+check_cxx_compiler_flag("-Wno-maybe-uninitialized"
+  HAS_WARNING_MAYBE_UNINITIALIZED)
+if(HAS_WARNING_MAYBE_UNINITIALIZED)
+  target_compile_options(os
+    PRIVATE "-Wno-maybe-uninitialized")
+endif()

src/test/objectstore/CMakeLists.txt

@@ -45,7 +45,7 @@ add_subdirectory(allocsim)
 add_executable(ceph_test_keyvaluedb
   test_kv.cc)
 target_link_libraries(ceph_test_keyvaluedb
-  os
+  kv
   ceph-common
   ${UNITTEST_LIBS}
   global
@@ -62,7 +62,9 @@ add_executable(unittest_rocksdb_option
   $<TARGET_OBJECTS:unit-main>
   )
 add_ceph_unittest(unittest_rocksdb_option)
-target_link_libraries(unittest_rocksdb_option global os ${BLKID_LIBRARIES})
+target_link_libraries(unittest_rocksdb_option
+  global os ${BLKID_LIBRARIES}
+  RocksDB::RocksDB)
 
 # ceph_test_bluefs (a clone of unittest_bluefs)
 add_executable(ceph_test_bluefs