From 77a6c3512a44dfe6540dde71946e6484fe4f173f Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期一, 10 五月 2021 16:05:28 +0800
Subject: [PATCH] test lock code.
---
src/socket.cpp | 138 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 43 deletions(-)
diff --git a/src/socket.cpp b/src/socket.cpp
index 2c55665..6231579 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -24,47 +24,50 @@
using namespace bhome_msg;
using namespace bhome_shm;
-namespace
+ShmSocket::ShmSocket(Shm &shm, const MQId id, const int len) :
+ run_(false), mq_(id, shm, len)
{
-
-} // namespace
-
-ShmSocket::ShmSocket(Shm &shm, const MQId &id, const int len) :
- shm_(shm), run_(false), mq_(id, shm, len)
+ Start();
+}
+ShmSocket::ShmSocket(Shm &shm, const bool create_or_else_find, const MQId id, const int len) :
+ run_(false), mq_(id, create_or_else_find, shm, len)
{
+ Start();
}
ShmSocket::ShmSocket(bhome_shm::SharedMemory &shm, const int len) :
- shm_(shm), run_(false), mq_(shm, len) {}
+ run_(false), mq_(shm, len)
+{
+ Start();
+}
ShmSocket::~ShmSocket()
{
- Stop(); //TODO should stop in sub class, incase thread access sub class data.
+ Stop();
}
-bool ShmSocket::Start(int nworker, const RecvCB &onData, const IdleCB &onIdle)
+bool ShmSocket::Start(const RawRecvCB &onData, const IdleCB &onIdle, int nworker)
{
- auto onRecvWithPerMsgCB = [this, onData](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
- RecvCB cb;
- if (per_msg_cbs_->Find(head.msg_id(), cb)) {
- cb(socket, imsg, head);
- } else if (onData) {
- onData(socket, imsg, head);
- } else { // else ignored, or dropped
- }
- };
-
- auto recvLoopBody = [this, onRecvWithPerMsgCB, onIdle]() {
- try {
- MsgI imsg;
- if (mq().Recv(imsg, 10)) {
- DEFER1(imsg.Release(shm()));
- BHMsgHead head;
- if (imsg.ParseHead(head)) {
- onRecvWithPerMsgCB(*this, imsg, head);
- }
+ auto ioProc = [this, onData, onIdle]() {
+ auto DoSend = [this]() { return send_buffer_.TrySend(mq()); };
+ auto DoRecv = [=] {
+ // do not recv if no cb is set.
+ if (!onData) {
+ return false;
}
- if (onIdle) {
- onIdle(*this);
+ auto onMsg = [&](MsgI &imsg) {
+ DEFER1(imsg.Release());
+ onData(*this, imsg);
+ };
+ MsgI imsg;
+ return mq().TryRecv(imsg) ? (onMsg(imsg), true) : false;
+ };
+
+ try {
+ bool more_to_send = DoSend();
+ bool more_to_recv = DoRecv();
+ if (onIdle) { onIdle(*this); }
+ if (!more_to_send && !more_to_recv) {
+ robust::QuickSleep();
}
} catch (...) {
}
@@ -75,7 +78,57 @@
run_.store(true);
for (int i = 0; i < nworker; ++i) {
- workers_.emplace_back([this, recvLoopBody]() { while (run_) { recvLoopBody(); } });
+ workers_.emplace_back([this, ioProc]() { while (run_) { ioProc(); } });
+ }
+ return true;
+}
+
+bool ShmSocket::Start(int nworker, const RecvCB &onData, const IdleCB &onIdle)
+{
+ auto ioProc = [this, onData, onIdle]() {
+ auto DoSend = [this]() { return send_buffer_.TrySend(mq()); };
+ auto DoRecv = [=] {
+ auto onRecvWithPerMsgCB = [this, onData](ShmSocket &socket, MsgI &imsg, BHMsgHead &head) {
+ RecvCB cb;
+ if (per_msg_cbs_->Pick(head.msg_id(), cb)) {
+ cb(socket, imsg, head);
+ } else if (onData) {
+ onData(socket, imsg, head);
+ }
+ };
+
+ // do not recv if no cb is set.
+ if (!onData && per_msg_cbs_->empty()) {
+ return false;
+ }
+ auto onMsg = [&](MsgI &imsg) {
+ DEFER1(imsg.Release());
+ BHMsgHead head;
+ if (imsg.ParseHead(head)) {
+ onRecvWithPerMsgCB(*this, imsg, head);
+ }
+ };
+ MsgI imsg;
+ return mq().TryRecv(imsg) ? (onMsg(imsg), true) : false;
+ };
+
+ try {
+ bool more_to_send = DoSend();
+ bool more_to_recv = DoRecv();
+ if (onIdle) { onIdle(*this); }
+ if (!more_to_send && !more_to_recv) {
+ robust::QuickSleep();
+ }
+ } catch (...) {
+ }
+ };
+
+ std::lock_guard<std::mutex> lock(mutex_);
+ StopNoLock();
+
+ run_.store(true);
+ for (int i = 0; i < nworker; ++i) {
+ workers_.emplace_back([this, ioProc]() { while (run_) { ioProc(); } });
}
return true;
}
@@ -100,18 +153,17 @@
return false;
}
-bool ShmSocket::SyncRecv(bhome_msg::MsgI &msg, bhome::msg::BHMsgHead &head, const int timeout_ms)
+//maybe reimplment, using async cbs?
+bool ShmSocket::SyncRecv(bhome_msg::MsgI &msg, bhome_msg::BHMsgHead &head, const int timeout_ms)
{
- std::lock_guard<std::mutex> lock(mutex_);
- auto Recv = [&]() {
- if (mq().Recv(msg, timeout_ms)) {
- if (msg.ParseHead(head)) {
- return true;
- } else {
- msg.Release(shm());
- }
+ // std::lock_guard<std::mutex> lock(mutex_); // seems no need to lock mutex_.
+ bool got = (timeout_ms == 0) ? mq().TryRecv(msg) : mq().Recv(msg, timeout_ms);
+ if (got) {
+ if (msg.ParseHead(head)) {
+ return true;
+ } else {
+ msg.Release();
}
- return false;
- };
- return !RunningNoLock() && Recv();
+ }
+ return false;
}
--
Gitblit v1.8.0