diff --git a/znet/connmanager.go b/znet/connmanager.go index 202af7e..c374faa 100644 --- a/znet/connmanager.go +++ b/znet/connmanager.go @@ -3,49 +3,51 @@ package znet import ( "errors" "fmt" - "sync/atomic" + "sync" "github.com/aceld/zinx/ziface" ) //ConnManager 连接管理模块 type ConnManager struct { - connections atomic.Value + connections map[uint32]ziface.IConnection + connLock sync.RWMutex } //NewConnManager 创建一个链接管理 func NewConnManager() *ConnManager { - var cm = &ConnManager{} - connections := make(map[uint32]ziface.IConnection) - cm.connections.Store(connections) - return cm + return &ConnManager{ + connections: make(map[uint32]ziface.IConnection), + } } //Add 添加链接 func (connMgr *ConnManager) Add(conn ziface.IConnection) { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) + connMgr.connLock.Lock() //将conn连接添加到ConnMananger中 - connections[conn.GetConnID()] = conn - connMgr.connections.Store(connections) + connMgr.connections[conn.GetConnID()] = conn + connMgr.connLock.Unlock() fmt.Println("connection add to ConnManager successfully: conn num = ", connMgr.Len()) } //Remove 删除连接 func (connMgr *ConnManager) Remove(conn ziface.IConnection) { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) + + connMgr.connLock.Lock() //删除连接信息 - delete(connections, conn.GetConnID()) - connMgr.connections.Store(connections) + delete(connMgr.connections, conn.GetConnID()) + connMgr.connLock.Unlock() fmt.Println("connection Remove ConnID=", conn.GetConnID(), " successfully: conn num = ", connMgr.Len()) } //Get 利用ConnID获取链接 func (connMgr *ConnManager) Get(connID uint32) (ziface.IConnection, error) { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) + connMgr.connLock.RLock() + defer connMgr.connLock.RUnlock() - if conn, ok := connections[connID]; ok { + if conn, ok := connMgr.connections[connID]; ok { return conn, nil } @@ -55,35 +57,38 @@ func (connMgr *ConnManager) Get(connID uint32) (ziface.IConnection, error) { //Len 获取当前连接 func (connMgr *ConnManager) Len() int { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) - return len(connections) + connMgr.connLock.RLock() + length := len(connMgr.connections) + connMgr.connLock.RUnlock() + return length } //ClearConn 清除并停止所有连接 func (connMgr *ConnManager) ClearConn() { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) + connMgr.connLock.Lock() //停止并删除全部的连接信息 - for connID, conn := range connections { + for connID, conn := range connMgr.connections { //停止 conn.Stop() //删除 - delete(connections, connID) + delete(connMgr.connections, connID) } - connMgr.connections.Store(connections) + connMgr.connLock.Unlock() fmt.Println("Clear All Connections successfully: conn num = ", connMgr.Len()) } //ClearOneConn 利用ConnID获取一个链接 并且删除 func (connMgr *ConnManager) ClearOneConn(connID uint32) { - connections:=connMgr.connections.Load().(map[uint32]ziface.IConnection) + connMgr.connLock.Lock() + defer connMgr.connLock.Unlock() + connections := connMgr.connections if conn, ok := connections[connID]; ok { //停止 conn.Stop() //删除 delete(connections, connID) - connMgr.connections.Store(connections) fmt.Println("Clear Connections ID: ", connID, "succeed") return }