From 3413ceb7c21a343ced1c45295b20361d9eb18fcf Mon Sep 17 00:00:00 2001 From: ffdfgdfg Date: Mon, 2 Sep 2019 00:18:52 +0800 Subject: [PATCH] add write queue again --- lib/mux/conn.go | 5 ----- lib/mux/mux.go | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/mux/conn.go b/lib/mux/conn.go index 09cac16..494fd4e 100644 --- a/lib/mux/conn.go +++ b/lib/mux/conn.go @@ -148,12 +148,7 @@ func (s *conn) Close() (err error) { } func (s *conn) closeProcess() { - if s.isClose { - logs.Warn("has closed ", s.connId) - return - } s.isClose = true - s.readWait = false s.mux.connMap.Delete(s.connId) common.CopyBuff.Put(s.readBuffer) close(s.readCh) diff --git a/lib/mux/mux.go b/lib/mux/mux.go index 1b90c60..8673c24 100644 --- a/lib/mux/mux.go +++ b/lib/mux/mux.go @@ -41,7 +41,7 @@ func NewMux(c net.Conn, connType string) *Mux { go m.readSession() //ping go m.ping() - //go m.writeSession() + go m.writeSession() return m } @@ -107,13 +107,13 @@ func (s *Mux) sendInfo(flag uint8, id int32, content []byte) { if pack.Flag == common.MUX_NEW_CONN { logs.Warn("sendinfo mux new conn, insert to write queue", pack.Id) } - //s.writeQueue <- buf - _, err = buf.WriteTo(s.conn) - if err != nil { - s.Close() - logs.Warn("write err, close mux", err) - } - common.BuffPool.Put(buf) + s.writeQueue <- buf + //_, err = buf.WriteTo(s.conn) + //if err != nil { + // s.Close() + // logs.Warn("write err, close mux", err) + //} + //common.BuffPool.Put(buf) return }