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

shim: Ps -> Processes

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2017-05-17 12:58:03 -04:00
parent 395d21018f
commit 70dd7fcc60
9 changed files with 132 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linux/container.go
View File

@@ -114,8 +114,8 @@ func (c *Container) Exec(ctx context.Context, opts plugin.ExecOpts) (plugin.Proc
}, nil
}
func (c *Container) Ps(ctx context.Context) ([]uint32, error) {
resp, err := c.shim.Ps(ctx, &shim.PsRequest{
func (c *Container) Processes(ctx context.Context) ([]uint32, error) {
resp, err := c.shim.Processes(ctx, &shim.ProcessesRequest{
ID: c.id,
})
@@ -123,9 +123,9 @@ func (c *Container) Ps(ctx context.Context) ([]uint32, error) {
return nil, err
}
pids := make([]uint32, 0, len(resp.Ps))
pids := make([]uint32, 0, len(resp.Processes))
for _, ps := range resp.Ps {
for _, ps := range resp.Processes {
pids = append(pids, ps.Pid)
}

4
linux/shim/client.go
View File

@@ -82,8 +82,8 @@ func (c *client) Kill(ctx context.Context, in *shimapi.KillRequest, opts ...grpc
return c.s.Kill(ctx, in)
}
func (c *client) Ps(ctx context.Context, in *shimapi.PsRequest, opts ...grpc.CallOption) (*shimapi.PsResponse, error) {
return c.s.Ps(ctx, in)
func (c *client) Processes(ctx context.Context, in *shimapi.ProcessesRequest, opts ...grpc.CallOption) (*shimapi.ProcessesResponse, error) {
return c.s.Processes(ctx, in)
}
func (c *client) Exit(ctx context.Context, in *shimapi.ExitRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {

10
linux/shim/service.go
View File

@@ -250,20 +250,20 @@ func (s *Service) Kill(ctx context.Context, r *shimapi.KillRequest) (*google_pro
return empty, nil
}
func (s *Service) Ps(ctx context.Context, r *shimapi.PsRequest) (*shimapi.PsResponse, error) {
func (s *Service) Processes(ctx context.Context, r *shimapi.ProcessesRequest) (*shimapi.ProcessesResponse, error) {
pids, err := s.getContainerPids(ctx, r.ID)
if err != nil {
return nil, err
}
ps := []*shimapi.Ps{}
ps := []*container.Process{}
for _, pid := range pids {
ps = append(ps, &shimapi.Ps{
ps = append(ps, &container.Process{
Pid: pid,
})
}
resp := &shimapi.PsResponse{
Ps: ps,
resp := &shimapi.ProcessesResponse{
Processes: ps,
}
return resp, nil