From 9bd8813d46cf333322a27fb3392aad6985d43277 Mon Sep 17 00:00:00 2001
From: mutouyun <orz@orzz.org>
Date: Sat, 18 Nov 2023 16:10:24 +0800
Subject: [PATCH] rename `concur::queue` => ``concur::circular_queue`

---
 benchmark/benchmark_concur.cpp                     |  8 ++++----
 include/libconcur/{queue.h => circular_queue.h}    |  2 +-
 ...ur_queue.cpp => test_concur_circular_queue.cpp} | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename include/libconcur/{queue.h => circular_queue.h} (97%)
 rename test/concur/{test_concur_queue.cpp => test_concur_circular_queue.cpp} (93%)

diff --git a/benchmark/benchmark_concur.cpp b/benchmark/benchmark_concur.cpp
index 24c6331..046510a 100644
--- a/benchmark/benchmark_concur.cpp
+++ b/benchmark/benchmark_concur.cpp
@@ -6,13 +6,13 @@
 
 #include "benchmark/benchmark.h"
 
-#include "libconcur/queue.h"
+#include "libconcur/circular_queue.h"
 
 namespace {
 
 void concur_queue_rtt(benchmark::State &state) {
   using namespace concur;
-  queue<std::int64_t, relation::single, relation::single> que [2];
+  circular_queue<std::int64_t, relation::single, relation::single> que [2];
   std::atomic_bool stop = false;
   auto producer = std::async(std::launch::async, [&stop, &que] {
     for (std::int64_t i = 0; !stop.load(std::memory_order_relaxed); ++i) {
@@ -35,7 +35,7 @@ void concur_queue_rtt(benchmark::State &state) {
 
 void concur_queue_1v1(benchmark::State &state) {
   using namespace concur;
-  queue<std::int64_t, relation::single, relation::single> que;
+  circular_queue<std::int64_t, relation::single, relation::single> que;
   std::atomic_bool stop = false;
   auto producer = std::async(std::launch::async, [&stop, &que] {
     for (std::int64_t i = 0; !stop.load(std::memory_order_relaxed); ++i) {
@@ -56,7 +56,7 @@ void concur_queue_1v1(benchmark::State &state) {
 void concur_queue_NvN(benchmark::State &state) {
   using namespace concur;
 
-  static queue<std::int64_t, relation::multi, relation::multi> que;
+  static circular_queue<std::int64_t, relation::multi, relation::multi> que;
   static std::atomic_int run = 0;
   static std::vector<std::thread> prods;
 
diff --git a/include/libconcur/queue.h b/include/libconcur/circular_queue.h
similarity index 97%
rename from include/libconcur/queue.h
rename to include/libconcur/circular_queue.h
index a8daed0..d77a556 100644
--- a/include/libconcur/queue.h
+++ b/include/libconcur/circular_queue.h
@@ -13,7 +13,7 @@ LIBCONCUR_NAMESPACE_BEG_
 
 template <typename T, typename PRelationT = relation::multi
                     , typename CRelationT = relation::multi>
-class queue
+class circular_queue
   : public data_model<T, trans::unicast, PRelationT, CRelationT> {
 
   using base_t = data_model<T, trans::unicast, PRelationT, CRelationT>;
diff --git a/test/concur/test_concur_queue.cpp b/test/concur/test_concur_circular_queue.cpp
similarity index 93%
rename from test/concur/test_concur_queue.cpp
rename to test/concur/test_concur_circular_queue.cpp
index 458dfa6..018b79c 100644
--- a/test/concur/test_concur_queue.cpp
+++ b/test/concur/test_concur_circular_queue.cpp
@@ -7,14 +7,14 @@
 
 #include "gtest/gtest.h"
 
-#include "libconcur/queue.h"
+#include "libconcur/circular_queue.h"
 #include "libimp/log.h"
 #include "libimp/nameof.h"
 
 using namespace concur;
 
-TEST(queue, construct) {
-  using queue_t = queue<int>;
+TEST(circular_queue, construct) {
+  using queue_t = circular_queue<int>;
   queue_t q1;
   EXPECT_TRUE(q1.valid());
   EXPECT_TRUE(q1.empty());
@@ -25,7 +25,7 @@ namespace {
 
 template <typename PR, typename CR>
 void test_queue_basic() {
-  using queue_t = queue<int, PR, CR>;
+  using queue_t = circular_queue<int, PR, CR>;
   queue_t q1;
   EXPECT_TRUE(q1.valid());
   EXPECT_TRUE(q1.empty());
@@ -74,7 +74,7 @@ void test_queue_basic() {
 
 } // namespace
 
-TEST(queue, push_pop) {
+TEST(circular_queue, push_pop) {
   test_queue_basic<relation::single, relation::single>();
   test_queue_basic<relation::single, relation::multi >();
   test_queue_basic<relation::multi , relation::multi >();
@@ -91,7 +91,7 @@ void test_queue(std::size_t np, std::size_t nc) {
     std::uint64_t n;
     std::uint64_t i;
   };
-  queue<Data, PR, CR> que;
+  circular_queue<Data, PR, CR> que;
 
   constexpr static std::uint32_t loop_size = 10'0000;
 
@@ -139,7 +139,7 @@ void test_queue(std::size_t np, std::size_t nc) {
 
 } // namespace
 
-TEST(queue, multi_thread) {
+TEST(circular_queue, multi_thread) {
   using namespace concur;
 
   /// \brief 1-1