Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkg/fpgacontroller/patcher/patcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ var (
rfc6901Escaper = strings.NewReplacer("~", "~0", "/", "~1")
)

// Patcher stores FPGA controller's state.
//nolint: govet
type patcher struct {
type Patcher struct {
sync.Mutex

log logr.Logger
Expand All @@ -81,16 +82,16 @@ type patcher struct {
resourceModeMap map[string]string
}

func newPatcher(log logr.Logger) *patcher {
return &patcher{
func newPatcher(log logr.Logger) *Patcher {
return &Patcher{
log: log,
afMap: make(map[string]*fpgav2.AcceleratorFunction),
resourceMap: make(map[string]string),
resourceModeMap: make(map[string]string),
}
}

func (p *patcher) AddAf(accfunc *fpgav2.AcceleratorFunction) error {
func (p *Patcher) AddAf(accfunc *fpgav2.AcceleratorFunction) error {
defer p.Unlock()
p.Lock()

Expand All @@ -112,15 +113,15 @@ func (p *patcher) AddAf(accfunc *fpgav2.AcceleratorFunction) error {
return nil
}

func (p *patcher) AddRegion(region *fpgav2.FpgaRegion) {
func (p *Patcher) AddRegion(region *fpgav2.FpgaRegion) {
defer p.Unlock()
p.Lock()

p.resourceModeMap[namespace+"/"+region.Name] = regiondevel
p.resourceMap[namespace+"/"+region.Name] = rfc6901Escaper.Replace(namespace + "/region-" + region.Spec.InterfaceID)
}

func (p *patcher) RemoveAf(name string) {
func (p *Patcher) RemoveAf(name string) {
defer p.Unlock()
p.Lock()

Expand All @@ -129,7 +130,7 @@ func (p *patcher) RemoveAf(name string) {
delete(p.resourceModeMap, namespace+"/"+name)
}

func (p *patcher) RemoveRegion(name string) {
func (p *Patcher) RemoveRegion(name string) {
defer p.Unlock()
p.Lock()

Expand Down Expand Up @@ -159,7 +160,7 @@ func sanitizeContainer(container corev1.Container) corev1.Container {
return container
}

func (p *patcher) getPatchOps(containerIdx int, container corev1.Container) ([]string, error) {
func (p *Patcher) getPatchOps(containerIdx int, container corev1.Container) ([]string, error) {
container = sanitizeContainer(container)

requestedResources, err := containers.GetRequestedResources(container, namespace)
Expand Down
6 changes: 3 additions & 3 deletions pkg/fpgacontroller/patcher/patchermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ func init() {

// Manager keeps track of patchers registered for different Kubernetes namespaces.
type Manager struct {
patchers map[string]*patcher
patchers map[string]*Patcher
log logr.Logger
}

// NewPatcherManager creates a new Manager.
func NewPatcherManager(log logr.Logger) *Manager {
return &Manager{
log: log,
patchers: make(map[string]*patcher),
patchers: make(map[string]*Patcher),
}
}

// GetPatcher returns a patcher specific to given namespace.
func (pm *Manager) GetPatcher(namespace string) *patcher {
func (pm *Manager) GetPatcher(namespace string) *Patcher {
if p, ok := pm.patchers[namespace]; ok {
return p
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/fpgacontroller/patcher/patchermanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestGetPatcher(t *testing.T) {
},
{
name: "Return existing patcher",
pm: &Manager{patchers: map[string]*patcher{namespace: newPatcher(log)}},
pm: &Manager{patchers: map[string]*Patcher{namespace: newPatcher(log)}},
},
}

Expand Down