diff options
| author | 2021-02-06 19:13:03 +0000 | |
|---|---|---|
| committer | 2021-02-06 19:16:00 +0000 | |
| commit | 8d002659987cd45cb77896fbb173159398138e73 (patch) | |
| tree | 35d6d7a67ebccfbc78f6e0d07600ea9ceb0d909b /src/tests/common/ring_buffer.cpp | |
| parent | arm_dynarmic_32: Print out CPSR.T on exception (diff) | |
| download | yuzu-8d002659987cd45cb77896fbb173159398138e73.tar.gz yuzu-8d002659987cd45cb77896fbb173159398138e73.tar.xz yuzu-8d002659987cd45cb77896fbb173159398138e73.zip | |
ring_buffer: Remove granularity template argument
Non-obvious bug in RingBuffer::Push(std::vector<T>&) when granularity != 1
Just remove it altogether because we do not have a use for granularity != 1
Diffstat (limited to 'src/tests/common/ring_buffer.cpp')
| -rw-r--r-- | src/tests/common/ring_buffer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/common/ring_buffer.cpp b/src/tests/common/ring_buffer.cpp index 54def22da..903626e4b 100644 --- a/src/tests/common/ring_buffer.cpp +++ b/src/tests/common/ring_buffer.cpp | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | namespace Common { | 14 | namespace Common { |
| 15 | 15 | ||
| 16 | TEST_CASE("RingBuffer: Basic Tests", "[common]") { | 16 | TEST_CASE("RingBuffer: Basic Tests", "[common]") { |
| 17 | RingBuffer<char, 4, 1> buf; | 17 | RingBuffer<char, 4> buf; |
| 18 | 18 | ||
| 19 | // Pushing values into a ring buffer with space should succeed. | 19 | // Pushing values into a ring buffer with space should succeed. |
| 20 | for (std::size_t i = 0; i < 4; i++) { | 20 | for (std::size_t i = 0; i < 4; i++) { |
| @@ -77,7 +77,7 @@ TEST_CASE("RingBuffer: Basic Tests", "[common]") { | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | TEST_CASE("RingBuffer: Threaded Test", "[common]") { | 79 | TEST_CASE("RingBuffer: Threaded Test", "[common]") { |
| 80 | RingBuffer<char, 4, 2> buf; | 80 | RingBuffer<char, 8> buf; |
| 81 | const char seed = 42; | 81 | const char seed = 42; |
| 82 | const std::size_t count = 1000000; | 82 | const std::size_t count = 1000000; |
| 83 | std::size_t full = 0; | 83 | std::size_t full = 0; |
| @@ -92,8 +92,8 @@ TEST_CASE("RingBuffer: Threaded Test", "[common]") { | |||
| 92 | std::array<char, 2> value = {seed, seed}; | 92 | std::array<char, 2> value = {seed, seed}; |
| 93 | std::size_t i = 0; | 93 | std::size_t i = 0; |
| 94 | while (i < count) { | 94 | while (i < count) { |
| 95 | if (const std::size_t c = buf.Push(&value[0], 1); c > 0) { | 95 | if (const std::size_t c = buf.Push(&value[0], 2); c > 0) { |
| 96 | REQUIRE(c == 1U); | 96 | REQUIRE(c == 2U); |
| 97 | i++; | 97 | i++; |
| 98 | next_value(value); | 98 | next_value(value); |
| 99 | } else { | 99 | } else { |
| @@ -107,7 +107,7 @@ TEST_CASE("RingBuffer: Threaded Test", "[common]") { | |||
| 107 | std::array<char, 2> value = {seed, seed}; | 107 | std::array<char, 2> value = {seed, seed}; |
| 108 | std::size_t i = 0; | 108 | std::size_t i = 0; |
| 109 | while (i < count) { | 109 | while (i < count) { |
| 110 | if (const std::vector<char> v = buf.Pop(1); v.size() > 0) { | 110 | if (const std::vector<char> v = buf.Pop(2); v.size() > 0) { |
| 111 | REQUIRE(v.size() == 2U); | 111 | REQUIRE(v.size() == 2U); |
| 112 | REQUIRE(v[0] == value[0]); | 112 | REQUIRE(v[0] == value[0]); |
| 113 | REQUIRE(v[1] == value[1]); | 113 | REQUIRE(v[1] == value[1]); |