mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-22 03:49:27 +01:00
remove utils.ConfigStore in favor of atomic.Pointer[T]
This commit is contained in:
parent
de1be675f5
commit
a99c8a42f9
@ -16,7 +16,7 @@ import (
|
||||
)
|
||||
|
||||
func (server *Server) Config() (config *Config) {
|
||||
return server.config.Get()
|
||||
return server.config.Load()
|
||||
}
|
||||
|
||||
func (server *Server) ChannelRegistrationEnabled() bool {
|
||||
|
@ -15,6 +15,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
@ -66,7 +67,7 @@ type Server struct {
|
||||
channels ChannelManager
|
||||
channelRegistry ChannelRegistry
|
||||
clients ClientManager
|
||||
config utils.ConfigStore[Config]
|
||||
config atomic.Pointer[Config]
|
||||
configFilename string
|
||||
connectionLimiter connection_limits.Limiter
|
||||
ctime time.Time
|
||||
@ -707,7 +708,7 @@ func (server *Server) applyConfig(config *Config) (err error) {
|
||||
config.Server.Cloaks.SetSecret(LoadCloakSecret(server.store))
|
||||
|
||||
// activate the new config
|
||||
server.config.Set(config)
|
||||
server.config.Store(config)
|
||||
|
||||
// load [dk]-lines, registered users and channels, etc.
|
||||
if initial {
|
||||
|
@ -1,33 +0,0 @@
|
||||
// Copyright (c) 2022 Shivaram Lingamneni
|
||||
// released under the MIT license
|
||||
|
||||
package utils
|
||||
|
||||
import (
|
||||
"sync/atomic"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
/*
|
||||
This can be used to implement the following pattern:
|
||||
|
||||
1. Prepare a config object (this can be arbitrarily expensive)
|
||||
2. Take a pointer to the config object and use Set() to install it
|
||||
3. Use Get() to access the config from any goroutine
|
||||
4. To update the config, call Set() again with a new prepared config object
|
||||
5. As long as any individual config object is not modified (by any goroutine)
|
||||
after it is installed with Set(), this is free of data races, and Get()
|
||||
is extremely cheap (on amd64 it compiles down to plain MOV instructions).
|
||||
*/
|
||||
|
||||
type ConfigStore[Config any] struct {
|
||||
ptr unsafe.Pointer
|
||||
}
|
||||
|
||||
func (c *ConfigStore[Config]) Get() *Config {
|
||||
return (*Config)(atomic.LoadPointer(&c.ptr))
|
||||
}
|
||||
|
||||
func (c *ConfigStore[Config]) Set(ptr *Config) {
|
||||
atomic.StorePointer(&c.ptr, unsafe.Pointer(ptr))
|
||||
}
|
Loading…
Reference in New Issue
Block a user