diff options
author | Determinant <tederminant@gmail.com> | 2020-02-21 17:24:32 +0000 |
---|---|---|
committer | Determinant <tederminant@gmail.com> | 2020-02-21 17:24:32 +0000 |
commit | 3fa0e4e15bb2c5bcbfee4b73f6d3cce3b00b3000 (patch) | |
tree | 58c547343b65763d54ee2c82f5690a4707a8d6e7 /include/salticidae/network.h | |
parent | e08ea56eef53812e79c311a56e7518696155d391 (diff) |
seemingly fix the uv_close assertion failure; reduce LOG_INFO messagesone-way-handshake
Diffstat (limited to 'include/salticidae/network.h')
-rw-r--r-- | include/salticidae/network.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/include/salticidae/network.h b/include/salticidae/network.h index c581aa4..1cfe150 100644 --- a/include/salticidae/network.h +++ b/include/salticidae/network.h @@ -79,6 +79,7 @@ class MsgNetwork: public ConnPool { Msg msg; MsgState msg_state; bool msg_sleep; + /* initialized and destroyed by the worker */ TimerEvent ev_enqueue_poll; protected: @@ -88,6 +89,10 @@ class MsgNetwork: public ConnPool { mutable std::atomic<size_t> nsentb; mutable std::atomic<size_t> nrecvb; #endif + void stop() override { + ev_enqueue_poll.clear(); + ConnPool::Conn::stop(); + } public: Conn(): msg_state(HEADER), msg_sleep(false) @@ -135,24 +140,22 @@ class MsgNetwork: public ConnPool { void on_setup(const ConnPool::conn_t &_conn) override { auto conn = static_pointer_cast<Conn>(_conn); - conn->ev_enqueue_poll = TimerEvent(conn->worker->get_ec(), - [this, conn](TimerEvent &) { - if (!incoming_msgs.enqueue(std::make_pair(conn->msg, conn), false)) - { - conn->msg_sleep = true; - conn->ev_enqueue_poll.add(0); - return; - } - conn->msg_sleep = false; - on_read(conn); + auto worker = conn->worker; + worker->get_tcall()->async_call([this, conn, worker](ThreadCall::Handle &) { + conn->ev_enqueue_poll = TimerEvent(worker->get_ec(), + [this, conn](TimerEvent &) { + if (!incoming_msgs.enqueue(std::make_pair(conn->msg, conn), false)) + { + conn->msg_sleep = true; + conn->ev_enqueue_poll.add(0); + return; + } + conn->msg_sleep = false; + on_read(conn); + }); }); } - void on_teardown(const ConnPool::conn_t &_conn) override { - auto conn = static_pointer_cast<Conn>(_conn); - conn->ev_enqueue_poll.clear(); - } - public: class Config: public ConnPool::Config { @@ -355,6 +358,7 @@ class PeerNetwork: public MsgNetwork<OpcodeType> { class Conn: public MsgNet::Conn { friend PeerNetwork; Peer *peer; + /* initialized and destroyed by the worker */ TimerEvent ev_timeout; void reset_timeout(double timeout); |