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

Move runtime interfaces to runtime package

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-28 10:10:59 -07:00
parent bd25543f5a
commit 7c8acca29a
11 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
linux/task.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/containerd/containerd/api/types/task"
client "github.com/containerd/containerd/linux/shim"
shim "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
protobuf "github.com/gogo/protobuf/types"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
@@ -32,8 +32,8 @@ func newTask(id, namespace string, spec []byte, shim *client.Client) *Task {
}
}
func (t *Task) Info() plugin.TaskInfo {
return plugin.TaskInfo{
func (t *Task) Info() runtime.TaskInfo {
return runtime.TaskInfo{
ID: t.containerID,
ContainerID: t.containerID,
Runtime: pluginID,
@@ -50,24 +50,24 @@ func (t *Task) Start(ctx context.Context) error {
return err
}
func (t *Task) State(ctx context.Context) (plugin.State, error) {
func (t *Task) State(ctx context.Context) (runtime.State, error) {
response, err := t.shim.State(ctx, empty)
if err != nil {
return plugin.State{}, errors.New(grpc.ErrorDesc(err))
return runtime.State{}, errors.New(grpc.ErrorDesc(err))
}
var status plugin.Status
var status runtime.Status
switch response.Status {
case task.StatusCreated:
status = plugin.CreatedStatus
status = runtime.CreatedStatus
case task.StatusRunning:
status = plugin.RunningStatus
status = runtime.RunningStatus
case task.StatusStopped:
status = plugin.StoppedStatus
status = runtime.StoppedStatus
case task.StatusPaused:
status = plugin.PausedStatus
status = runtime.PausedStatus
// TODO: containerd.DeletedStatus
}
return plugin.State{
return runtime.State{
Pid: response.Pid,
Status: status,
Stdin: response.Stdin,
@@ -105,7 +105,7 @@ func (t *Task) Kill(ctx context.Context, signal uint32, pid uint32, all bool) er
return err
}
func (t *Task) Exec(ctx context.Context, opts plugin.ExecOpts) (plugin.Process, error) {
func (t *Task) Exec(ctx context.Context, opts runtime.ExecOpts) (runtime.Process, error) {
request := &shim.ExecProcessRequest{
Stdin: opts.IO.Stdin,
Stdout: opts.IO.Stdout,
@@ -144,7 +144,7 @@ func (t *Task) Processes(ctx context.Context) ([]uint32, error) {
return pids, nil
}
func (t *Task) ResizePty(ctx context.Context, pid uint32, size plugin.ConsoleSize) error {
func (t *Task) ResizePty(ctx context.Context, pid uint32, size runtime.ConsoleSize) error {
_, err := t.shim.ResizePty(ctx, &shim.ResizePtyRequest{
Pid: pid,
Width: size.Width,
@@ -178,14 +178,14 @@ func (t *Task) Checkpoint(ctx context.Context, path string, options map[string]s
return nil
}
func (t *Task) DeleteProcess(ctx context.Context, pid uint32) (*plugin.Exit, error) {
func (t *Task) DeleteProcess(ctx context.Context, pid uint32) (*runtime.Exit, error) {
r, err := t.shim.DeleteProcess(ctx, &shim.DeleteProcessRequest{
Pid: pid,
})
if err != nil {
return nil, errors.New(grpc.ErrorDesc(err))
}
return &plugin.Exit{
return &runtime.Exit{
Status: r.ExitStatus,
Timestamp: r.ExitedAt,
Pid: pid,
@@ -218,7 +218,7 @@ func (p *Process) Kill(ctx context.Context, signal uint32, _ bool) error {
return err
}
func (p *Process) State(ctx context.Context) (plugin.State, error) {
func (p *Process) State(ctx context.Context) (runtime.State, error) {
// use the container status for the status of the process
state, err := p.t.State(ctx)
if err != nil {