Skip to content

Commit

Permalink
rename class
Browse files Browse the repository at this point in the history
  • Loading branch information
EfesX committed Jun 4, 2024
1 parent 285792d commit 7a24827
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
22 changes: 11 additions & 11 deletions include/queue_async.hpp → include/ts_queue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

using namespace std::chrono_literals;

namespace efesx::queue_async {
namespace efesx::ts_queue {

using storage_t = queue::detail::proto_storage;

Expand All @@ -19,19 +19,19 @@ using node_p_t = storage_t::node_ptr;
using node_value_t = node_t::DataCase;

template<typename BasicQueue>
class basic_queue_async {
class basic_ts_queue {
private:
BasicQueue queue;
std::shared_mutex mtx;

public:
basic_queue_async() = default;
~basic_queue_async() = default;
basic_ts_queue() = default;
~basic_ts_queue() = default;

basic_queue_async(const basic_queue_async&) = delete;
basic_queue_async(basic_queue_async&&) = delete;
basic_queue_async& operator=(basic_queue_async&&) = delete;
basic_queue_async operator=(const basic_queue_async&) = delete;
basic_ts_queue(const basic_ts_queue&) = delete;
basic_ts_queue(basic_ts_queue&&) = delete;
basic_ts_queue& operator=(basic_ts_queue&&) = delete;
basic_ts_queue operator=(const basic_ts_queue&) = delete;

/**
* @brief Put any (any standard type in C++, except classes, structs and enums) data to queue.
Expand Down Expand Up @@ -99,11 +99,11 @@ class basic_queue_async {
return queue.load_from_disk(file);
}

bool operator==(const basic_queue_async<BasicQueue>& oth) const {
bool operator==(const basic_ts_queue<BasicQueue>& oth) const {
return (queue == oth.queue);
}
};

using queue_async = basic_queue_async<efesx::queue::basic_queue<storage_t>>;
using ts_queue = basic_ts_queue<efesx::queue::basic_queue<storage_t>>;

}; // namespace efesx::queue_async
}; // namespace efesx::ts_queue
6 changes: 3 additions & 3 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ target_link_libraries(proto_storage_test ${PROJECT_NAME} ${GTEST_LINK} hw_proto)
add_executable(queue_test queue_test.cc)
target_link_libraries(queue_test ${PROJECT_NAME} ${GTEST_LINK} hw_proto)

add_executable(queue_async_test queue_async_test.cc)
target_link_libraries(queue_async_test ${PROJECT_NAME} ${GTEST_LINK} hw_proto)
add_executable(ts_queue_test ts_queue_test.cc)
target_link_libraries(ts_queue_test ${PROJECT_NAME} ${GTEST_LINK} hw_proto)

enable_testing()
add_test(meta_test meta_test)
add_test(proto_storage_test proto_storage_test)
add_test(queue_test queue_test)
add_test(queue_async_test queue_async_test)
add_test(ts_queue_test ts_queue_test)

24 changes: 12 additions & 12 deletions tests/queue_async_test.cc → tests/ts_queue_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
#include <vector>
#include <cstdlib>

#include "queue_async.hpp"
#include "ts_queue.hpp"
#include "utils.hpp"

#include <thread>

using namespace efesx::queue_async;
using namespace efesx::ts_queue;

TEST(QueueAsyncTest, Simple)
{
queue_async queue;
ts_queue queue;
queue.enqueue(0, 5);
queue.enqueue(0, -25);
queue.enqueue(0, 65.8);
Expand All @@ -25,7 +25,7 @@ TEST(QueueAsyncTest, Simple)

queue.save_to_disk("asynctest.simple.data");

queue_async r_queue;
ts_queue r_queue;
r_queue.load_from_disk("asynctest.simple.data");

EXPECT_EQ(queue, r_queue);
Expand All @@ -36,8 +36,8 @@ class Fixture : public ::testing::TestWithParam<int>{};
TEST_P(Fixture, SPSC){
const int NUM_DATA = 100000;

queue_async ref_queue;
queue_async p_queue;
ts_queue ref_queue;
ts_queue p_queue;

{
std::thread producer([&](){
Expand All @@ -49,7 +49,7 @@ TEST_P(Fixture, SPSC){
}
});

queue_async c_queue;
ts_queue c_queue;

std::thread consumer([&](){
for(auto i = 0; i < NUM_DATA; i++){
Expand All @@ -68,7 +68,7 @@ TEST_P(Fixture, SPSC){
EXPECT_EQ(ref_queue, c_queue);
}
{
queue_async queue;
ts_queue queue;
queue.load_from_disk("asynctest.spsc.data");

EXPECT_EQ(ref_queue, queue);
Expand All @@ -81,9 +81,9 @@ TEST_P(Fixture, MPMC){
const int NUM_CONSUMERS = GetParam() + 1;
const int NUM_PRODUCERS = GetParam() + 1;

queue_async p_queue;
queue_async c_queue;
queue_async ref_queue;
ts_queue p_queue;
ts_queue c_queue;
ts_queue ref_queue;

std::vector<std::thread> consumers;
std::vector<std::thread> producers;
Expand Down Expand Up @@ -135,7 +135,7 @@ TEST_P(Fixture, MPMC){

c_queue.save_to_disk("asynctest.mpmc.data");

queue_async r_queue;
ts_queue r_queue;
r_queue.load_from_disk("asynctest.mpmc.data");
EXPECT_EQ(r_queue, c_queue);

Expand Down

0 comments on commit 7a24827

Please sign in to comment.