mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
184 lines
6.7 KiB
Go
184 lines
6.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 gfsnotify provides a platform-independent interface for file system notifications.
|
|
package gfsnotify
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/fsnotify/fsnotify"
|
|
|
|
"github.com/gogf/gf/v2/container/glist"
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/container/gqueue"
|
|
"github.com/gogf/gf/v2/container/gset"
|
|
"github.com/gogf/gf/v2/container/gtype"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/os/gcache"
|
|
)
|
|
|
|
// Watcher is the monitor for file changes.
|
|
type Watcher struct {
|
|
watcher *fsnotify.Watcher // Underlying fsnotify object.
|
|
events *gqueue.TQueue[*Event] // Used for internal event management.
|
|
cache *gcache.Cache // Used for repeated event filter.
|
|
nameSet *gset.StrSet // Used for AddOnce feature.
|
|
callbacks *gmap.KVMap[string, *glist.TList[*Callback]] // Path(file/folder) to callbacks mapping.
|
|
closeChan chan struct{} // Used for watcher closing notification.
|
|
}
|
|
|
|
// Callback is the callback function for Watcher.
|
|
type Callback struct {
|
|
Id int // Unique id for callback object.
|
|
Func func(event *Event) // Callback function.
|
|
Path string // Bound file path (absolute).
|
|
name string // Registered name for AddOnce.
|
|
elem *glist.TElement[*Callback] // Element in the callbacks of watcher.
|
|
recursive bool // Is bound to sub-path recursively or not.
|
|
}
|
|
|
|
// Event is the event produced by underlying fsnotify.
|
|
type Event struct {
|
|
event fsnotify.Event // Underlying event.
|
|
Path string // Absolute file path.
|
|
Op Op // File operation.
|
|
Watcher *Watcher // Parent watcher.
|
|
}
|
|
|
|
// WatchOption holds the option for watching.
|
|
type WatchOption struct {
|
|
// NoRecursive explicitly specifies no recursive watching.
|
|
// Recursive watching will also watch all its current and following created subfolders and sub-files.
|
|
//
|
|
// Note that the recursive watching is enabled in default.
|
|
NoRecursive bool
|
|
}
|
|
|
|
// Op is the bits union for file operations.
|
|
type Op uint32
|
|
|
|
// internalPanic is the custom panic for internal usage.
|
|
type internalPanic string
|
|
|
|
const (
|
|
CREATE Op = 1 << iota
|
|
WRITE
|
|
REMOVE
|
|
RENAME
|
|
CHMOD
|
|
)
|
|
|
|
const (
|
|
repeatEventFilterDuration = time.Millisecond // Duration for repeated event filter.
|
|
callbackExitEventPanicStr internalPanic = "exit" // Custom exit event for internal usage.
|
|
)
|
|
|
|
var (
|
|
callBacksChecker = func(v *glist.TList[*Callback]) bool { return v == nil } // callBacksChecker checks whether the value is nil.
|
|
callbackIdMapChecker = func(v *Callback) bool { return v == nil } // callbackIdMapChecker checks whether the value is nil.
|
|
mu sync.Mutex // Mutex for concurrent safety of defaultWatcher.
|
|
defaultWatcher *Watcher // Default watcher.
|
|
callbackIdMap = gmap.NewKVMapWithChecker[int, *Callback](callbackIdMapChecker, true) // Global callback id to callback function mapping.
|
|
callbackIdGenerator = gtype.NewInt() // Atomic id generator for callback.
|
|
)
|
|
|
|
// New creates and returns a new watcher.
|
|
// Note that the watcher number is limited by the file handle setting of the system.
|
|
// Example: fs.inotify.max_user_instances system variable in linux systems.
|
|
//
|
|
// In most case, you can use the default watcher for usage instead of creating one.
|
|
func New() (*Watcher, error) {
|
|
w := &Watcher{
|
|
cache: gcache.New(),
|
|
events: gqueue.NewTQueue[*Event](),
|
|
nameSet: gset.NewStrSet(true),
|
|
closeChan: make(chan struct{}),
|
|
callbacks: gmap.NewKVMapWithChecker[string, *glist.TList[*Callback]](callBacksChecker, true),
|
|
}
|
|
if watcher, err := fsnotify.NewWatcher(); err == nil {
|
|
w.watcher = watcher
|
|
} else {
|
|
intlog.Printf(context.TODO(), "New watcher failed: %v", err)
|
|
return nil, err
|
|
}
|
|
go w.watchLoop()
|
|
go w.eventLoop()
|
|
return w, nil
|
|
}
|
|
|
|
// Add monitors `path` using default watcher with callback function `callbackFunc`.
|
|
//
|
|
// The parameter `path` can be either a file or a directory path.
|
|
// The optional parameter `recursive` specifies whether monitoring the `path` recursively, which is true in default.
|
|
func Add(path string, callbackFunc func(event *Event), option ...WatchOption) (callback *Callback, err error) {
|
|
w, err := getDefaultWatcher()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return w.Add(path, callbackFunc, option...)
|
|
}
|
|
|
|
// AddOnce monitors `path` using default watcher with callback function `callbackFunc` only once using unique name `name`.
|
|
//
|
|
// If AddOnce is called multiple times with the same `name` parameter, `path` is only added to monitor once.
|
|
// It returns error if it's called twice with the same `name`.
|
|
//
|
|
// The parameter `path` can be either a file or a directory path.
|
|
// The optional parameter `recursive` specifies whether monitoring the `path` recursively, which is true in default.
|
|
func AddOnce(name, path string, callbackFunc func(event *Event), option ...WatchOption) (callback *Callback, err error) {
|
|
w, err := getDefaultWatcher()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return w.AddOnce(name, path, callbackFunc, option...)
|
|
}
|
|
|
|
// Remove removes all monitoring callbacks of given `path` from watcher recursively.
|
|
func Remove(path string) error {
|
|
w, err := getDefaultWatcher()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return w.Remove(path)
|
|
}
|
|
|
|
// RemoveCallback removes specified callback with given id from watcher.
|
|
func RemoveCallback(callbackID int) error {
|
|
w, err := getDefaultWatcher()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if callback := callbackIdMap.Get(callbackID); callback == nil {
|
|
return gerror.NewCodef(gcode.CodeInvalidParameter, `callback for id %d not found`, callbackID)
|
|
}
|
|
w.RemoveCallback(callbackID)
|
|
return nil
|
|
}
|
|
|
|
// Exit is only used in the callback function, which can be used to remove current callback
|
|
// of itself from the watcher.
|
|
func Exit() {
|
|
panic(callbackExitEventPanicStr)
|
|
}
|
|
|
|
// getDefaultWatcher creates and returns the default watcher.
|
|
// This is used for lazy initialization purpose.
|
|
func getDefaultWatcher() (*Watcher, error) {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
if defaultWatcher != nil {
|
|
return defaultWatcher, nil
|
|
}
|
|
var err error
|
|
defaultWatcher, err = New()
|
|
return defaultWatcher, err
|
|
}
|