aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/salticidae/buffer.h4
-rw-r--r--include/salticidae/event.h22
2 files changed, 21 insertions, 5 deletions
diff --git a/include/salticidae/buffer.h b/include/salticidae/buffer.h
index 3f415c9..2324d8b 100644
--- a/include/salticidae/buffer.h
+++ b/include/salticidae/buffer.h
@@ -131,7 +131,9 @@ struct MPSCWriteBuffer {
}
void push(bytearray_t &&data) {
- buffer.enqueue(buffer_entry_t(std::move(data)));
+ buffer_entry_t d(std::move(data));
+ // TODO: better bounded buffer impl
+ while (!buffer.try_enqueue(d)) {}
}
bytearray_t move_pop() {
diff --git a/include/salticidae/event.h b/include/salticidae/event.h
index 649cfdd..fafa884 100644
--- a/include/salticidae/event.h
+++ b/include/salticidae/event.h
@@ -578,14 +578,28 @@ class MPSCQueueEventDriven: public MPSCQueue<T> {
template<typename U>
bool enqueue(U &&e) {
static const uint64_t dummy = 1;
- bool ret = MPSCQueue<T>::enqueue(std::forward<U>(e));
+ MPSCQueue<T>::enqueue(std::forward<U>(e));
// memory barrier here, so any load/store in enqueue must be finialized
if (wait_sig.exchange(false, std::memory_order_acq_rel))
{
SALTICIDAE_LOG_DEBUG("mpsc notify");
write(fd, &dummy, 8);
}
- return ret;
+ return true;
+ }
+
+ template<typename U>
+ bool try_enqueue(U &&e) {
+ static const uint64_t dummy = 1;
+ if (!MPMCQueue<T>::try_enqueue(std::forward<U>(e)))
+ return false;
+ // memory barrier here, so any load/store in enqueue must be finialized
+ if (wait_sig.exchange(false, std::memory_order_acq_rel))
+ {
+ SALTICIDAE_LOG_DEBUG("mpsc notify");
+ write(fd, &dummy, 8);
+ }
+ return true;
}
};
@@ -629,14 +643,14 @@ class MPMCQueueEventDriven: public MPMCQueue<T> {
template<typename U>
bool enqueue(U &&e) {
static const uint64_t dummy = 1;
- bool ret = MPMCQueue<T>::enqueue(std::forward<U>(e));
+ MPMCQueue<T>::enqueue(std::forward<U>(e));
// memory barrier here, so any load/store in enqueue must be finialized
if (wait_sig.exchange(false, std::memory_order_acq_rel))
{
SALTICIDAE_LOG_DEBUG("mpsc notify");
write(fd, &dummy, 8);
}
- return ret;
+ return true;
}
};