containerd-shim-runc-v2: remove unnecessary s.getContainer()

cyyzero · thaJeztah · commit 6982a0df5bc0 · 2023-10-10T12:07:02.000+02:00
Previous code has already called `getContainer()`, just pass it into `s.getContainerPids` to reduce unnecessary lock and map lookup. Signed-off-by: Chen Yiyang <cyyzero@qq.com> (cherry picked from commit 6604ff6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go
@@ -461,7 +461,7 @@ func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (*taskAPI.Pi
 	if err != nil {
 		return nil, err
 	}
-	pids, err := s.getContainerPids(ctx, r.ID)
+	pids, err := s.getContainerPids(ctx, container)
 	if err != nil {
 		return nil, errdefs.ToGRPC(err)
 	}
@@ -663,16 +663,12 @@ func (s *service) handleProcessExit(e runcC.Exit, c *runc.Container, p process.P
 	})
 }
 
-func (s *service) getContainerPids(ctx context.Context, id string) ([]uint32, error) {
-	container, err := s.getContainer(id)
-	if err != nil {
-		return nil, err
-	}
+func (s *service) getContainerPids(ctx context.Context, container *runc.Container) ([]uint32, error) {
 	p, err := container.Process("")
 	if err != nil {
 		return nil, errdefs.ToGRPC(err)
 	}
-	ps, err := p.(*process.Init).Runtime().Ps(ctx, id)
+	ps, err := p.(*process.Init).Runtime().Ps(ctx, container.ID)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ func (s service) Pids(ctx context.Context, r taskAPI.PidsRequest) (*taskAPI.Pi`
`461`	`461`	`if err != nil {`
`462`	`462`	`return nil, err`
`463`	`463`	`}`
`464`		`- pids, err := s.getContainerPids(ctx, r.ID)`
	`464`	`+ pids, err := s.getContainerPids(ctx, container)`
`465`	`465`	`if err != nil {`
`466`	`466`	`return nil, errdefs.ToGRPC(err)`
`467`	`467`	`}`
`@@ -663,16 +663,12 @@ func (s service) handleProcessExit(e runcC.Exit, c runc.Container, p process.P`
`663`	`663`	`})`
`664`	`664`	`}`
`665`	`665`
`666`		`-func (s *service) getContainerPids(ctx context.Context, id string) ([]uint32, error) {`
`667`		`- container, err := s.getContainer(id)`
`668`		`- if err != nil {`
`669`		`- return nil, err`
`670`		`- }`
	`666`	`+func (s service) getContainerPids(ctx context.Context, container runc.Container) ([]uint32, error) {`
`671`	`667`	`p, err := container.Process("")`
`672`	`668`	`if err != nil {`
`673`	`669`	`return nil, errdefs.ToGRPC(err)`
`674`	`670`	`}`
`675`		`- ps, err := p.(*process.Init).Runtime().Ps(ctx, id)`
	`671`	`+ ps, err := p.(*process.Init).Runtime().Ps(ctx, container.ID)`
`676`	`672`	`if err != nil {`
`677`	`673`	`return nil, err`
`678`	`674`	`}`