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

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

Browse Source 
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>
This commit is contained in:
Chen Yiyang 2023-09-16 19:33:18 +08:00 committed by Sigma
parent 3a3d5dee15
commit 6604ff6c55
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/v2/runc/task/service.go
View File

@ -462,7 +462,7 @@ func (s *service) Pids(ctx context.Context, r *taskAPI.PidsRequest) (*taskAPI.Pi
if err != nil { if err != nil {
return nil, err return nil, err
} }
pids, err := s.getContainerPids(ctx, r.ID) pids, err := s.getContainerPids(ctx, container)
if err != nil { if err != nil {
return nil, errdefs.ToGRPC(err) return nil, errdefs.ToGRPC(err)
} }
@ -664,16 +664,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) { func (s *service) getContainerPids(ctx context.Context, container *runc.Container) ([]uint32, error) {
container, err := s.getContainer(id)
if err != nil {
return nil, err
}
p, err := container.Process("") p, err := container.Process("")
if err != nil { if err != nil {
return nil, errdefs.ToGRPC(err) 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 { if err != nil {
return nil, err return nil, err
} }