summaryrefslogtreecommitdiff
path: root/src/common/concurrent_ring_buffer.h
diff options
context:
space:
mode:
authorGravatar archshift2015-01-20 17:16:47 -0800
committerGravatar archshift2015-02-10 18:30:31 -0800
commitef24e72b2618806f64345544fa46c84f3f494890 (patch)
treefca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/common/concurrent_ring_buffer.h
parentGSP: Fixed typo in SignalInterrupt (diff)
downloadyuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.gz
yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.xz
yuzu-ef24e72b2618806f64345544fa46c84f3f494890.zip
Asserts: break/crash program, fit to style guide; log.h->assert.h
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time) As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing) Also removed some GEKKO cruft.
Diffstat (limited to 'src/common/concurrent_ring_buffer.h')
-rw-r--r--src/common/concurrent_ring_buffer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/common/concurrent_ring_buffer.h b/src/common/concurrent_ring_buffer.h
index 311bb01f4..fc18e6c86 100644
--- a/src/common/concurrent_ring_buffer.h
+++ b/src/common/concurrent_ring_buffer.h
@@ -11,7 +11,6 @@
11#include <thread> 11#include <thread>
12 12
13#include "common/common.h" // for NonCopyable 13#include "common/common.h" // for NonCopyable
14#include "common/log.h" // for _dbg_assert_
15 14
16namespace Common { 15namespace Common {
17 16
@@ -93,7 +92,7 @@ public:
93 return QUEUE_CLOSED; 92 return QUEUE_CLOSED;
94 } 93 }
95 } 94 }
96 _dbg_assert_(Common, CanRead()); 95 DEBUG_ASSERT(CanRead());
97 return PopInternal(dest, dest_len); 96 return PopInternal(dest, dest_len);
98 } 97 }
99 98
@@ -119,7 +118,7 @@ private:
119 size_t PopInternal(T* dest, size_t dest_len) { 118 size_t PopInternal(T* dest, size_t dest_len) {
120 size_t output_count = 0; 119 size_t output_count = 0;
121 while (output_count < dest_len && CanRead()) { 120 while (output_count < dest_len && CanRead()) {
122 _dbg_assert_(Common, CanRead()); 121 DEBUG_ASSERT(CanRead());
123 122
124 T* item = &Data()[reader_index]; 123 T* item = &Data()[reader_index];
125 T out_val = std::move(*item); 124 T out_val = std::move(*item);