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
**运行时**:
- 减少类型断言的反射开销
- 提升实例获取等热点路径的性能
196 lines
5.5 KiB
Go
196 lines
5.5 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 (
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net"
|
|
"sync"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
const (
|
|
// FreePortAddress marks the server listens using random free port.
|
|
FreePortAddress = ":0"
|
|
)
|
|
|
|
const (
|
|
defaultServer = "default"
|
|
)
|
|
|
|
// Server is a TCP server.
|
|
type Server struct {
|
|
mu sync.Mutex // Used for Server.listen concurrent safety. -- The golang test with data race checks this.
|
|
listen net.Listener // TCP address listener.
|
|
address string // Server listening address.
|
|
handler func(*Conn) // Connection handler.
|
|
tlsConfig *tls.Config // TLS configuration.
|
|
}
|
|
|
|
// Map for name to server, for singleton purpose.
|
|
var (
|
|
// checker is used for checking whether the value is nil.
|
|
checker = func(v *Server) bool { return v == nil }
|
|
// serverMapping is the map for name to server.
|
|
serverMapping = gmap.NewKVMapWithChecker[any, *Server](checker, true)
|
|
)
|
|
|
|
// GetServer returns the TCP server with specified `name`,
|
|
// or it returns a new normal TCP server named `name` if it does not exist.
|
|
// The parameter `name` is used to specify the TCP server
|
|
func GetServer(name ...any) *Server {
|
|
serverName := defaultServer
|
|
if len(name) > 0 && name[0] != "" {
|
|
serverName = gconv.String(name[0])
|
|
}
|
|
return serverMapping.GetOrSetFuncLock(serverName, func() *Server {
|
|
return NewServer("", nil)
|
|
})
|
|
}
|
|
|
|
// NewServer creates and returns a new normal TCP server.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServer(address string, handler func(*Conn), name ...string) *Server {
|
|
s := &Server{
|
|
address: address,
|
|
handler: handler,
|
|
}
|
|
if len(name) > 0 && name[0] != "" {
|
|
serverMapping.Set(name[0], s)
|
|
}
|
|
return s
|
|
}
|
|
|
|
// NewServerTLS creates and returns a new TCP server with TLS support.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServerTLS(address string, tlsConfig *tls.Config, handler func(*Conn), name ...string) *Server {
|
|
s := NewServer(address, handler, name...)
|
|
s.SetTLSConfig(tlsConfig)
|
|
return s
|
|
}
|
|
|
|
// NewServerKeyCrt creates and returns a new TCP server with TLS support.
|
|
// The parameter `name` is optional, which is used to specify the instance name of the server.
|
|
func NewServerKeyCrt(address, crtFile, keyFile string, handler func(*Conn), name ...string) (*Server, error) {
|
|
s := NewServer(address, handler, name...)
|
|
if err := s.SetTLSKeyCrt(crtFile, keyFile); err != nil {
|
|
return nil, err
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
// SetAddress sets the listening address for server.
|
|
func (s *Server) SetAddress(address string) {
|
|
s.address = address
|
|
}
|
|
|
|
// GetAddress get the listening address for server.
|
|
func (s *Server) GetAddress() string {
|
|
return s.address
|
|
}
|
|
|
|
// SetHandler sets the connection handler for server.
|
|
func (s *Server) SetHandler(handler func(*Conn)) {
|
|
s.handler = handler
|
|
}
|
|
|
|
// SetTLSKeyCrt sets the certificate and key file for TLS configuration of server.
|
|
func (s *Server) SetTLSKeyCrt(crtFile, keyFile string) error {
|
|
tlsConfig, err := LoadKeyCrt(crtFile, keyFile)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
s.tlsConfig = tlsConfig
|
|
return nil
|
|
}
|
|
|
|
// SetTLSConfig sets the TLS configuration of server.
|
|
func (s *Server) SetTLSConfig(tlsConfig *tls.Config) {
|
|
s.tlsConfig = tlsConfig
|
|
}
|
|
|
|
// Close closes the listener and shutdowns the server.
|
|
func (s *Server) Close() error {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
if s.listen == nil {
|
|
return nil
|
|
}
|
|
return s.listen.Close()
|
|
}
|
|
|
|
// Run starts running the TCP Server.
|
|
func (s *Server) Run() (err error) {
|
|
if s.handler == nil {
|
|
err = gerror.NewCode(gcode.CodeMissingConfiguration, "start running failed: socket handler not defined")
|
|
return
|
|
}
|
|
if s.tlsConfig != nil {
|
|
// TLS Server
|
|
s.mu.Lock()
|
|
s.listen, err = tls.Listen("tcp", s.address, s.tlsConfig)
|
|
s.mu.Unlock()
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `tls.Listen failed for address "%s"`, s.address)
|
|
return
|
|
}
|
|
} else {
|
|
// Normal Server
|
|
var tcpAddr *net.TCPAddr
|
|
if tcpAddr, err = net.ResolveTCPAddr("tcp", s.address); err != nil {
|
|
err = gerror.Wrapf(err, `net.ResolveTCPAddr failed for address "%s"`, s.address)
|
|
return err
|
|
}
|
|
s.mu.Lock()
|
|
s.listen, err = net.ListenTCP("tcp", tcpAddr)
|
|
s.mu.Unlock()
|
|
if err != nil {
|
|
err = gerror.Wrapf(err, `net.ListenTCP failed for address "%s"`, s.address)
|
|
return err
|
|
}
|
|
}
|
|
// Listening loop.
|
|
for {
|
|
var conn net.Conn
|
|
if conn, err = s.listen.Accept(); err != nil {
|
|
err = gerror.Wrapf(err, `Listener.Accept failed`)
|
|
return err
|
|
} else if conn != nil {
|
|
go s.handler(NewConnByNetConn(conn))
|
|
}
|
|
}
|
|
}
|
|
|
|
// GetListenedAddress retrieves and returns the address string which are listened by current server.
|
|
func (s *Server) GetListenedAddress() string {
|
|
if !gstr.Contains(s.address, FreePortAddress) {
|
|
return s.address
|
|
}
|
|
var (
|
|
address = s.address
|
|
listenedPort = s.GetListenedPort()
|
|
)
|
|
address = gstr.Replace(address, FreePortAddress, fmt.Sprintf(`:%d`, listenedPort))
|
|
return address
|
|
}
|
|
|
|
// GetListenedPort retrieves and returns one port which is listened to by current server.
|
|
func (s *Server) GetListenedPort() int {
|
|
s.mu.Lock()
|
|
defer s.mu.Unlock()
|
|
if ln := s.listen; ln != nil {
|
|
return ln.Addr().(*net.TCPAddr).Port
|
|
}
|
|
return -1
|
|
}
|