sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Driver: Add general predicate parameter for waitForRx

Browse Source
This commit is contained in:
Yasser Yassine
2024-05-28 18:21:22 +00:00
parent 659fcf633c
commit 77928dc93d
10 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/driver.cpp
+10 -3
View File
@@ -8,7 +8,7 @@
using namespace icsneo;
bool Driver::writeToReadBuffer(const uint8_t* buf, size_t numReceived) {
bool Driver::pushRx(const uint8_t* buf, size_t numReceived) {
bool ret = readBuffer.write(buf, numReceived);
if(hasRxWaitRequest) {
@@ -18,11 +18,18 @@ bool Driver::writeToReadBuffer(const uint8_t* buf, size_t numReceived) {
return ret;
}
bool Driver::waitForRx(size_t minBytes, std::chrono::milliseconds timeout) {
bool Driver::waitForRx(size_t limit, std::chrono::milliseconds timeout) {
return waitForRx([limit, this]() {
return readBuffer.size() >= limit;
}, timeout);
}
bool Driver::waitForRx(std::function<bool()> predicate, std::chrono::milliseconds timeout) {
std::unique_lock<std::mutex> lk(rxWaitMutex);
hasRxWaitRequest = true;
auto ret = rxWaitRequestCv.wait_for(lk, timeout, [this, minBytes]{ return readBuffer.size() >= minBytes; });
auto ret = rxWaitRequestCv.wait_for(lk, timeout, predicate);
hasRxWaitRequest = false;
return ret;