coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2025-12-06 16:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs of circ_queue

Browse Source
This commit is contained in:
mutouyun 2018-11-29 00:14:37 +08:00
parent c9ce4b466a
commit 7d91b187fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/circ_queue.h
View File

@ -36,8 +36,6 @@ public:
swap(rhs); swap(rhs);
} }
~queue(void) { detach(); }
void swap(queue& rhs) { void swap(queue& rhs) {
std::swap(elems_ , rhs.elems_ ); std::swap(elems_ , rhs.elems_ );
std::swap(cursor_, rhs.cursor_); std::swap(cursor_, rhs.cursor_);
@ -96,7 +94,7 @@ public:
while (cursor_ == elems_->cursor()) { while (cursor_ == elems_->cursor()) {
std::this_thread::yield(); std::this_thread::yield();
} }
auto item_ptr = static_cast<T*>(elems_->take(cursor_)); auto item_ptr = static_cast<T*>(elems_->take(cursor_++));
T item = *item_ptr; T item = *item_ptr;
elems_->put(item_ptr); elems_->put(item_ptr);
return item; return item;

6
test/test_circ.cpp
View File

@ -88,7 +88,9 @@ struct test_confirm {
int lcount_; int lcount_;
test_confirm(int M) { test_confirm(int M) {
list_ = new std::remove_reference_t<decltype(*list_)>[lcount_ = M]; list_ = new std::remove_reference_t<decltype(*list_)>[
static_cast<std::size_t>(lcount_ = M)
];
} }
~test_confirm(void) { ~test_confirm(void) {
@ -315,7 +317,7 @@ void Unit::test_queue(void) {
queue.attch(cq); queue.attch(cq);
QVERIFY(queue.detach() != nullptr); QVERIFY(queue.detach() != nullptr);
test_prod_cons<1, 1>((ipc::circ::queue<msg_t>*)nullptr); test_prod_cons<1, 3>((ipc::circ::queue<msg_t>*)nullptr);
} }
} // internal-linkage } // internal-linkage