github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update caching logic to avoid map access

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2022-01-11 13:36:13 -08:00
parent ce3871966e
commit a1ba38056e
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugin/plugin.go
View File

@ -177,25 +177,6 @@ func checkUnique(r *Registration) error {
return nil return nil
} }
// AreRegisteredPluginsInitialized returns all registered plugins are initialized
func AreRegisteredPluginsInitialized(plugins *Set) bool {
if len(register.r) != len(plugins.ordered) {
return false
}
for _, reg := range register.r {
byID, typeok := plugins.byTypeAndID[reg.Type]
if !typeok {
return false
}
if _, ok := byID[reg.ID]; !ok {
return false
}
}
return true
}
// DisableFilter filters out disabled plugins // DisableFilter filters out disabled plugins
type DisableFilter func(r *Registration) bool type DisableFilter func(r *Registration) bool

13
services/introspection/local.go
View File

@ -55,7 +55,7 @@ type Local struct {
mu sync.Mutex mu sync.Mutex
root string root string
plugins *plugin.Set plugins *plugin.Set
pluginsPB []api.Plugin pluginCache []api.Plugin
} }
var _ = (api.IntrospectionClient)(&Local{}) var _ = (api.IntrospectionClient)(&Local{})
@ -90,16 +90,13 @@ func (l *Local) Plugins(ctx context.Context, req *api.PluginsRequest, _ ...grpc.
} }
func (l *Local) getPlugins() []api.Plugin { func (l *Local) getPlugins() []api.Plugin {
if !plugin.AreRegisteredPluginsInitialized(l.plugins) {
return pluginsToPB(l.plugins.GetAll())
}
l.mu.Lock() l.mu.Lock()
defer l.mu.Unlock() defer l.mu.Unlock()
if l.pluginsPB == nil { plugins := l.plugins.GetAll()
l.pluginsPB = pluginsToPB(l.plugins.GetAll()) if l.pluginCache == nil || len(plugins) != len(l.pluginCache) {
l.pluginCache = pluginsToPB(plugins)
} }
return l.pluginsPB return l.pluginCache
} }
// Server returns the local server information // Server returns the local server information