Skip to content

Minor cleanups in libcontainer and loadFactory #3340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thaJeztah wants to merge 2 commits into from
Closed

Minor cleanups in libcontainer and loadFactory #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9fda11
libct.IntelRdtFs(): simplify
thaJeztah Jan 19, 2022
c149d2b
loadFactory(): remove unneeded intermediate variable
thaJeztah Jan 19, 2022
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
10 changes: 4 additions & 6 deletions libcontainer/factory_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,14 @@ func InitArgs(args ...string) func(*LinuxFactory) error {
}
}

// IntelRdtfs is an options func to configure a LinuxFactory to return
// IntelRdtFs is an options func to configure a LinuxFactory to return
// containers that use the Intel RDT "resource control" filesystem to
// create and manage Intel RDT resources (e.g., L3 cache, memory bandwidth).
func IntelRdtFs(l *LinuxFactory) error {
if !intelrdt.IsCATEnabled() && !intelrdt.IsMBAEnabled() {
l.NewIntelRdtManager = nil
if intelrdt.IsCATEnabled() || intelrdt.IsMBAEnabled() {
l.NewIntelRdtManager = intelrdt.NewManager
Copy link
Member Author

@thaJeztah thaJeztah Jan 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW; wondering why NewIntelRdtManager (and other fields in LinuxFactory are exported; perhaps they should not be)

} else {
l.NewIntelRdtManager = func(config *configs.Config, id string, path string) intelrdt.Manager {
return intelrdt.NewManager(config, id, path)
}
l.NewIntelRdtManager = nil
}
return nil
}
Expand Down
4 changes: 1 addition & 3 deletions utils_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ func loadFactory(context *cli.Context) (libcontainer.Factory, error) {
return nil, err
}

intelRdtManager := libcontainer.IntelRdtFs

// We resolve the paths for {newuidmap,newgidmap} from the context of runc,
// to avoid doing a path lookup in the nsexec context. TODO: The binary
// names are not currently configurable.
Expand All @@ -46,7 +44,7 @@ func loadFactory(context *cli.Context) (libcontainer.Factory, error) {
newgidmap = ""
}

return libcontainer.New(abs, intelRdtManager,
return libcontainer.New(abs, libcontainer.IntelRdtFs,
libcontainer.CriuPath(context.GlobalString("criu")),
libcontainer.NewuidmapPath(newuidmap),
libcontainer.NewgidmapPath(newgidmap))
Expand Down