Skip to content

Commit 27d2fbd

Browse files
committed
Rename queue_t -> queue_tm
1 parent a69e09b commit 27d2fbd

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ work like a natural part of C++ and a portable implementation that can be used
1515
today for prototyping parallel algorithms using transactional memory.
1616

1717
See [`synopsis.hpp`](provides/include/trade_v1/synopsis.hpp) for the API and
18-
[`queue.hpp`](internals/include/testing/queue.hpp) for a transactional queue
19-
implementation written for testing purposes.
18+
[`queue_tm.hpp`](internals/include/testing/queue_tm.hpp) for a transactional
19+
queue implementation written for testing purposes.
2020

2121
## <a id="contents"></a> [](#contents) [Contents](#contents)
2222

@@ -190,7 +190,7 @@ For example, a transactional dynamic queue data structure could be defined with
190190
the help of `std::shared_ptr` as
191191

192192
```c++
193-
template <class Value> struct queue_t {
193+
template <class Value> struct queue_tm {
194194
using value_t = Value;
195195
// ...
196196
private:

internals/include/testing/queue.hpp renamed to internals/include/testing/queue_tm.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
namespace testing {
1212

1313
/// A transactional queue for testing purposes.
14-
template <class Value> struct queue_t {
14+
template <class Value> struct queue_tm {
1515
using value_t = Value;
1616

17-
queue_t() = default;
17+
queue_tm() = default;
1818

19-
queue_t(const queue_t &) = delete;
20-
queue_t &operator=(const queue_t &) = delete;
19+
queue_tm(const queue_tm &) = delete;
20+
queue_tm &operator=(const queue_tm &) = delete;
2121

2222
size_t size() {
2323
return trade::atomically(trade::assume_readonly, [&]() {
@@ -104,6 +104,6 @@ template <class Value> struct queue_t {
104104
trade::atom<std::shared_ptr<node_t>> m_last;
105105
};
106106

107-
template <class Value> std::atomic<size_t> queue_t<Value>::s_live_nodes = 0;
107+
template <class Value> std::atomic<size_t> queue_tm<Value>::s_live_nodes = 0;
108108

109109
} // namespace testing

internals/testing/dynamic_test.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "testing/queue.hpp"
1+
#include "testing/queue_tm.hpp"
22

33
#include "testing_v1/test.hpp"
44

@@ -17,7 +17,7 @@ auto dynamic_test = test([]() {
1717

1818
atom<size_t> n_threads_started = 0, n_threads_stopped = 0;
1919

20-
queue_t<int> queues[2];
20+
queue_tm<int> queues[2];
2121

2222
constexpr size_t n_values = 10;
2323
for (size_t i = 0; i < n_values; ++i)
@@ -35,8 +35,8 @@ auto dynamic_test = test([]() {
3535
while (n) {
3636
int r = std::rand();
3737

38-
queue_t<int> &q1 = queues[r & 1];
39-
queue_t<int> &q2 = queues[(r & 2) >> 1];
38+
queue_tm<int> &q1 = queues[r & 1];
39+
queue_tm<int> &q2 = queues[(r & 2) >> 1];
4040

4141
// Here we perform a composed transaction that tries to move a value
4242
// from one queue to (possibly) another queue atomically:
@@ -85,7 +85,7 @@ auto dynamic_test = test([]() {
8585
verify(values[i] == static_cast<int>(i));
8686

8787
{
88-
queue_t<int> q;
88+
queue_tm<int> q;
8989
q.push_back(1);
9090

9191
{
@@ -120,5 +120,5 @@ auto dynamic_test = test([]() {
120120
verify(0 == q.size());
121121
}
122122

123-
verify(!queue_t<int>::s_live_nodes);
123+
verify(!queue_tm<int>::s_live_nodes);
124124
});

internals/testing/retry_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "testing/queue.hpp"
1+
#include "testing/queue_tm.hpp"
22

33
#include "testing_v1/test.hpp"
44

@@ -10,7 +10,7 @@ using namespace trade_v1;
1010
using namespace testing;
1111

1212
auto retry_test = test([]() {
13-
queue_t<size_t> queues[2];
13+
queue_tm<size_t> queues[2];
1414

1515
queues[0].push_back(0);
1616

0 commit comments

Comments
 (0)