mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
137 lines
3.7 KiB
Go
137 lines
3.7 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 gmlock
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
)
|
|
|
|
var checker = func(v *sync.RWMutex) bool { return v == nil }
|
|
|
|
// Locker is a memory based locker.
|
|
// Note that there's no cache expire mechanism for mutex in locker.
|
|
// You need remove certain mutex manually when you do not want use it anymore.
|
|
type Locker struct {
|
|
m *gmap.KVMap[string, *sync.RWMutex]
|
|
}
|
|
|
|
// New creates and returns a new memory locker.
|
|
// A memory locker can lock/unlock with dynamic string key.
|
|
func New() *Locker {
|
|
return &Locker{
|
|
m: gmap.NewKVMapWithChecker[string, *sync.RWMutex](checker, true),
|
|
}
|
|
}
|
|
|
|
// Lock locks the `key` with writing lock.
|
|
// If there's a write/reading lock the `key`,
|
|
// it will block until the lock is released.
|
|
func (l *Locker) Lock(key string) {
|
|
l.getOrNewMutex(key).Lock()
|
|
}
|
|
|
|
// TryLock tries locking the `key` with writing lock,
|
|
// it returns true if success, or it returns false if there's a writing/reading lock the `key`.
|
|
func (l *Locker) TryLock(key string) bool {
|
|
return l.getOrNewMutex(key).TryLock()
|
|
}
|
|
|
|
// Unlock unlocks the writing lock of the `key`.
|
|
func (l *Locker) Unlock(key string) {
|
|
if v := l.m.Get(key); v != nil {
|
|
v.Unlock()
|
|
}
|
|
}
|
|
|
|
// RLock locks the `key` with reading lock.
|
|
// If there's a writing lock on `key`,
|
|
// it will blocks until the writing lock is released.
|
|
func (l *Locker) RLock(key string) {
|
|
l.getOrNewMutex(key).RLock()
|
|
}
|
|
|
|
// TryRLock tries locking the `key` with reading lock.
|
|
// It returns true if success, or if there's a writing lock on `key`, it returns false.
|
|
func (l *Locker) TryRLock(key string) bool {
|
|
return l.getOrNewMutex(key).TryRLock()
|
|
}
|
|
|
|
// RUnlock unlocks the reading lock of the `key`.
|
|
func (l *Locker) RUnlock(key string) {
|
|
if v := l.m.Get(key); v != nil {
|
|
v.RUnlock()
|
|
}
|
|
}
|
|
|
|
// LockFunc locks the `key` with writing lock and callback function `f`.
|
|
// If there's a write/reading lock the `key`,
|
|
// it will block until the lock is released.
|
|
//
|
|
// It releases the lock after `f` is executed.
|
|
func (l *Locker) LockFunc(key string, f func()) {
|
|
l.Lock(key)
|
|
defer l.Unlock(key)
|
|
f()
|
|
}
|
|
|
|
// RLockFunc locks the `key` with reading lock and callback function `f`.
|
|
// If there's a writing lock the `key`,
|
|
// it will block until the lock is released.
|
|
//
|
|
// It releases the lock after `f` is executed.
|
|
func (l *Locker) RLockFunc(key string, f func()) {
|
|
l.RLock(key)
|
|
defer l.RUnlock(key)
|
|
f()
|
|
}
|
|
|
|
// TryLockFunc locks the `key` with writing lock and callback function `f`.
|
|
// It returns true if success, or else if there's a write/reading lock the `key`, it return false.
|
|
//
|
|
// It releases the lock after `f` is executed.
|
|
func (l *Locker) TryLockFunc(key string, f func()) bool {
|
|
if l.TryLock(key) {
|
|
defer l.Unlock(key)
|
|
f()
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// TryRLockFunc locks the `key` with reading lock and callback function `f`.
|
|
// It returns true if success, or else if there's a writing lock the `key`, it returns false.
|
|
//
|
|
// It releases the lock after `f` is executed.
|
|
func (l *Locker) TryRLockFunc(key string, f func()) bool {
|
|
if l.TryRLock(key) {
|
|
defer l.RUnlock(key)
|
|
f()
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// Remove removes mutex with given `key` from locker.
|
|
func (l *Locker) Remove(key string) {
|
|
l.m.Remove(key)
|
|
}
|
|
|
|
// Clear removes all mutexes from locker.
|
|
func (l *Locker) Clear() {
|
|
l.m.Clear()
|
|
}
|
|
|
|
// getOrNewMutex returns the mutex of given `key` if it exists,
|
|
// or else creates and returns a new one.
|
|
func (l *Locker) getOrNewMutex(key string) *sync.RWMutex {
|
|
return l.m.GetOrSetFuncLock(key, func() *sync.RWMutex {
|
|
return &sync.RWMutex{}
|
|
})
|
|
}
|