Merge pull request ceph#61672 from Matan-B/wip-matanb-cmake-crimson-v3

Matan-B · web-flow · commit 7a036c6b0176 · 2025-03-16T11:23:18.000+02:00
src: Cleanup WITH_ALIENSTORE

Reviewed-by: Radosław Zarzyński &lt;rzarzyns@redhat.com&gt;
Reviewed-by: Yingxin Cheng &lt;yingxin.cheng@intel.com&gt;
Reviewed-by: Adam Emerson &lt;aemerson@redhat.com&gt;
diff --git a/src/common/Finisher.cc b/src/common/Finisher.cc
@@ -5,7 +5,7 @@
 #include "common/perf_counters.h"
 #include "include/types.h" // for operator<<(std::vector)
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/common/RefCountedObj.h b/src/common/RefCountedObj.h
@@ -89,7 +89,7 @@ template<typename... Args>
   virtual ~RefCountedObjectSafe() override {}
 };
 
-#if !defined(WITH_SEASTAR)|| defined(WITH_ALIEN)
+#ifndef WITH_SEASTAR
 
 /**
  * RefCountedCond
@@ -186,7 +186,7 @@ static inline void intrusive_ptr_add_ref(RefCountedWaitObject *p) {
 static inline void intrusive_ptr_release(RefCountedWaitObject *p) {
   p->put();
 }
-#endif // !defined(WITH_SEASTAR)|| defined(WITH_ALIEN)
+#endif // ifndef WITH_SEASTAR
 
 static inline void intrusive_ptr_add_ref(const RefCountedObject *p) {
   p->get();
diff --git a/src/common/Throttle.h b/src/common/Throttle.h
@@ -15,7 +15,7 @@
 #include "include/Context.h"
 #include "common/ThrottleInterface.h"
 #include "common/Timer.h"
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
@@ -28,7 +28,7 @@
 #include "include/spinlock.h"
 #include "msg/Message.h"
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h
@@ -15,7 +15,7 @@
 #ifndef CEPH_WORKQUEUE_H
 #define CEPH_WORKQUEUE_H
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 // for ObjectStore.h
 struct ThreadPool {
   struct TPHandle {
diff --git a/src/common/admin_socket.h b/src/common/admin_socket.h
@@ -15,7 +15,7 @@
 #ifndef CEPH_COMMON_ADMIN_SOCKET_H
 #define CEPH_COMMON_ADMIN_SOCKET_H
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/admin/admin_socket.h"
 #else
 
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
@@ -48,7 +48,7 @@
 #include "common/PluginRegistry.h"
 #include "common/valgrind.h"
 #include "include/spinlock.h"
-#if !(defined(WITH_SEASTAR) && !defined(WITH_ALIEN))
+#ifndef WITH_SEASTAR
 #include "mon/MonMap.h"
 #endif
 
@@ -64,7 +64,7 @@ using ceph::bufferlist;
 using ceph::HeartbeatMap;
 
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 namespace crimson::common {
 CephContext::CephContext()
   : _conf{crimson::common::local_conf()},
diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
@@ -34,7 +34,7 @@
 #include "common/cmdparse.h"
 #include "common/code_environment.h"
 #include "msg/msg_types.h"
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/config_proxy.h"
 #include "crimson/common/perf_counters_collection.h"
 #else
@@ -67,7 +67,7 @@ namespace ceph {
   }
 }
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 namespace crimson::common {
 class CephContext {
 public:
@@ -429,7 +429,7 @@ class CephContext {
 #endif
 #endif	// WITH_SEASTAR
 
-#if !(defined(WITH_SEASTAR) && !defined(WITH_ALIEN)) && defined(__cplusplus)
+#if !defined(WITH_SEASTAR) && defined(__cplusplus)
 namespace ceph::common {
 inline void intrusive_ptr_add_ref(CephContext* cct)
 {
@@ -441,5 +441,5 @@ inline void intrusive_ptr_release(CephContext* cct)
   cct->put();
 }
 }
-#endif // !(defined(WITH_SEASTAR) && !defined(WITH_ALIEN)) && defined(__cplusplus)
+#endif // !defined(WITH_SEASTAR) && defined(__cplusplus)
 #endif
diff --git a/src/common/ceph_mutex.h b/src/common/ceph_mutex.h
@@ -14,7 +14,7 @@
 // and make_recursive_mutex() factory methods, which take a string
 // naming the mutex for the purposes of the lockdep debug variant.
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include <seastar/core/condition-variable.hh>
 
 #include "crimson/common/log.h"
@@ -87,7 +87,7 @@ namespace ceph {
   #define ceph_mutex_is_locked_by_me(m) true
 }
 
-#else  // defined (WITH_SEASTAR) && !defined(WITH_ALIEN)
+#else  // ifdef WITH_SEASTAR
 //
 // For legacy Mutex users that passed recursive=true, use
 // ceph::make_recursive_mutex.  For legacy Mutex users that passed
diff --git a/src/common/dout.h b/src/common/dout.h
@@ -20,7 +20,7 @@
 
 #include "include/ceph_assert.h"
 #include "include/common_fwd.h"
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include <seastar/util/log.hh>
 #include "crimson/common/log.h"
 #include "crimson/common/config_proxy.h"
@@ -139,7 +139,7 @@ struct is_dynamic<dynamic_marker_t<T>> : public std::true_type {};
 // generic macros
 #define dout_prefix *_dout
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #define dout_impl(cct, sub, v)                                          \
   do {                                                                  \
     if (crimson::common::local_conf()->subsys.should_gather(sub, v)) {  \
diff --git a/src/common/mempool.cc b/src/common/mempool.cc
@@ -15,7 +15,7 @@
 #include "include/mempool.h"
 #include "include/demangle.h"
 
-#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR)
 #else
 // Thread local variables should save index, not &shard[index],
 // because shard[] is defined in the class
@@ -98,7 +98,7 @@ size_t mempool::pool_t::allocated_items() const
 
 void mempool::pool_t::adjust_count(ssize_t items, ssize_t bytes)
 {
-#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR)
   // the expected path: we alway pick the shard for a cpu core
   // a thread is executing on.
   const size_t shard_index = pick_a_shard_int();
@@ -128,7 +128,7 @@ void mempool::pool_t::get_stats(
     for (auto &p : type_map) {
       std::string n = ceph_demangle(p.second.type_name);
       stats_t &s = (*by_type)[n];
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
       s.bytes = 0;
       s.items = 0;
       for (size_t i = 0 ; i < num_shards; ++i) {
diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
@@ -533,7 +533,7 @@ PerfCounters::PerfCounters(CephContext *cct, const std::string &name,
     m_lower_bound(lower_bound),
     m_upper_bound(upper_bound),
     m_name(name)
-#if !defined(WITH_SEASTAR) || defined(WITH_ALIEN)
+#ifndef WITH_SEASTAR
     ,
     m_lock_name(std::string("PerfCounters::") + name.c_str()),
     m_lock(ceph::make_mutex(m_lock_name))
diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
@@ -306,7 +306,7 @@ class PerfCounters
 
   int prio_adjust = 0;
 
-#if !defined(WITH_SEASTAR) || defined(WITH_ALIEN)
+#ifndef WITH_SEASTAR
   const std::string m_lock_name;
   /** Protects m_data */
   ceph::mutex m_lock;
