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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
231 lines
6.4 KiB
Go
231 lines
6.4 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 gfsnotify
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
)
|
|
|
|
// watchLoop starts the loop for event listening from underlying inotify monitor.
|
|
func (w *Watcher) watchLoop() {
|
|
for {
|
|
select {
|
|
// close event.
|
|
case <-w.closeChan:
|
|
return
|
|
|
|
// event listening.
|
|
case ev, ok := <-w.watcher.Events:
|
|
if !ok {
|
|
return
|
|
}
|
|
// filter the repeated event in custom duration.
|
|
var cacheFunc = func(ctx context.Context) (value any, err error) {
|
|
w.events.Push(&Event{
|
|
event: ev,
|
|
Path: ev.Name,
|
|
Op: Op(ev.Op),
|
|
Watcher: w,
|
|
})
|
|
return struct{}{}, nil
|
|
}
|
|
_, err := w.cache.SetIfNotExist(
|
|
context.Background(),
|
|
ev.String(),
|
|
cacheFunc,
|
|
repeatEventFilterDuration,
|
|
)
|
|
if err != nil {
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
|
|
// error occurs in underlying watcher.
|
|
case err := <-w.watcher.Errors:
|
|
intlog.Errorf(context.TODO(), `%+v`, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
// eventLoop is the core event handler.
|
|
func (w *Watcher) eventLoop() {
|
|
var (
|
|
err error
|
|
ctx = context.TODO()
|
|
)
|
|
for {
|
|
if v := w.events.Pop(); v != nil {
|
|
// If there's no any callback of this path, it removes it from monitor,
|
|
// as a path watching without callback is meaningless.
|
|
callbacks := w.getCallbacksForPath(v.Path)
|
|
if len(callbacks) == 0 {
|
|
_ = w.watcher.Remove(v.Path)
|
|
continue
|
|
}
|
|
|
|
switch {
|
|
case v.IsRemove():
|
|
// It should check again the existence of the path.
|
|
// It adds it back to the monitor if it still exists.
|
|
if fileExists(v.Path) {
|
|
// A watch will be automatically removed if the watched path is deleted or
|
|
// renamed.
|
|
//
|
|
// It here adds the path back to monitor.
|
|
// We need no worry about the repeat adding.
|
|
if err = w.watcher.Add(v.Path); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"fake remove event, watcher re-adds monitor for: %s",
|
|
v.Path,
|
|
)
|
|
}
|
|
// Change the event to RENAME, which means it renames itself to its origin name.
|
|
v.Op = RENAME
|
|
}
|
|
|
|
case v.IsRename():
|
|
// It should check again the existence of the path.
|
|
// It adds it back to the monitor if it still exists.
|
|
// Especially Some editors might do RENAME and then CHMOD when it's editing file.
|
|
if fileExists(v.Path) {
|
|
// A watch will be automatically removed if the watched path is deleted or
|
|
// renamed.
|
|
//
|
|
// It might lose the monitoring for the path, so we add the path back to monitor.
|
|
// We need no worry about the repeat adding.
|
|
if err = w.watcher.Add(v.Path); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"fake rename event, watcher re-adds monitor for: %s",
|
|
v.Path,
|
|
)
|
|
}
|
|
// Change the event to CHMOD.
|
|
v.Op = CHMOD
|
|
}
|
|
|
|
case v.IsCreate():
|
|
// =================================================================================
|
|
// Note that it here just adds the path to monitor without any callback registering,
|
|
// because its parent already has the callbacks.
|
|
// =================================================================================
|
|
if w.checkRecursiveWatchingInCreatingEvent(v.Path) {
|
|
// It handles only folders, watching folders also watching its sub files.
|
|
for _, subPath := range fileAllDirs(v.Path) {
|
|
if fileIsDir(subPath) {
|
|
if err = w.watcher.Add(subPath); err != nil {
|
|
intlog.Errorf(ctx, `%+v`, err)
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"folder creation event, watcher adds monitor for: %s",
|
|
subPath,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Calling the callbacks in multiple goroutines.
|
|
for _, callback := range callbacks {
|
|
go w.doCallback(v, callback)
|
|
}
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// checkRecursiveWatchingInCreatingEvent checks and returns whether recursive adding given `path` to watcher
|
|
// in creating event.
|
|
func (w *Watcher) checkRecursiveWatchingInCreatingEvent(path string) bool {
|
|
if !fileIsDir(path) {
|
|
return false
|
|
}
|
|
var (
|
|
parentDirPath string
|
|
dirPath = path
|
|
)
|
|
for {
|
|
parentDirPath = fileDir(dirPath)
|
|
if parentDirPath == dirPath {
|
|
break
|
|
}
|
|
if callbackItem := w.callbacks.Get(parentDirPath); callbackItem != nil {
|
|
for _, node := range callbackItem.FrontAll() {
|
|
if node.recursive {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
dirPath = parentDirPath
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (w *Watcher) doCallback(event *Event, callback *Callback) {
|
|
defer func() {
|
|
if exception := recover(); exception != nil {
|
|
switch exception {
|
|
case callbackExitEventPanicStr:
|
|
w.RemoveCallback(callback.Id)
|
|
default:
|
|
if e, ok := exception.(error); ok {
|
|
panic(gerror.WrapCode(gcode.CodeInternalPanic, e))
|
|
}
|
|
panic(exception)
|
|
}
|
|
}
|
|
}()
|
|
callback.Func(event)
|
|
}
|
|
|
|
// getCallbacksForPath searches and returns all callbacks with given `path`.
|
|
//
|
|
// It also searches its parents for callbacks if they're recursive.
|
|
func (w *Watcher) getCallbacksForPath(path string) (callbacks []*Callback) {
|
|
// Firstly add the callbacks of itself.
|
|
if item := w.callbacks.Get(path); item != nil {
|
|
callbacks = append(callbacks, item.FrontAll()...)
|
|
}
|
|
// ============================================================================================================
|
|
// Secondly searches its direct parent for callbacks.
|
|
//
|
|
// Note that it is SPECIAL handling here, which is the different between `recursive` and `not recursive` logic
|
|
// for direct parent folder of `path` that events are from.
|
|
// ============================================================================================================
|
|
dirPath := fileDir(path)
|
|
if item := w.callbacks.Get(dirPath); item != nil {
|
|
callbacks = append(callbacks, item.FrontAll()...)
|
|
}
|
|
|
|
// Lastly searches all the parents of directory of `path` recursively for callbacks.
|
|
for {
|
|
parentDirPath := fileDir(dirPath)
|
|
if parentDirPath == dirPath {
|
|
break
|
|
}
|
|
if item := w.callbacks.Get(parentDirPath); item != nil {
|
|
for _, node := range item.FrontAll() {
|
|
if node.recursive {
|
|
callbacks = append(callbacks, node)
|
|
}
|
|
}
|
|
}
|
|
dirPath = parentDirPath
|
|
}
|
|
return
|
|
}
|