mirror of
https://gitee.com/johng/gf
synced 2026-06-06 16:21:40 +08:00
### 变更说明
本次重构将项目中用于**实例管理的容器**从 `StrAnyMap`/`IntAnyMap` 迁移到类型安全的泛型实现
`KVMapWithChecker`,同时将相关的 `glist.List` 和 `gqueue.Queue`
替换为对应的泛型版本,以提高实例管理的类型安全性。并且减少原先代码中的大量类型断言,提高性能。
### 前因
目前`goframe`中大量使用了包含`any`的容器,然后通过断言去转换类型,麻烦且影响性能,尤其是对`gdb/gredis/glog`等需要高频获取`instance`实例的组件影响较大。最近几个版本中gf完成了数据结构容器的泛型化改造,以及我最近解决了其中几个泛型容器对于`typed
nil`过滤的问题,所以可以逐步迁移这些实例容器到泛型容器,减少断言优化性能
### 主要改进
#### 1. 实例容器泛型化
以下模块的实例管理容器已迁移到泛型实现:
**核心实例管理**:
- `database/gdb`: 数据库实例容器 → `KVMap[string, DB]`
- `database/gredis`: Redis 实例容器 → `KVMap[string, *Redis]`
- `database/gredis`: Redis 配置容器 → `KVMap[string, *Config]`
- `os/gcfg`: 配置实例容器 → `KVMap[string, *Config]`
- `os/glog`: 日志实例容器 → `KVMap[string, *Logger]`
- `os/gview`: 视图实例容器 → `KVMap[string, *View]`
- `i18n/gi18n`: 国际化实例容器 → `KVMap[string, *Manager]`
**网络服务实例**:
- `net/ghttp`: HTTP 服务器容器 → `KVMap[string, *Server]`
- `net/gtcp`: TCP 服务器容器 → `KVMap[any, *Server]`
- `net/gudp`: UDP 服务器容器 → `KVMap[string, *Server]`
**其他实例容器**:
- `os/gres`: 资源实例容器 → `KVMap[string, *Resource]`
- `os/gfpool`: 文件池容器 → `KVMap[string, *Pool]`
- `os/gspath`: 路径搜索容器 → `KVMap[string, *SPath]`
- `net/gtcp`: 连接池容器 → `KVMap[string, *gpool.Pool]`
#### 2. 相关数据结构泛型化
- `os/gfsnotify`: 回调列表 → `TList[*Callback]`,事件队列 → `TQueue[*Event]`
- `os/grpool`: 任务队列 → `TList[*localPoolItem]`
- `os/gcache`: 事件队列 → `TList[*adapterMemoryEvent]`
- `net/ghttp`: 解析项列表 → `TList[*HandlerItemParsed]`
- `os/gproc`: 消息队列 → `TQueue[*MsgRequest]`
- `os/gmlock`: 锁映射 → `KVMap[string, *sync.RWMutex]`
### 技术实现
1. **引入检查器函数**: 为每个实例容器添加 `checker` 函数用于空值检测
2. **消除类型断言**: 实例获取时无需 `v.(*Type)` 转换
3. **明确函数签名**: `GetOrSetFuncLock` 的回调从 `func() any` 改为 `func() T`
### 使用示例
#### 实例容器的变更
**变更前**:
```go
// 旧的实例管理方式
var instances = gmap.NewStrAnyMap(true)
func Instance(name string) *Logger {
v := instances.GetOrSetFuncLock(name, func() any {
return New()
})
return v.(*Logger) // 需要类型断言
}
```
**变更后**:
```go
// 新的泛型实例容器
var (
checker = func(v *Logger) bool { return v == nil }
instances = gmap.NewKVMapWithChecker[string, *Logger](checker, true)
)
func Instance(name string) *Logger {
return instances.GetOrSetFuncLock(name, New) // 直接返回,无需断言
}
```
#### 队列容器的变更
**变更前**:
```go
// 旧的队列方式
events := gqueue.New()
events.Push(&Event{Path: "/tmp/file"})
if v := events.Pop(); v != nil {
event := v.(*Event) // 需要类型断言
handleEvent(event)
}
```
**变更后**:
```go
// 新的泛型队列
events := gqueue.NewTQueue[*Event]()
events.Push(&Event{Path: "/tmp/file"})
if event := events.Pop(); event != nil {
handleEvent(event) // event 已是 *Event 类型
}
```
### 收益
- ✅ **编译时类型安全**: 实例容器的类型错误在编译期捕获
- ✅ **消除运行时断言**: 避免类型断言带来的 panic 风险
- ✅ **提升代码可读性**: 实例管理逻辑更清晰
- ✅ **改善开发体验**: IDE 类型提示和代码补全更准确
### 性能权衡
**编译时**:
- 泛型实例化会增加编译时间和二进制体积
- 预估编译时间增加 5-15%,二进制体积增加约 1-2MB
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
167 lines
5.0 KiB
Go
167 lines
5.0 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gtcp
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/container/gpool"
|
|
)
|
|
|
|
// PoolConn is a connection with pool feature for TCP.
|
|
// Note that it is NOT a pool or connection manager, it is just a TCP connection object.
|
|
type PoolConn struct {
|
|
*Conn // Underlying connection object.
|
|
pool *gpool.Pool // Connection pool, which is not a real connection pool, but a connection reusable pool.
|
|
status int // Status of current connection, which is used to mark this connection usable or not.
|
|
}
|
|
|
|
const defaultPoolExpire = 10 * time.Second // Default TTL for connection in the pool.
|
|
|
|
const (
|
|
connStatusUnknown = iota // Means it is unknown it's connective or not.
|
|
connStatusActive // Means it is now connective.
|
|
connStatusError // Means it should be closed and removed from pool.
|
|
)
|
|
|
|
var (
|
|
poolChecker = func(v *gpool.Pool) bool { return v == nil }
|
|
// addressPoolMap is a mapping for address to its pool object.
|
|
addressPoolMap = gmap.NewKVMapWithChecker[string, *gpool.Pool](poolChecker, true)
|
|
)
|
|
|
|
// NewPoolConn creates and returns a connection with pool feature.
|
|
func NewPoolConn(addr string, timeout ...time.Duration) (*PoolConn, error) {
|
|
v := addressPoolMap.GetOrSetFuncLock(addr, func() *gpool.Pool {
|
|
var pool *gpool.Pool
|
|
pool = gpool.New(defaultPoolExpire, func() (any, error) {
|
|
if conn, err := NewConn(addr, timeout...); err == nil {
|
|
return &PoolConn{conn, pool, connStatusActive}, nil
|
|
} else {
|
|
return nil, err
|
|
}
|
|
})
|
|
return pool
|
|
})
|
|
value, err := v.Get()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return value.(*PoolConn), nil
|
|
}
|
|
|
|
// Close puts back the connection to the pool if it's active,
|
|
// or closes the connection if it's not active.
|
|
//
|
|
// Note that, if `c` calls Close function closing itself, `c` can not
|
|
// be used again.
|
|
func (c *PoolConn) Close() error {
|
|
if c.pool != nil && c.status == connStatusActive {
|
|
c.status = connStatusUnknown
|
|
return c.pool.Put(c)
|
|
}
|
|
return c.Conn.Close()
|
|
}
|
|
|
|
// Send writes data to the connection. It retrieves a new connection from its pool if it fails
|
|
// writing data.
|
|
func (c *PoolConn) Send(data []byte, retry ...Retry) error {
|
|
err := c.Conn.Send(data, retry...)
|
|
if err != nil && c.status == connStatusUnknown {
|
|
if v, e := c.pool.Get(); e == nil {
|
|
c.Conn = v.(*PoolConn).Conn
|
|
err = c.Send(data, retry...)
|
|
} else {
|
|
err = e
|
|
}
|
|
}
|
|
if err != nil {
|
|
c.status = connStatusError
|
|
} else {
|
|
c.status = connStatusActive
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Recv receives data from the connection.
|
|
func (c *PoolConn) Recv(length int, retry ...Retry) ([]byte, error) {
|
|
data, err := c.Conn.Recv(length, retry...)
|
|
if err != nil {
|
|
c.status = connStatusError
|
|
} else {
|
|
c.status = connStatusActive
|
|
}
|
|
return data, err
|
|
}
|
|
|
|
// RecvLine reads data from the connection until reads char '\n'.
|
|
// Note that the returned result does not contain the last char '\n'.
|
|
func (c *PoolConn) RecvLine(retry ...Retry) ([]byte, error) {
|
|
data, err := c.Conn.RecvLine(retry...)
|
|
if err != nil {
|
|
c.status = connStatusError
|
|
} else {
|
|
c.status = connStatusActive
|
|
}
|
|
return data, err
|
|
}
|
|
|
|
// RecvTill reads data from the connection until reads bytes `til`.
|
|
// Note that the returned result contains the last bytes `til`.
|
|
func (c *PoolConn) RecvTill(til []byte, retry ...Retry) ([]byte, error) {
|
|
data, err := c.Conn.RecvTill(til, retry...)
|
|
if err != nil {
|
|
c.status = connStatusError
|
|
} else {
|
|
c.status = connStatusActive
|
|
}
|
|
return data, err
|
|
}
|
|
|
|
// RecvWithTimeout reads data from the connection with timeout.
|
|
func (c *PoolConn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry) (data []byte, err error) {
|
|
if err := c.SetDeadlineRecv(time.Now().Add(timeout)); err != nil {
|
|
return nil, err
|
|
}
|
|
defer func() {
|
|
_ = c.SetDeadlineRecv(time.Time{})
|
|
}()
|
|
data, err = c.Recv(length, retry...)
|
|
return
|
|
}
|
|
|
|
// SendWithTimeout writes data to the connection with timeout.
|
|
func (c *PoolConn) SendWithTimeout(data []byte, timeout time.Duration, retry ...Retry) (err error) {
|
|
if err := c.SetDeadlineSend(time.Now().Add(timeout)); err != nil {
|
|
return err
|
|
}
|
|
defer func() {
|
|
_ = c.SetDeadlineSend(time.Time{})
|
|
}()
|
|
err = c.Send(data, retry...)
|
|
return
|
|
}
|
|
|
|
// SendRecv writes data to the connection and blocks reading response.
|
|
func (c *PoolConn) SendRecv(data []byte, receive int, retry ...Retry) ([]byte, error) {
|
|
if err := c.Send(data, retry...); err == nil {
|
|
return c.Recv(receive, retry...)
|
|
} else {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// SendRecvWithTimeout writes data to the connection and reads response with timeout.
|
|
func (c *PoolConn) SendRecvWithTimeout(data []byte, receive int, timeout time.Duration, retry ...Retry) ([]byte, error) {
|
|
if err := c.Send(data, retry...); err == nil {
|
|
return c.RecvWithTimeout(receive, timeout, retry...)
|
|
} else {
|
|
return nil, err
|
|
}
|
|
}
|