From 82bd1d81e918cc8a1a46b6c36a81cbba43750bb1 Mon Sep 17 00:00:00 2001 From: Determinant Date: Thu, 15 Nov 2018 00:24:38 -0500 Subject: use a simple worker selection policy; add todo-list --- include/salticidae/network.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/salticidae/network.h') diff --git a/include/salticidae/network.h b/include/salticidae/network.h index 60d8f20..4f934cd 100644 --- a/include/salticidae/network.h +++ b/include/salticidae/network.h @@ -470,7 +470,7 @@ void PeerNetwork::Conn::on_setup() { assert(!ev_timeout); ev_timeout = Event(worker->get_ec(), -1, [conn](int, int) { SALTICIDAE_LOG_INFO("peer ping-pong timeout"); - conn->terminate(); + conn->worker_terminate(); }); /* the initial ping-pong to set up the connection */ tcall_reset_timeout(worker, conn, pn->conn_timeout); @@ -508,7 +508,7 @@ void PeerNetwork::Peer::reset_conn(conn_t new_conn) { //SALTICIDAE_LOG_DEBUG("moving send buffer"); //new_conn->move_send_buffer(conn); SALTICIDAE_LOG_INFO("terminating old connection %s", std::string(*conn).c_str()); - conn->cpool->terminate(conn); + conn->disp_terminate(); } addr = new_conn->get_addr(); conn = new_conn; @@ -557,7 +557,7 @@ bool PeerNetwork::check_new_conn(const conn_t &conn, uint16_t port) { { if (conn != p->conn) { - conn->cpool->terminate(conn); + conn->disp_terminate(); return true; } return false; -- cgit v1.2.3