coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2026-01-01 03:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

modify get to take; fix bug

Browse Source
This commit is contained in:
mutouyun 2018-11-22 21:06:15 +08:00
parent 1f50cd6ac3
commit 2f206d677e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/circ_queue.h
View File

@ -49,11 +49,15 @@ private:
return i & 0x00ff; return i & 0x00ff;
} }
static elem_t* elem(void* ptr) {
return reinterpret_cast<elem_t*>(static_cast<std::uint8_t*>(ptr) - sizeof(el_t));
}
std::uint8_t block_[block_size]; std::uint8_t block_[block_size];
public: public:
static std::uint16_t next(std::uint16_t i) { static std::uint16_t next(std::uint16_t i) {
return (id(++i) == elem_max) ? 0 : i; return (id(++i) == elem_max) ? ++i : i;
} }
circ_queue(void) { circ_queue(void) {
@ -99,12 +103,12 @@ public:
return cr_.load(std::memory_order_consume); return cr_.load(std::memory_order_consume);
} }
void* get(std::uint16_t index) { void* take(std::uint16_t index) {
return (elem_start() + id(index))->data_; return (elem_start() + id(index))->data_;
} }
void put(std::uint16_t index) { void put(void* ptr) {
auto st = elem_start() + id(index); auto st = elem(ptr);
st->head_.fetch_sub(1, std::memory_order_release); st->head_.fetch_sub(1, std::memory_order_release);
} }
}; };

9
test/test_circ_queue.cpp
View File

@ -28,8 +28,8 @@ cq_t* cq__;
void Unit::test_inst(void) { void Unit::test_inst(void) {
cq__ = new cq_t; cq__ = new cq_t;
QCOMPARE(sizeof(*cq__), static_cast<std::size_t>(cq_t::total_size)); QCOMPARE(sizeof(*cq__), static_cast<std::size_t>(cq_t::total_size));
auto a = cq__->get(1); auto a = cq__->take(1);
auto b = cq__->get(2); auto b = cq__->take(2);
QCOMPARE(static_cast<std::size_t>(static_cast<std::uint8_t const *>(b) - QCOMPARE(static_cast<std::size_t>(static_cast<std::uint8_t const *>(b) -
static_cast<std::uint8_t const *>(a)), static_cast<std::uint8_t const *>(a)),
static_cast<std::size_t>(cq_t::elem_size)); static_cast<std::size_t>(cq_t::elem_size));
@ -52,8 +52,9 @@ void Unit::test_producer(void) {
int i = 0; int i = 0;
do { do {
while (cur != cq__->cursor()) { while (cur != cq__->cursor()) {
int d = *static_cast<const int*>(cq__->get(cur)); auto p = static_cast<int*>(cq__->take(cur));
cq__->put(cur); int d = *p;
cq__->put(p);
if (d < 0) return; if (d < 0) return;
cur = cq__->next(cur); cur = cq__->next(cur);
list.push_back(d); list.push_back(d);