pkg/cri: optimize slice initialization

thaJeztah · thaJeztah · commit 4f39b164f3a5 · 2023-01-24T20:46:20.000+01:00
Some of this code was originally added in b7b1200, which likely meant to initialize the slice with a length to reduce allocations, however, instead of initializing with a zero-length and a capacity, it initialized the slice with a fixed length, which was corrected in commit 0c63c42. This patch initializes the slice with a zero-length and expected capacity. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/sbserver/helpers.go
@@ -478,7 +478,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
 		}
 
 		if spec.Linux.Resources.HugepageLimits != nil {
-			hugepageLimits := make([]*runtime.HugepageLimit, 0)
+			hugepageLimits := make([]*runtime.HugepageLimit, 0, len(spec.Linux.Resources.HugepageLimits))
 			for _, l := range spec.Linux.Resources.HugepageLimits {
 				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
 					PageSize: l.Pagesize,
diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
@@ -476,7 +476,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)
 		}
 
 		if spec.Linux.Resources.HugepageLimits != nil {
-			hugepageLimits := make([]*runtime.HugepageLimit, 0)
+			hugepageLimits := make([]*runtime.HugepageLimit, 0, len(spec.Linux.Resources.HugepageLimits))
 			for _, l := range spec.Linux.Resources.HugepageLimits {
 				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{
 					PageSize: l.Pagesize,
diff --git a/pkg/cri/store/container/status.go b/pkg/cri/store/container/status.go
@@ -219,7 +219,7 @@ func deepCopyOf(s Status) Status {
 	}
 	copy.Resources = &runtime.ContainerResources{}
 	if s.Resources != nil && s.Resources.Linux != nil {
-		hugepageLimits := make([]*runtime.HugepageLimit, 0)
+		hugepageLimits := make([]*runtime.HugepageLimit, 0, len(s.Resources.Linux.HugepageLimits))
 		for _, l := range s.Resources.Linux.HugepageLimits {
 			if l != nil {
 				hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{

Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)`
`478`	`478`	`}`
`479`	`479`
`480`	`480`	`if spec.Linux.Resources.HugepageLimits != nil {`
`481`		`- hugepageLimits := make([]*runtime.HugepageLimit, 0)`
	`481`	`+ hugepageLimits := make([]*runtime.HugepageLimit, 0, len(spec.Linux.Resources.HugepageLimits))`
`482`	`482`	`for _, l := range spec.Linux.Resources.HugepageLimits {`
`483`	`483`	`hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{`
`484`	`484`	`PageSize: l.Pagesize,`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status)`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`if spec.Linux.Resources.HugepageLimits != nil {`
`479`		`- hugepageLimits := make([]*runtime.HugepageLimit, 0)`
	`479`	`+ hugepageLimits := make([]*runtime.HugepageLimit, 0, len(spec.Linux.Resources.HugepageLimits))`
`480`	`480`	`for _, l := range spec.Linux.Resources.HugepageLimits {`
`481`	`481`	`hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{`
`482`	`482`	`PageSize: l.Pagesize,`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ func deepCopyOf(s Status) Status {`
`219`	`219`	`}`
`220`	`220`	`copy.Resources = &runtime.ContainerResources{}`
`221`	`221`	`if s.Resources != nil && s.Resources.Linux != nil {`
`222`		`- hugepageLimits := make([]*runtime.HugepageLimit, 0)`
	`222`	`+ hugepageLimits := make([]*runtime.HugepageLimit, 0, len(s.Resources.Linux.HugepageLimits))`
`223`	`223`	`for _, l := range s.Resources.Linux.HugepageLimits {`
`224`	`224`	`if l != nil {`
`225`	`225`	`hugepageLimits = append(hugepageLimits, &runtime.HugepageLimit{`