diff --git a/src/crimson/os/alienstore/CMakeLists.txt b/src/crimson/os/alienstore/CMakeLists.txt
@@ -1,10 +1,5 @@
 include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/src/rocksdb/include")
 
-add_library(alien::cflags INTERFACE IMPORTED)
-set_target_properties(alien::cflags PROPERTIES
-  INTERFACE_COMPILE_DEFINITIONS "WITH_SEASTAR;WITH_ALIEN"
-  INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
-
 set(crimson_alien_common_srcs
   ${PROJECT_SOURCE_DIR}/src/common/admin_socket.cc
   ${PROJECT_SOURCE_DIR}/src/common/url_escape.cc
@@ -38,9 +33,9 @@ endif()
 add_library(crimson-alien-common STATIC
   ${crimson_alien_common_srcs})
 
-target_link_libraries(crimson-alien-common
-  crimson-common
-  alien::cflags)
+add_library(alien::cflags INTERFACE IMPORTED)
+set_target_properties(alien::cflags PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:Seastar::seastar,INTERFACE_INCLUDE_DIRECTORIES>)
 
 set(alien_store_srcs
   alien_store.cc
@@ -67,11 +62,14 @@ set(alien_store_srcs
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/Writer.cc
   ${PROJECT_SOURCE_DIR}/src/os/bluestore/BlueStore_debug.cc
   ${PROJECT_SOURCE_DIR}/src/os/memstore/MemStore.cc)
+
 add_library(crimson-alienstore STATIC
   ${alien_store_srcs})
 if(WITH_LTTNG)
   add_dependencies(crimson-alienstore bluestore-tp)
 endif()
+
+# For crimson-alienstore WITH_CRIMSON is not defined
 target_link_libraries(crimson-alienstore
   PRIVATE
     alien::cflags
@@ -81,5 +79,5 @@ target_link_libraries(crimson-alienstore
     crimson-alien-common
     ${BLKID_LIBRARIES}
     ${UDEV_LIBRARIES}
-    crimson
+    seastar
     blk)
diff --git a/src/global/global_context.cc b/src/global/global_context.cc
@@ -16,11 +16,11 @@
 
 #include <string.h>
 #include "common/ceph_context.h"
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/config_proxy.h"
 #endif
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 namespace ceph::global {
 int __attribute__((weak)) g_conf_set_val(const std::string& key, const std::string& s) {
   return 0;
@@ -38,14 +38,14 @@ int __attribute__((weak)) g_conf_rm_val(const std::string& key) {
 namespace TOPNSPC::global {
 CephContext *g_ceph_context = NULL;
 ConfigProxy& g_conf() {
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
   return crimson::common::local_conf();
 #else
   return g_ceph_context->_conf;
 #endif
 }
 
-#ifdef WITH_ALIEN
+#ifndef WITH_SEASTAR
 int g_conf_set_val(const std::string& key, const std::string& s)
 {
   if (g_ceph_context != NULL)
diff --git a/src/include/common_fwd.h b/src/include/common_fwd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #define TOPNSPC crimson
 #else
 #define TOPNSPC ceph
diff --git a/src/include/mempool.h b/src/include/mempool.h
@@ -26,7 +26,7 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/container/flat_map.hpp>
 
-#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR)
 #  include <sched.h>
 #endif
 
@@ -206,7 +206,7 @@ enum {
 };
 
 static size_t pick_a_shard_int() {
-#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#if defined(_GNU_SOURCE) && defined(WITH_SEASTAR)
   // a thread local storage is actually just an approximation;
   // what we truly want is a _cpu local storage_.
   //
@@ -262,7 +262,7 @@ const char *get_pool_name(pool_index_t ix);
 struct type_t {
   const char *type_name;
   size_t item_size;
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
   struct type_shard_t {
     ceph::atomic<ssize_t> items = {0}; // signed
     char __padding[128 - sizeof(ceph::atomic<ssize_t>)];
@@ -366,7 +366,7 @@ class pool_allocator {
     shard.bytes += total;
     shard.items += n;
     if (type) {
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
       type->shards[shid].items += n;
 #else
       type->items += n;
@@ -383,7 +383,7 @@ class pool_allocator {
     shard.bytes -= total;
     shard.items -= n;
     if (type) {
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
       type->shards[shid].items -= n;
 #else
       type->items -= n;
@@ -399,7 +399,7 @@ class pool_allocator {
     shard.bytes += total;
     shard.items += n;
     if (type) {
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
       type->shards[shid].items += n;
 #else
       type->items += n;
@@ -420,7 +420,7 @@ class pool_allocator {
     shard.bytes -= total;
     shard.items -= n;
     if (type) {
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
       type->shards[shid].items -= n;
 #else
       type->items -= n;
diff --git a/src/include/utime.h b/src/include/utime.h
@@ -20,7 +20,7 @@
 #include <time.h>
 #include <errno.h>
 
-#if defined(WITH_SEASTAR)
+#ifdef WITH_SEASTAR
 #include <seastar/core/lowres_clock.hh>
 #endif
 
@@ -93,7 +93,7 @@ class utime_t {
     tv.tv_nsec = std::max<common_t>((std::chrono::duration_cast<std::chrono::nanoseconds>(dur) %
 				     std::chrono::seconds(1)).count(), 0);
   }
-#if defined(WITH_SEASTAR)
+#ifdef WITH_SEASTAR
   explicit utime_t(const seastar::lowres_system_clock::time_point& t) {
     tv.tv_sec = std::chrono::duration_cast<std::chrono::seconds>(
         t.time_since_epoch()).count();
diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
@@ -35,7 +35,7 @@
 
 #include "common/debug.h"
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/libcephsqlite.cc b/src/libcephsqlite.cc
@@ -52,7 +52,7 @@ SQLITE_EXTENSION_INIT1
 #include "include/libcephsqlite.h"
 #include "SimpleRADOSStriper.h"
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/mds/Server.h b/src/mds/Server.h
@@ -26,7 +26,7 @@
 #include "CInode.h"
 #include "Mutation.h"
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
@@ -96,7 +96,7 @@
 
 #include "auth/none/AuthNoneClientHandler.h"
 
-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)
+#ifdef WITH_SEASTAR
 #include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/perf_counters_collection.h"
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc
diff --git a/src/rgw/rgw_dmclock_scheduler_ctx.h b/src/rgw/rgw_dmclock_scheduler_ctx.h
diff --git a/src/rgw/rgw_dmclock_sync_scheduler.cc b/src/rgw/rgw_dmclock_sync_scheduler.cc
diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#include "common/cmdparse.h"`
`35`	`35`	`#include "common/code_environment.h"`
`36`	`36`	`#include "msg/msg_types.h"`
`37`		`-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)`
	`37`	`+#ifdef WITH_SEASTAR`
`38`	`38`	`#include "crimson/common/config_proxy.h"`
`39`	`39`	`#include "crimson/common/perf_counters_collection.h"`
`40`	`40`	`#else`
`@@ -67,7 +67,7 @@ namespace ceph {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN)`
	`70`	`+#ifdef WITH_SEASTAR`
`71`	`71`	`namespace crimson::common {`
`72`	`72`	`class CephContext {`
`73`	`73`	`public:`
`@@ -429,7 +429,7 @@ class CephContext {`
`429`	`429`	`#endif`
`430`	`430`	`#endif // WITH_SEASTAR`
`431`	`431`
`432`		`-#if !(defined(WITH_SEASTAR) && !defined(WITH_ALIEN)) && defined(__cplusplus)`
	`432`	`+#if !defined(WITH_SEASTAR) && defined(__cplusplus)`
`433`	`433`	`namespace ceph::common {`
`434`	`434`	`inline void intrusive_ptr_add_ref(CephContext* cct)`
`435`	`435`	`{`
`@@ -441,5 +441,5 @@ inline void intrusive_ptr_release(CephContext* cct)`
`441`	`441`	`cct->put();`
`442`	`442`	`}`
`443`	`443`	`}`
`444`		`-#endif // !(defined(WITH_SEASTAR) && !defined(WITH_ALIEN)) && defined(__cplusplus)`
	`444`	`+#endif // !defined(WITH_SEASTAR) && defined(__cplusplus)`
`445`	`445`	`#endif`