remove moodycamel namespace (#737)

include/ylt/coro_io/detail/client_queue.hpp

@@ -18,6 +18,7 @@
 
 #include "ylt/util/concurrentqueue.h"
 namespace coro_io::detail {
+using namespace ylt::detail;
 template <typename client_t>
 class client_queue {
   moodycamel::ConcurrentQueue<client_t> queue_[2];

include/ylt/easylog/appender.hpp

@@ -402,7 +402,7 @@ class appender {
 
   std::mutex que_mtx_;
 
-  moodycamel::ConcurrentQueue<record_t> queue_;
+  ylt::detail::moodycamel::ConcurrentQueue<record_t> queue_;
   std::thread write_thd_;
   std::condition_variable cnd_;
   std::atomic<bool> stop_ = false;

include/ylt/metric/summary.hpp

@@ -93,15 +93,16 @@ class summary_t : public metric_t {
 
   struct block_t {
     std::atomic<bool> stop_ = false;
-    moodycamel::ConcurrentQueue<double> sample_queue_;
+    ylt::detail::moodycamel::ConcurrentQueue<double> sample_queue_;
     std::shared_ptr<TimeWindowQuantiles> quantile_values_;
     std::uint64_t count_;
     double sum_;
   };
 
   struct labels_block_t {
     std::atomic<bool> stop_ = false;
-    moodycamel::ConcurrentQueue<summary_label_sample> sample_queue_;
+    ylt::detail::moodycamel::ConcurrentQueue<summary_label_sample>
+        sample_queue_;
     metric_hash_map<std::shared_ptr<TimeWindowQuantiles>>
         label_quantile_values_;
     metric_hash_map<uint64_t> label_count_;

include/ylt/util/concurrentqueue.h

@@ -100,7 +100,7 @@
 
 // Platform-specific definitions of a numeric thread ID type and an invalid
 // value
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 template <typename thread_id_t>
 struct thread_id_converter {
@@ -109,22 +109,22 @@ struct thread_id_converter {
   static thread_id_hash_t prehash(thread_id_t const& x) { return x; }
 };
 }  // namespace details
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 #if defined(MCDBGQ_USE_RELACY)
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 typedef std::uint32_t thread_id_t;
 static const thread_id_t invalid_thread_id = 0xFFFFFFFFU;
 static const thread_id_t invalid_thread_id2 = 0xFFFFFFFEU;
 static inline thread_id_t thread_id() { return rl::thread_index(); }
 }  // namespace details
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 #elif defined(_WIN32) || defined(__WINDOWS__) || defined(__WIN32__)
 // No sense pulling in windows.h in a header, we'll manually declare the
 // function we use and rely on backwards-compatibility for this not to break
 extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(
     void);
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 static_assert(sizeof(unsigned long) == sizeof(std::uint32_t),
               "Expected size of unsigned long to be 32 bits on Windows");
@@ -139,11 +139,11 @@ static inline thread_id_t thread_id() {
   return static_cast<thread_id_t>(::GetCurrentThreadId());
 }
 }  // namespace details
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 #elif defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) || \
     (defined(__APPLE__) && TARGET_OS_IPHONE) ||                      \
     defined(MOODYCAMEL_NO_THREAD_LOCAL)
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 static_assert(sizeof(std::thread::id) == 4 || sizeof(std::thread::id) == 8,
               "std::thread::id is expected to be either 4 or 8 bytes");
@@ -199,7 +199,7 @@ struct thread_id_converter<thread_id_t> {
 // Assume C++11 compliant compiler
 #define MOODYCAMEL_THREADLOCAL thread_local
 #endif
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 typedef std::uintptr_t thread_id_t;
 static const thread_id_t invalid_thread_id = 0;  // Address can't be nullptr
@@ -330,7 +330,7 @@ inline thread_id_t thread_id() {
 #endif
 #endif
 
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 #ifndef MOODYCAMEL_ALIGNAS
 // VS2013 doesn't support alignas or alignof, and align() requires a constant
@@ -390,7 +390,7 @@ struct identity {
 #endif
 #endif
 }  // namespace details
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 
 // TSAN can false report races in lock-free code.  To enable TSAN to be used
 // from projects that use this one, we can apply per-function compile-time
@@ -405,7 +405,7 @@ struct identity {
 #endif  // TSAN
 
 // Compiler-specific likely/unlikely hints
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 #if defined(__GNUC__)
 static inline bool(likely)(bool x) { return __builtin_expect((x), true); }
@@ -415,13 +415,13 @@ static inline bool(likely)(bool x) { return x; }
 static inline bool(unlikely)(bool x) { return x; }
 #endif
 }  // namespace details
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 
 #ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
 #include "internal/concurrentqueue_internal_debug.h"
 #endif
 
-namespace moodycamel {
+namespace ylt::detail::moodycamel {
 namespace details {
 template <typename T>
 struct const_numeric_max {
@@ -937,8 +937,8 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a,
 template <typename T, typename Traits = ConcurrentQueueDefaultTraits>
 class ConcurrentQueue {
  public:
-  typedef ::moodycamel::ProducerToken producer_token_t;
-  typedef ::moodycamel::ConsumerToken consumer_token_t;
+  typedef ::ylt::detail::moodycamel::ProducerToken producer_token_t;
+  typedef ::ylt::detail::moodycamel::ConsumerToken consumer_token_t;
 
   typedef typename Traits::index_t index_t;
   typedef typename Traits::size_t size_t;
@@ -4388,7 +4388,7 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a,
   a.swap(b);
 }
 
-}  // namespace moodycamel
+}  // namespace ylt::detail::moodycamel
 
 #if defined(_MSC_VER) && (!defined(_HAS_CXX17) || !_HAS_CXX17)
 #pragma warning(pop)

src/metric/tests/test_metric.cpp

@@ -1034,7 +1034,7 @@ TEST_CASE("test serialize with multiple threads") {
 #if defined(__GNUC__)
 TEST_CASE("test system metric") {
   start_system_metric();
-  detail::ylt_stat();
+  metric::detail::ylt_stat();
 
   auto s = system_metric_manager::instance().serialize_static();
   std::cout << s;