Start work on Container and Process model

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

api/execution/container.pb.go

@@ -55,10 +55,11 @@ func (x Status) String() string {
 func (Status) EnumDescriptor() ([]byte, []int) { return fileDescriptorContainer, []int{0} }
 
 type CreateProcessRequest struct {
-	Process *Process `protobuf:"bytes,1,opt,name=process" json:"process,omitempty"`
+	ContainerId string   `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
-	Stdin   string   `protobuf:"bytes,2,opt,name=stdin,proto3" json:"stdin,omitempty"`
+	Process     *Process `protobuf:"bytes,2,opt,name=process" json:"process,omitempty"`
-	Stdout  string   `protobuf:"bytes,3,opt,name=stdout,proto3" json:"stdout,omitempty"`
+	Stdin       string   `protobuf:"bytes,3,opt,name=stdin,proto3" json:"stdin,omitempty"`
-	Stderr  string   `protobuf:"bytes,4,opt,name=stderr,proto3" json:"stderr,omitempty"`
+	Stdout      string   `protobuf:"bytes,4,opt,name=stdout,proto3" json:"stdout,omitempty"`
+	Stderr      string   `protobuf:"bytes,5,opt,name=stderr,proto3" json:"stderr,omitempty"`
 }
 
 func (m *CreateProcessRequest) Reset()                    { *m = CreateProcessRequest{} }
@@ -85,13 +86,15 @@ func (*Container) ProtoMessage()               {}
 func (*Container) Descriptor() ([]byte, []int) { return fileDescriptorContainer, []int{2} }
 
 type Process struct {
-	ID       string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	ID         string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Pid      uint64   `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
+	Pid        uint64   `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
-	Args     []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
+	Args       []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"`
-	Env      []string `protobuf:"bytes,4,rep,name=env" json:"env,omitempty"`
+	Env        []string `protobuf:"bytes,4,rep,name=env" json:"env,omitempty"`
-	User     *User    `protobuf:"bytes,5,opt,name=user" json:"user,omitempty"`
+	User       *User    `protobuf:"bytes,5,opt,name=user" json:"user,omitempty"`
-	Cwd      string   `protobuf:"bytes,6,opt,name=cwd,proto3" json:"cwd,omitempty"`
+	Cwd        string   `protobuf:"bytes,6,opt,name=cwd,proto3" json:"cwd,omitempty"`
-	Terminal bool     `protobuf:"varint,7,opt,name=terminal,proto3" json:"terminal,omitempty"`
+	Terminal   bool     `protobuf:"varint,7,opt,name=terminal,proto3" json:"terminal,omitempty"`
+	Status     Status   `protobuf:"varint,8,opt,name=status,proto3,enum=containerd.v1.Status" json:"status,omitempty"`
+	ExitStatus uint32   `protobuf:"varint,9,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
 }
 
 func (m *Process) Reset()                    { *m = Process{} }
@@ -240,8 +243,9 @@ func (this *CreateProcessRequest) GoString() string {
 	if this == nil {
 		return "nil"
 	}
-	s := make([]string, 0, 8)
+	s := make([]string, 0, 9)
 	s = append(s, "&execution.CreateProcessRequest{")
+	s = append(s, "ContainerId: "+fmt.Sprintf("%#v", this.ContainerId)+",\n")
 	if this.Process != nil {
 		s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n")
 	}
@@ -282,7 +286,7 @@ func (this *Process) GoString() string {
 	if this == nil {
 		return "nil"
 	}
-	s := make([]string, 0, 11)
+	s := make([]string, 0, 13)
 	s = append(s, "&execution.Process{")
 	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
 	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
@@ -293,6 +297,8 @@ func (this *Process) GoString() string {
 	}
 	s = append(s, "Cwd: "+fmt.Sprintf("%#v", this.Cwd)+",\n")
 	s = append(s, "Terminal: "+fmt.Sprintf("%#v", this.Terminal)+",\n")
+	s = append(s, "Status: "+fmt.Sprintf("%#v", this.Status)+",\n")
+	s = append(s, "ExitStatus: "+fmt.Sprintf("%#v", this.ExitStatus)+",\n")
 	s = append(s, "}")
 	return strings.Join(s, "")
 }
@@ -872,9 +878,15 @@ func (m *CreateProcessRequest) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.Process != nil {
+	if len(m.ContainerId) > 0 {
 		dAtA[i] = 0xa
 		i++
+		i = encodeVarintContainer(dAtA, i, uint64(len(m.ContainerId)))
+		i += copy(dAtA[i:], m.ContainerId)
+	}
+	if m.Process != nil {
+		dAtA[i] = 0x12
+		i++
 		i = encodeVarintContainer(dAtA, i, uint64(m.Process.Size()))
 		n1, err := m.Process.MarshalTo(dAtA[i:])
 		if err != nil {
@@ -883,19 +895,19 @@ func (m *CreateProcessRequest) MarshalTo(dAtA []byte) (int, error) {
 		i += n1
 	}
 	if len(m.Stdin) > 0 {
-		dAtA[i] = 0x12
+		dAtA[i] = 0x1a
 		i++
 		i = encodeVarintContainer(dAtA, i, uint64(len(m.Stdin)))
 		i += copy(dAtA[i:], m.Stdin)
 	}
 	if len(m.Stdout) > 0 {
-		dAtA[i] = 0x1a
+		dAtA[i] = 0x22
 		i++
 		i = encodeVarintContainer(dAtA, i, uint64(len(m.Stdout)))
 		i += copy(dAtA[i:], m.Stdout)
 	}
 	if len(m.Stderr) > 0 {
-		dAtA[i] = 0x22
+		dAtA[i] = 0x2a
 		i++
 		i = encodeVarintContainer(dAtA, i, uint64(len(m.Stderr)))
 		i += copy(dAtA[i:], m.Stderr)
@@ -1058,6 +1070,16 @@ func (m *Process) MarshalTo(dAtA []byte) (int, error) {
 		}
 		i++
 	}
+	if m.Status != 0 {
+		dAtA[i] = 0x40
+		i++
+		i = encodeVarintContainer(dAtA, i, uint64(m.Status))
+	}
+	if m.ExitStatus != 0 {
+		dAtA[i] = 0x48
+		i++
+		i = encodeVarintContainer(dAtA, i, uint64(m.ExitStatus))
+	}
 	return i, nil
 }
 
@@ -1507,6 +1529,10 @@ func encodeVarintContainer(dAtA []byte, offset int, v uint64) int {
 func (m *CreateProcessRequest) Size() (n int) {
 	var l int
 	_ = l
+	l = len(m.ContainerId)
+	if l > 0 {
+		n += 1 + l + sovContainer(uint64(l))
+	}
 	if m.Process != nil {
 		l = m.Process.Size()
 		n += 1 + l + sovContainer(uint64(l))
@@ -1590,6 +1616,12 @@ func (m *Process) Size() (n int) {
 	if m.Terminal {
 		n += 2
 	}
+	if m.Status != 0 {
+		n += 1 + sovContainer(uint64(m.Status))
+	}
+	if m.ExitStatus != 0 {
+		n += 1 + sovContainer(uint64(m.ExitStatus))
+	}
 	return n
 }
 
@@ -1773,6 +1805,7 @@ func (this *CreateProcessRequest) String() string {
 		return "nil"
 	}
 	s := strings.Join([]string{`&CreateProcessRequest{`,
+		`ContainerId:` + fmt.Sprintf("%v", this.ContainerId) + `,`,
 		`Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "Process", "Process", 1) + `,`,
 		`Stdin:` + fmt.Sprintf("%v", this.Stdin) + `,`,
 		`Stdout:` + fmt.Sprintf("%v", this.Stdout) + `,`,
@@ -1816,6 +1849,8 @@ func (this *Process) String() string {
 		`User:` + strings.Replace(fmt.Sprintf("%v", this.User), "User", "User", 1) + `,`,
 		`Cwd:` + fmt.Sprintf("%v", this.Cwd) + `,`,
 		`Terminal:` + fmt.Sprintf("%v", this.Terminal) + `,`,
+		`Status:` + fmt.Sprintf("%v", this.Status) + `,`,
+		`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -2003,6 +2038,35 @@ func (m *CreateProcessRequest) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ContainerId", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowContainer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthContainer
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ContainerId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Process", wireType)
 			}
@@ -2035,7 +2099,7 @@ func (m *CreateProcessRequest) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
-		case 2:
+		case 3:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Stdin", wireType)
 			}
@@ -2064,7 +2128,7 @@ func (m *CreateProcessRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Stdin = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 3:
+		case 4:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Stdout", wireType)
 			}
@@ -2093,7 +2157,7 @@ func (m *CreateProcessRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Stdout = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 4:
+		case 5:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Stderr", wireType)
 			}
@@ -2603,6 +2667,44 @@ func (m *Process) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.Terminal = bool(v != 0)
+		case 8:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
+			}
+			m.Status = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowContainer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Status |= (Status(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 9:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ExitStatus", wireType)
+			}
+			m.ExitStatus = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowContainer
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.ExitStatus |= (uint32(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipContainer(dAtA[iNdEx:])
@@ -4024,56 +4126,59 @@ var (
 func init() { proto.RegisterFile("container.proto", fileDescriptorContainer) }
 
 var fileDescriptorContainer = []byte{
-	// 812 bytes of a gzipped FileDescriptorProto
+	// 855 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x73, 0xd2, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x56, 0xd1, 0x72, 0xf2, 0x44,
-	0x14, 0x6e, 0x80, 0x86, 0x72, 0xb8, 0xf4, 0x72, 0xb7, 0xc0, 0x64, 0x98, 0x7b, 0x29, 0x37, 0x56,
+	0x14, 0x6e, 0x80, 0x86, 0xe6, 0xf0, 0xe7, 0x17, 0xb7, 0x81, 0xc9, 0x30, 0xca, 0xcf, 0x1f, 0xab,
-	0x65, 0x9c, 0x29, 0xad, 0xd5, 0xf1, 0xc5, 0xa7, 0x16, 0x10, 0xe9, 0x28, 0xe2, 0x52, 0xc6, 0x19,
+	0x32, 0xce, 0x94, 0x56, 0x74, 0xbc, 0xf1, 0xaa, 0x05, 0x44, 0x3a, 0x8a, 0xb8, 0x94, 0x71, 0xc6,
-	0x5f, 0x6a, 0x4a, 0x76, 0x68, 0x1c, 0x9a, 0xd0, 0x64, 0x53, 0xc7, 0x37, 0x7f, 0x81, 0xff, 0xc2,
+	0x1b, 0x4c, 0xc9, 0x0e, 0x8d, 0x43, 0x13, 0x9a, 0x6c, 0xaa, 0xde, 0xf5, 0x65, 0x7c, 0x80, 0xbe,
-	0x77, 0xfd, 0x17, 0x7d, 0xf4, 0xd1, 0x27, 0xc7, 0xf2, 0x0b, 0xfc, 0x09, 0xce, 0x6e, 0x16, 0x28,
+	0x45, 0x2f, 0xbd, 0xf4, 0xca, 0xb1, 0x3c, 0x81, 0x8f, 0xe0, 0x6c, 0xb2, 0x04, 0x48, 0x02, 0x3f,
-	0x49, 0xc0, 0x0a, 0x6f, 0x67, 0x4f, 0xce, 0x7e, 0xf9, 0xce, 0xb7, 0xfb, 0x9d, 0x04, 0xfe, 0xee,
+	0xa5, 0x77, 0x67, 0x0f, 0x67, 0xbf, 0xfd, 0xce, 0xb7, 0xfb, 0x1d, 0x02, 0xef, 0x8d, 0x6c, 0x8b,
-	0x5a, 0x26, 0xd5, 0x0c, 0x93, 0xd8, 0xe5, 0x81, 0x6d, 0x51, 0x0b, 0xa5, 0xc6, 0x09, 0xbd, 0x7c,
+	0xea, 0xa6, 0x45, 0x9c, 0xda, 0xd4, 0xb1, 0xa9, 0x8d, 0xe4, 0x30, 0x61, 0xd4, 0xee, 0x3e, 0x2f,
-	0x71, 0x3f, 0x9f, 0x24, 0x67, 0x03, 0xfa, 0xde, 0x7b, 0x96, 0xcf, 0xf4, 0xac, 0x9e, 0xc5, 0xc3,
+	0xe5, 0xc8, 0xcd, 0x94, 0xfe, 0x11, 0xfc, 0x56, 0x52, 0xc6, 0xf6, 0xd8, 0xf6, 0xc3, 0x13, 0x16,
-	0x1d, 0x16, 0x79, 0x59, 0xf5, 0xa3, 0x04, 0x99, 0x8a, 0x4d, 0x34, 0x4a, 0x5a, 0xb6, 0xd5, 0x25,
+	0x05, 0x59, 0xed, 0x41, 0x00, 0xa5, 0xe1, 0x10, 0x9d, 0x92, 0x9e, 0x63, 0x8f, 0x88, 0xeb, 0x62,
-	0x8e, 0x83, 0xc9, 0xb9, 0x4b, 0x1c, 0x8a, 0x76, 0x21, 0x3e, 0xf0, 0x32, 0x8a, 0x54, 0x94, 0x4a,
+	0x72, 0xeb, 0x11, 0x97, 0xa2, 0xb7, 0xf0, 0x2a, 0x04, 0x1b, 0x9a, 0x86, 0x2a, 0x54, 0x84, 0xaa,
-	0xc9, 0xbd, 0x5c, 0x79, 0x0a, 0xbc, 0x3c, 0xaa, 0x1f, 0x95, 0xa1, 0x0c, 0xac, 0x3a, 0x54, 0x37,
+	0x84, 0x73, 0x61, 0xae, 0x63, 0xa0, 0x53, 0xc8, 0x4e, 0x83, 0x4d, 0x6a, 0xaa, 0x22, 0x54, 0x73,
-	0x4c, 0x25, 0x52, 0x94, 0x4a, 0x09, 0xec, 0x2d, 0x50, 0x0e, 0x64, 0x87, 0xea, 0x96, 0x4b, 0x95,
+	0xf5, 0x62, 0x6d, 0xe5, 0xfc, 0xda, 0x1c, 0x72, 0x5e, 0x86, 0x14, 0xd8, 0x77, 0xa9, 0x61, 0x5a,
-	0x28, 0x4f, 0x8b, 0x95, 0xc8, 0x13, 0xdb, 0x56, 0x62, 0xe3, 0x3c, 0xb1, 0x6d, 0xb5, 0x01, 0x59,
+	0x6a, 0xda, 0x47, 0x0b, 0x16, 0xa8, 0x08, 0xa2, 0x4b, 0x0d, 0xdb, 0xa3, 0x6a, 0xc6, 0x4f, 0xf3,
-	0x1f, 0x1f, 0x67, 0x60, 0x99, 0x0e, 0xf9, 0x73, 0x42, 0xea, 0x27, 0x09, 0x12, 0x95, 0x51, 0x09,
+	0x15, 0xcf, 0x13, 0xc7, 0x51, 0xf7, 0xc3, 0x3c, 0x71, 0x1c, 0xad, 0x03, 0x85, 0x08, 0x65, 0x77,
-	0xca, 0x41, 0xc4, 0xd0, 0xf9, 0xd6, 0xc4, 0x81, 0x3c, 0xfc, 0xbe, 0x19, 0x69, 0x54, 0x71, 0xc4,
+	0x6a, 0x5b, 0x2e, 0x59, 0x26, 0x24, 0x6c, 0x45, 0x48, 0xfb, 0x53, 0x00, 0xa9, 0x31, 0x2f, 0x41,
-	0xd0, 0xd1, 0x26, 0x24, 0x4f, 0x5c, 0x53, 0xef, 0x93, 0xe3, 0x81, 0x46, 0x4f, 0x05, 0x79, 0xf0,
+	0x45, 0x48, 0xcd, 0x3b, 0x3d, 0x17, 0x67, 0xff, 0xbc, 0x49, 0x75, 0x9a, 0x38, 0x65, 0x1a, 0xe8,
-	0x52, 0x2d, 0x8d, 0x9e, 0x5e, 0x7f, 0x71, 0xf4, 0x66, 0x4a, 0x6c, 0xb3, 0xde, 0x34, 0xea, 0x3a,
+	0x0d, 0xe4, 0xae, 0x3c, 0xcb, 0x98, 0x90, 0xe1, 0x54, 0xa7, 0xd7, 0x7e, 0xb3, 0x12, 0x86, 0x20,
-	0xbc, 0xb7, 0xf5, 0xbd, 0xac, 0x6f, 0x43, 0x9b, 0x3f, 0xc4, 0xa2, 0x48, 0xfd, 0x2c, 0x41, 0x5c,
+	0xd5, 0xd3, 0xe9, 0xf5, 0xf2, 0xc1, 0xe9, 0xed, 0x94, 0x38, 0x66, 0xbd, 0xe9, 0xd4, 0x73, 0xfd,
-	0x60, 0xcc, 0x64, 0x99, 0x86, 0xe8, 0xc0, 0xd0, 0x39, 0xbb, 0x18, 0x66, 0x21, 0x42, 0x10, 0xd3,
+	0x9e, 0x5f, 0xd7, 0x0b, 0x91, 0x0d, 0x7d, 0xff, 0x47, 0xcc, 0x8b, 0xb4, 0xfb, 0x14, 0x64, 0x39,
-	0xec, 0x1e, 0xe3, 0x14, 0x2d, 0x25, 0x30, 0x8f, 0x59, 0x15, 0x31, 0x2f, 0x94, 0x18, 0x4f, 0xb1,
+	0xc6, 0x5a, 0x96, 0x79, 0x48, 0x4f, 0x4d, 0xc3, 0x67, 0x97, 0xc1, 0x2c, 0x44, 0x08, 0x32, 0xba,
-	0x10, 0xdd, 0x85, 0x98, 0xeb, 0x10, 0x5b, 0x59, 0xe5, 0xcc, 0x37, 0x7c, 0x44, 0x3a, 0x0e, 0xb1,
+	0x33, 0x66, 0x9c, 0xd2, 0x55, 0x09, 0xfb, 0x31, 0xab, 0x22, 0xd6, 0x9d, 0x9a, 0xf1, 0x53, 0x2c,
-	0x31, 0x2f, 0x60, 0x5b, 0xbb, 0xef, 0x74, 0x45, 0xe6, 0xed, 0xb3, 0x10, 0xe5, 0x61, 0x8d, 0x12,
+	0x44, 0x9f, 0x42, 0xc6, 0x73, 0x49, 0x20, 0x72, 0xae, 0x7e, 0x18, 0x21, 0x32, 0x70, 0x89, 0x83,
-	0xfb, 0xcc, 0x30, 0xb5, 0xbe, 0x12, 0x2f, 0x4a, 0xa5, 0x35, 0x3c, 0x5e, 0xab, 0x18, 0x62, 0x1d,
+	0xfd, 0x02, 0xb6, 0x75, 0xf4, 0x9b, 0xa1, 0x8a, 0x7e, 0xfb, 0x2c, 0x44, 0x25, 0x38, 0xa0, 0xc4,
-	0xb1, 0xcb, 0x15, 0x7c, 0x53, 0x98, 0x85, 0x2c, 0xd3, 0x13, 0x44, 0x53, 0x98, 0x85, 0xe8, 0x0e,
+	0xb9, 0x31, 0x2d, 0x7d, 0xa2, 0x66, 0x2b, 0x42, 0xf5, 0x00, 0x87, 0xeb, 0xa5, 0x0e, 0x0f, 0xb6,
-	0xac, 0x6b, 0xba, 0x6e, 0x50, 0xc3, 0x32, 0xb5, 0x7e, 0xdd, 0xd0, 0x3d, 0xca, 0x29, 0xec, 0xcb,
+	0xe8, 0x90, 0x69, 0x4c, 0x7e, 0x37, 0xe9, 0x90, 0xef, 0x91, 0x2a, 0x42, 0x55, 0xc6, 0xc0, 0x52,
-	0xaa, 0xdb, 0xb0, 0x51, 0x27, 0x74, 0x7c, 0x60, 0xa3, 0x8b, 0x38, 0x43, 0x11, 0xb5, 0x09, 0x99,
+	0x41, 0xa1, 0x86, 0x21, 0x33, 0xe0, 0x2c, 0x3c, 0xde, 0xbf, 0x8c, 0x59, 0xc8, 0x32, 0x63, 0xde,
-	0xe9, 0x72, 0x71, 0x4f, 0x1e, 0x41, 0x62, 0xdc, 0xa4, 0xb8, 0x29, 0x8a, 0xaf, 0xed, 0xc9, 0xa6,
+	0xb8, 0x8c, 0x59, 0x88, 0x3e, 0x81, 0xd7, 0xba, 0x61, 0x98, 0xd4, 0xb4, 0x2d, 0x7d, 0xd2, 0x36,
-	0x49, 0xa9, 0x7a, 0x0e, 0xb9, 0xce, 0x40, 0xd7, 0x28, 0x09, 0x30, 0x58, 0x10, 0xf1, 0xb7, 0x37,
+	0x8d, 0x40, 0x02, 0x19, 0x47, 0xb2, 0xda, 0x31, 0x1c, 0xb6, 0x09, 0x0d, 0x1f, 0xc0, 0xfc, 0xed,
-	0x4b, 0xdd, 0x81, 0x6c, 0x4b, 0x73, 0x1d, 0x72, 0xe3, 0x9e, 0x77, 0x21, 0x87, 0x89, 0xe3, 0x9e,
+	0xaf, 0x51, 0x58, 0xeb, 0x82, 0xb2, 0x5a, 0xce, 0xdf, 0xdd, 0x57, 0x20, 0x85, 0xbd, 0xf1, 0x97,
-	0xdd, 0x7c, 0x47, 0x1d, 0x36, 0xda, 0x54, 0xb3, 0xe9, 0xb2, 0xee, 0x56, 0x9f, 0x42, 0x66, 0x1a,
+	0xa7, 0x46, 0xba, 0x5d, 0x6c, 0x5a, 0x94, 0x6a, 0xb7, 0x50, 0x1c, 0x4c, 0x0d, 0x9d, 0x92, 0x18,
-	0x68, 0x61, 0x5b, 0xbe, 0x85, 0x7f, 0xea, 0xc4, 0x4f, 0x68, 0x51, 0x8d, 0xff, 0x03, 0x10, 0xb8,
+	0x83, 0x1d, 0x11, 0xdf, 0xf9, 0x52, 0xb5, 0x13, 0x28, 0xf4, 0x74, 0xcf, 0x25, 0x5b, 0xf7, 0x7c,
-	0xc7, 0xe2, 0xd6, 0x25, 0x70, 0x42, 0x64, 0x1a, 0xba, 0xfa, 0x04, 0xd0, 0xf5, 0x77, 0x2d, 0xcc,
+	0x0a, 0x45, 0x4c, 0x5c, 0xef, 0x66, 0xfb, 0x1d, 0x6d, 0x38, 0xec, 0x53, 0xdd, 0xa1, 0x91, 0x81,
-	0xf9, 0x0d, 0x64, 0xda, 0x46, 0xcf, 0xd4, 0xfa, 0x4b, 0x4f, 0x49, 0x36, 0xf7, 0x38, 0x92, 0xb0,
+	0xf2, 0x7c, 0x73, 0x7e, 0x0b, 0xca, 0x2a, 0xd0, 0xce, 0x36, 0xff, 0x15, 0xde, 0x6f, 0x93, 0x28,
-	0x88, 0x58, 0x31, 0x7d, 0xab, 0xa4, 0x4f, 0x96, 0x9f, 0xc3, 0xcc, 0x18, 0xcf, 0x0c, 0x67, 0xd4,
+	0xa1, 0x5d, 0x35, 0xfe, 0x10, 0x80, 0xe3, 0x0e, 0xf9, 0xab, 0x93, 0xb0, 0xc4, 0x33, 0x1d, 0x43,
-	0x34, 0x59, 0x56, 0x62, 0xf5, 0x39, 0x64, 0x7d, 0x78, 0x42, 0xc6, 0x87, 0x30, 0x52, 0x9a, 0x30,
+	0xfb, 0x06, 0xd0, 0xf2, 0x59, 0x3b, 0x73, 0xfe, 0x05, 0x94, 0xbe, 0x39, 0xb6, 0xf4, 0xc9, 0x4b,
-	0x72, 0xd1, 0x39, 0xe4, 0x26, 0x85, 0xf7, 0x1e, 0x83, 0xec, 0xcd, 0x3f, 0x94, 0x84, 0x78, 0x05,
+	0x75, 0xf4, 0xe7, 0xa8, 0x8f, 0xc4, 0x2d, 0xc2, 0x57, 0x4c, 0xdf, 0x26, 0x99, 0x90, 0xd8, 0xe8,
-	0xd7, 0xf6, 0x8f, 0x6a, 0xd5, 0xf4, 0x0a, 0x5b, 0xe0, 0x4e, 0xb3, 0xd9, 0x68, 0xd6, 0xd3, 0x12,
+	0x7f, 0x3e, 0xd7, 0x2e, 0x28, 0xdf, 0x99, 0xee, 0xbc, 0x69, 0xf2, 0x52, 0x89, 0xb5, 0xef, 0xa1,
-	0x5b, 0xb4, 0x8f, 0x5e, 0xb4, 0x5a, 0xb5, 0x6a, 0x3a, 0x82, 0x00, 0xe4, 0xd6, 0x7e, 0xa7, 0x5d,
+	0x10, 0xc1, 0xe3, 0x32, 0x7e, 0x09, 0x73, 0xa5, 0x09, 0x23, 0x97, 0xde, 0x40, 0x6e, 0x51, 0xf8,
-	0xab, 0xa6, 0xa3, 0x7b, 0x5f, 0x64, 0x48, 0x8f, 0x49, 0xb6, 0x89, 0x7d, 0x61, 0x74, 0x09, 0x6a,
+	0xd9, 0xd7, 0x20, 0x06, 0x43, 0x04, 0xe5, 0x20, 0xdb, 0xc0, 0xad, 0xb3, 0xcb, 0x56, 0x33, 0xbf,
-	0x42, 0xb4, 0x4e, 0x28, 0x52, 0x7d, 0xef, 0x0e, 0x19, 0x26, 0xf9, 0x5b, 0x73, 0x6b, 0x44, 0x5f,
+	0xc7, 0x16, 0x78, 0xd0, 0xed, 0x76, 0xba, 0xed, 0xbc, 0xc0, 0x16, 0xfd, 0xcb, 0x1f, 0x7a, 0xbd,
-	0x35, 0x90, 0xbd, 0x49, 0x80, 0x6e, 0xfb, 0xe7, 0x65, 0xe8, 0x80, 0xc8, 0x67, 0x7c, 0x65, 0x35,
+	0x56, 0x33, 0x9f, 0x42, 0x00, 0x62, 0xef, 0x6c, 0xd0, 0x6f, 0x35, 0xf3, 0xe9, 0xfa, 0x83, 0x08,
-	0xf6, 0xd9, 0x45, 0x15, 0x58, 0xe5, 0xee, 0x46, 0x5b, 0x7e, 0x51, 0xc2, 0x3c, 0x3f, 0x03, 0xa4,
+	0xf9, 0x90, 0x64, 0x9f, 0x38, 0x77, 0xe6, 0x88, 0xa0, 0x2e, 0xa4, 0xdb, 0x84, 0x22, 0x2d, 0x72,
-	0x06, 0xb2, 0xe7, 0xf8, 0x00, 0x97, 0xf0, 0x41, 0x30, 0x03, 0xe6, 0x35, 0xa4, 0xa6, 0xbe, 0xaa,
+	0x76, 0xc2, 0x30, 0x29, 0x7d, 0xb4, 0xb1, 0x86, 0xf7, 0xd5, 0x02, 0x31, 0x98, 0x04, 0xe8, 0xe3,
-	0xc8, 0x2f, 0x44, 0xd8, 0x3f, 0x40, 0x7e, 0x6b, 0x7e, 0x91, 0x90, 0xeb, 0x25, 0xc0, 0xc4, 0x63,
+	0xe8, 0xfc, 0x4d, 0x1c, 0x10, 0x25, 0x25, 0x52, 0xd6, 0x62, 0xff, 0xf4, 0xa8, 0x01, 0xfb, 0xbe,
-	0xa8, 0x18, 0x54, 0xd8, 0x87, 0xfa, 0xff, 0x9c, 0x0a, 0x01, 0xf9, 0x0a, 0xfe, 0xba, 0x3e, 0x6c,
+	0xbb, 0xd1, 0x51, 0x54, 0x94, 0x24, 0xcf, 0xaf, 0x01, 0x69, 0x81, 0x18, 0x38, 0x3e, 0xc6, 0x25,
-	0x02, 0x47, 0x1b, 0x32, 0xd2, 0x02, 0x47, 0x1b, 0x3a, 0xad, 0x0e, 0x21, 0x35, 0xe5, 0xe3, 0x80,
+	0x79, 0x10, 0xac, 0x81, 0xf9, 0x19, 0xe4, 0x95, 0x7f, 0x69, 0x14, 0x15, 0x22, 0xe9, 0xb3, 0xa3,
-	0x0e, 0x61, 0x2e, 0x9f, 0xa1, 0xe9, 0x21, 0xa4, 0xa6, 0x1c, 0x1b, 0xc0, 0x0a, 0xf3, 0xf3, 0xec,
+	0x74, 0xb4, 0xb9, 0x88, 0xcb, 0xf5, 0x23, 0xc0, 0xc2, 0x63, 0xa8, 0x12, 0x57, 0x38, 0x82, 0xfa,
-	0xf3, 0x99, 0xf2, 0x58, 0x00, 0x2b, 0xcc, 0xd1, 0x81, 0xf3, 0x09, 0xb5, 0xe9, 0xc1, 0xbf, 0x97,
+	0x76, 0x43, 0x05, 0x87, 0xfc, 0x09, 0x5e, 0x2d, 0x0f, 0x9b, 0xd8, 0xd5, 0x26, 0x8c, 0xb4, 0xd8,
-	0x57, 0x85, 0x95, 0x6f, 0x57, 0x85, 0x95, 0x9f, 0x57, 0x05, 0xe9, 0xc3, 0xb0, 0x20, 0x5d, 0x0e,
+	0xd5, 0x26, 0x4e, 0xab, 0x0b, 0x90, 0x57, 0x7c, 0x1c, 0xd3, 0x21, 0xc9, 0xe5, 0x6b, 0x34, 0xbd,
-	0x0b, 0xd2, 0xd7, 0x61, 0x41, 0xfa, 0x31, 0x2c, 0x48, 0x27, 0x32, 0xff, 0x0f, 0x7c, 0xf0, 0x2b,
+	0x00, 0x79, 0xc5, 0xb1, 0x31, 0xac, 0x24, 0x3f, 0xaf, 0xbf, 0x9f, 0x15, 0x8f, 0xc5, 0xb0, 0x92,
-	0x00, 0x00, 0xff, 0xff, 0xa5, 0x4c, 0x99, 0xef, 0x4c, 0x0a, 0x00, 0x00,
+	0x1c, 0x1d, 0xbb, 0x9f, 0x44, 0x9b, 0x9e, 0x7f, 0xf0, 0xf8, 0x54, 0xde, 0xfb, 0xfb, 0xa9, 0xbc,
+	0xf7, 0xdf, 0x53, 0x59, 0xb8, 0x9f, 0x95, 0x85, 0xc7, 0x59, 0x59, 0xf8, 0x6b, 0x56, 0x16, 0xfe,
+	0x9d, 0x95, 0x85, 0x2b, 0xd1, 0xff, 0xf4, 0xfc, 0xe2, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7,
+	0xae, 0x17, 0x04, 0xbf, 0x0a, 0x00, 0x00,
 }

api/execution/container.proto

@@ -20,10 +20,11 @@ service ContainerService {
 }
 
 message CreateProcessRequest {
-    Process process = 1;
+    string container_id = 1;
-    string stdin = 2;
+    Process process = 2;
-	string stdout = 3;
+    string stdin = 3;
-	string stderr = 4;
+	string stdout = 4;
+	string stderr = 5;
 }
 
 message CreateProcessResponse {
@@ -45,6 +46,8 @@ message Process {
 	User user = 5;
 	string cwd = 6;
 	bool terminal = 7;
+    Status status = 8;
+    uint32 exit_status = 9;
 }
 
 enum Status {

execution/container.go

@@ -0,0 +1,85 @@
+package execution
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	specs "github.com/opencontainers/runtime-spec/specs-go"
+)
+
+type ContainerController interface {
+	Pause(*Container) error
+	Resume(*Container) error
+	Status(*Container) (Status, error)
+	Process(c *Container, pid int) (*Process, error)
+	Processes(*Container) ([]*Process, error)
+}
+
+func NewContainer(c ContainerController) *Container {
+	return &Container{
+		controller: c,
+	}
+}
+
+type Container struct {
+	ID         string
+	Bundle     string
+	Root       string
+	controller ContainerController
+
+	processes map[int]*Process
+}
+
+func (c *Container) Process(pid int) (*Process, error) {
+	for _, p := range c.processes {
+		if p.Pid == pid {
+			return p, nil
+		}
+	}
+	return nil, fmt.Errorf("todo make real error")
+}
+
+func (c *Container) CreateProcess(spec *specs.Process) (*Process, error) {
+	if err := os.MkdirAll(filepath.Join(c.Root, c.getNextProcessID()), 0660); err != nil {
+		return nil, err
+	}
+	process := &Process{
+		Spec:       spec,
+		controller: c.controller,
+	}
+	c.processes = append(c.processes, process)
+	return process, nil
+}
+
+func (c *Container) DeleteProcess(pid int) error {
+	process, ok := c.processes[pid]
+	if !ok {
+		return fmt.Errorf("it no here")
+	}
+	if process.Status() != Stopped {
+		return fmt.Errorf("tototoit not stopped ok?")
+	}
+	delete(c.processes, pid)
+	return os.RemoveAll(p.Root)
+}
+
+func (c *Container) Processes() []*Process {
+	var out []*Process
+	for _, p := range c.processes {
+		out = append(out, p)
+	}
+	return out
+}
+
+func (c *Container) Pause() error {
+	return c.controller.Pause(c)
+}
+
+func (c *Container) Resume() error {
+	return c.controller.Resume(c)
+}
+
+func (c *Container) Status() (Status, error) {
+	return c.controller.Status(c)
+}

execution/executor.go

@@ -0,0 +1,17 @@
+package execution
+
+import "io"
+
+type CreateOpts struct {
+	Bundle string
+	Stdin  io.Reader
+	Stdout io.Writer
+	Stderr io.Writer
+}
+
+type Executor interface {
+	Create(id string, o CreateOpts) (*Container, error)
+	List() ([]*Container, error)
+	Load(id string) (*Container, error)
+	Delete(string) error
+}

execution/executors/oci/container.go

@@ -0,0 +1,23 @@
+package oci
+
+import "github.com/docker/containerd/execution"
+
+type containerController struct {
+	root string
+}
+
+func (c *containerController) Process(container *execution.Container, pid int) (*execution.Process, error) {
+
+}
+
+func (c *containerController) Processes(container *execution.Container) ([]*execution.Process, error) {
+
+}
+
+func (c *containerController) Pause(container *execution.Container) error {
+	return command(c.root, "pause", container.ID).Run()
+}
+
+func (c *containerController) Resume(container *execution.Container) error {
+	return command(c.root, "resume", container.ID).Run()
+}

execution/executors/oci/oci.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/docker/containerd"
+	"github.com/docker/containerd/execution"
 	"github.com/docker/containerd/executors"
 )
 
@@ -21,11 +22,9 @@ func init() {
 	executors.Register("runc", New)
 }
 
-func New() *OCIRuntime {
+func New(root string) *OCIRuntime {
 	return &OCIRuntime{
-		root: opts.Root,
+		root: root,
-		name: opts.Name,
-		args: opts.Args,
 	}
 }
 
@@ -33,48 +32,58 @@ type OCIRuntime struct {
 	// root holds runtime state information for the containers
 	// launched by the runtime
 	root string
-	// name is the name of the runtime, i.e. runc
-	name string
-	// args specifies additional arguments to the OCI runtime
-	args []string
 }
 
-func (r *OCIRuntime) Name() string {
+func (r *OCIRuntime) Create(id string, o execution.CreateOpts) (*execution.Container, error) {
-	return r.name
+	// /run/runc/redis/1/pid
-}
+	pidFile := filepath.Join(r.root, id, "1", "pid")
-
+	cmd := command(r.root, "create",
-func (r *OCIRuntime) Args() []string {
+		"--pid-file", pidFile,
-	return r.args
+		"--bundle", o.Bundle,
-}
+		id,
-
+	)
-func (r *OCIRuntime) Root() string {
+	cmd.Stdin, cmd.Stdout, cmd.Stderr = o.Stdin, o.Stdout, o.Stderr
-	return r.root
-}
-
-func (r *OCIRuntime) Create(c *containerd.Container) (containerd.ProcessDelegate, error) {
-	pidFile := fmt.Sprintf("%s/%s.pid", filepath.Join(r.root, c.ID()), "init")
-	cmd := r.Command("create", "--pid-file", pidFile, "--bundle", c.Path(), c.ID())
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = c.Stdin, c.Stdout, c.Stderr
 	if err := cmd.Run(); err != nil {
 		return nil, err
 	}
+	// TODO: kill on error
 	data, err := ioutil.ReadFile(pidFile)
 	if err != nil {
 		return nil, err
 	}
-	i, err := strconv.Atoi(string(data))
+	pid, err := strconv.Atoi(string(data))
 	if err != nil {
 		return nil, err
 	}
-	return newProcess(i)
+	container := execution.NewContainer(r)
+	container.ID = id
+	container.Root = filepath.Join(r.root, id)
+	container.Bundle = o.Bundle
+	process, err := container.CreateProcess(nil)
+	if err != nil {
+		return nil, err
+	}
+	process.Pid = pid
+	process.Stdin = o.Stdin
+	process.Stdout = o.Stdout
+	process.Stderr = o.Stderr
+	return container, nil
 }
 
-func (r *OCIRuntime) Start(c *containerd.Container) error {
+func (r *OCIRuntime) Load(id string) (containerd.ProcessDelegate, error) {
-	return r.Command("start", c.ID()).Run()
+	data, err := r.Command("state", id).Output()
+	if err != nil {
+		return nil, err
+	}
+	var s state
+	if err := json.Unmarshal(data, &s); err != nil {
+		return nil, err
+	}
+	return newProcess(s.Pid)
 }
 
-func (r *OCIRuntime) Delete(c *containerd.Container) error {
+func (r *OCIRuntime) Delete(id string) error {
-	return r.Command("delete", c.ID()).Run()
+	return command(r.root, "delete", id).Run()
 }
 
 func (r *OCIRuntime) Exec(c *containerd.Container, p *containerd.Process) (containerd.ProcessDelegate, error) {
@@ -115,21 +124,8 @@ type state struct {
 	Annotations map[string]string `json:"annotations"`
 }
 
-func (r *OCIRuntime) Load(id string) (containerd.ProcessDelegate, error) {
+func command(root, args ...string) *exec.Cmd {
-	data, err := r.Command("state", id).Output()
+	return exec.Command("runc", append(
-	if err != nil {
+		[]string{"--root", root},
-		return nil, err
+		args...)...)
-	}
-	var s state
-	if err := json.Unmarshal(data, &s); err != nil {
-		return nil, err
-	}
-	return newProcess(s.Pid)
-}
-
-func (r *OCIRuntime) Command(args ...string) *exec.Cmd {
-	baseArgs := append([]string{
-		"--root", r.root,
-	}, r.args...)
-	return exec.Command(r.name, append(baseArgs, args...)...)
 }

execution/executors/shim/shim.go

@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/docker/containerd"
-	"github.com/docker/containerd/execution/oci"
+	"github.com/docker/containerd/executors/oci"
 	"github.com/docker/containerd/monitor"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )

execution/process.go

@@ -0,0 +1,41 @@
+package execution
+
+import (
+	"io"
+	"os"
+
+	specs "github.com/opencontainers/runtime-spec/specs-go"
+)
+
+type ProcessController interface {
+	Start(*Process) error
+	Status(*Process) (Status, error)
+	Wait(*Process) (uint32, error)
+	Signal(*Process, os.Signal) error
+}
+
+type Process struct {
+	Pid    int
+	Spec   *specs.Process
+	Stdin  io.Reader
+	Stdout io.Writer
+	Stderr io.Writer
+
+	controller ProcessController
+}
+
+func (p *Process) Status() (Status, error) {
+	return p.controller.Status(p)
+}
+
+func (p *Process) Wait() (uint32, error) {
+	return p.controller.Wait(p)
+}
+
+func (p *Process) Signal(s os.Signal) error {
+	return p.controller.Signal(p, s)
+}
+
+func (p *Process) Start() error {
+	return p.controller.Start(p)
+}

execution/status.go

@@ -0,0 +1,10 @@
+package execution
+
+type Status string
+
+const (
+	Paused  Status = "paused"
+	Running Status = "running"
+	Stopped Status = "stopped"
+	Deleted Status = "deleted"
+)

executor.go

@@ -1,15 +0,0 @@
-package containerd
-
-import "errors"
-
-var ErrProcessSet = errors.New("container process is already set")
-
-type Executor interface {
-	List() ([]*Container, error)
-	Load(id string) (*Container, error)
-
-	Create(CreateOpts) (*Container, error)
-	Start(string) error
-	Delete(string) error
-	Exec(string, *Process) (ProcessDelegate, error)
-}

monitor/monitor_linux.go

@@ -1,120 +0,0 @@
-package monitor
-
-import (
-	"io"
-	"sync"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/containerd/sys"
-)
-
-type Monitorable interface {
-	FD() int
-	// Remove returns true if the monitorable should be removed
-	// from the event monitor under the lock of when the event was received
-	Remove() bool
-}
-
-type Flusher interface {
-	Flush() error
-}
-
-// New returns a new process monitor that emits events whenever the
-// state of the fd refering to a process changes
-func New() (*Monitor, error) {
-	fd, err := sys.EpollCreate1(0)
-	if err != nil {
-		return nil, err
-	}
-	return &Monitor{
-		epollFd:   fd,
-		receivers: make(map[int]Monitorable),
-		events:    make(chan Monitorable, 1024),
-	}, nil
-}
-
-type Monitor struct {
-	m         sync.Mutex
-	receivers map[int]Monitorable
-	events    chan Monitorable
-	epollFd   int
-}
-
-// Events returns a chan that receives a Monitorable when it's FD changes state
-func (m *Monitor) Events() chan Monitorable {
-	return m.events
-}
-
-// Add adds a process to the list of the one being monitored
-func (m *Monitor) Add(ma Monitorable) error {
-	m.m.Lock()
-	defer m.m.Unlock()
-	fd := ma.FD()
-	event := syscall.EpollEvent{
-		Fd:     int32(fd),
-		Events: syscall.EPOLLHUP,
-	}
-	if err := sys.EpollCtl(m.epollFd, syscall.EPOLL_CTL_ADD, fd, &event); err != nil {
-		return err
-	}
-	m.receivers[fd] = ma
-	return nil
-}
-
-// Remove deletes the Monitorable type from the monitor so that
-// no other events are generated
-func (m *Monitor) Remove(ma Monitorable) error {
-	m.m.Lock()
-	defer m.m.Unlock()
-	return m.remove(ma)
-}
-
-func (m *Monitor) remove(ma Monitorable) error {
-	fd := ma.FD()
-	delete(m.receivers, fd)
-	return syscall.EpollCtl(m.epollFd, syscall.EPOLL_CTL_DEL, fd, &syscall.EpollEvent{
-		Events: syscall.EPOLLHUP,
-		Fd:     int32(fd),
-	})
-}
-
-// Close cleans up resources allocated to the Monitor
-func (m *Monitor) Close() error {
-	return syscall.Close(m.epollFd)
-}
-
-func (m *Monitor) Run() {
-	var events [128]syscall.EpollEvent
-	for {
-		n, err := sys.EpollWait(m.epollFd, events[:], -1)
-		if err != nil {
-			if err == syscall.EINTR {
-				continue
-			}
-			logrus.WithField("error", err).Fatal("shim: epoll wait")
-		}
-		for i := 0; i < n; i++ {
-			fd := int(events[i].Fd)
-			m.m.Lock()
-			r := m.receivers[fd]
-			if f, ok := r.(Flusher); ok {
-				if err := f.Flush(); err != nil {
-					logrus.WithField("error", err).Fatal("shim: flush event FD")
-				}
-			}
-			if r.Remove() {
-				if err := m.remove(r); err != nil {
-					logrus.WithField("error", err).Fatal("shim: remove event FD")
-				}
-			}
-			if f, ok := r.(io.Closer); ok {
-				if err := f.Close(); err != nil {
-					logrus.WithField("error", err).Fatal("shim: close event FD")
-				}
-			}
-			m.m.Unlock()
-			m.events <- r
-		}
-	}
-}

monitor/monitor_solaris.go

@@ -1,29 +0,0 @@
-package monitor
-
-import "errors"
-
-func New() (*Monitor, error) {
-	return nil, errors.New("Monitor NewMonitor() not implemented on Solaris")
-}
-
-type Monitor struct {
-}
-
-func (m *Monitor) Events() chan Monitorable {
-	return nil
-}
-
-func (m *Monitor) Add(Monitorable) error {
-	return errors.New("Monitor Add() not implemented on Solaris")
-}
-
-func (m *Monitor) Remove(Monitorable) error {
-	return errors.New("Monitor Remove() not implemented on Solaris")
-}
-
-func (m *Monitor) Close() error {
-	return errors.New("Monitor Close() not implemented on Solaris")
-}
-
-func (m *Monitor) Run() {
-}

process.go

@@ -1,58 +0,0 @@
-package containerd
-
-import (
-	"errors"
-	"io"
-	"os"
-
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-var ErrNotExecProcess = errors.New("process not an exec process")
-
-type ProcessDelegate interface {
-	Pid() int
-	Wait() (uint32, error)
-	Signal(os.Signal) error
-}
-
-type Process struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-
-	exec bool
-	s    *specs.Process
-
-	driver Runtime
-	c      *Container
-	d      ProcessDelegate
-}
-
-func (p *Process) Spec() *specs.Process {
-	return p.s
-}
-
-func (p *Process) Start() error {
-	if !p.exec {
-		return ErrNotExecProcess
-	}
-	d, err := p.driver.Exec(p.c, p)
-	if err != nil {
-		return err
-	}
-	p.d = d
-	return nil
-}
-
-func (p *Process) Pid() int {
-	return p.d.Pid()
-}
-
-func (p *Process) Wait() (uint32, error) {
-	return p.d.Wait()
-}
-
-func (p *Process) Signal(s os.Signal) error {
-	return p.d.Signal(s)
-}

services/execution/service.go

@@ -3,8 +3,8 @@ package execution
 import (
 	"context"
 
-	"github.com/docker/containerd"
 	api "github.com/docker/containerd/api/execution"
+	"github.com/docker/containerd/execution"
 	"github.com/docker/containerd/executors"
 )
 
@@ -14,10 +14,7 @@ type Opts struct {
 }
 
 func New(o Opts) (*Service, error) {
-	executor, err := executors.Get(o.Runtime)(o.Root)
+	executor := executors.Get(o.Runtime)(o.Root)
-	if err != nil {
-		return nil, err
-	}
 	return &Service{
 		o:        o,
 		executor: executor,
@@ -26,7 +23,7 @@ func New(o Opts) (*Service, error) {
 
 type Service struct {
 	o        Opts
-	executor containerd.Executor
+	executor execution.Executor
 }
 
 func (s *Service) Create(ctx context.Context, r *api.CreateContainerRequest) (*api.CreateContainerResponse, error) {
@@ -36,7 +33,7 @@ func (s *Service) Create(ctx context.Context, r *api.CreateContainerRequest) (*a
 		return nil, err
 	}
 
-	s.supervisor.Add(container.Process())
+	s.supervisor.Add(container.InitProcess())
 
 	return &api.CreateContainerResponse{
 		Container: toGRPCContainer(container),
@@ -60,6 +57,123 @@ func (s *Service) List(ctx context.Context, r *api.ListContainerRequest) (*api.L
 	}
 	return r, nil
 }
+func (s *Service) Get(ctx context.Context, r *api.GetContainerRequest) (*api.GetContainerResponse, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	return &api.GetContainerResponse{
+		Container: toGRPCContainer(container),
+	}, nil
+}
+
+func (s *Service) Update(ctx context.Context, r *api.UpdateContainerRequest) (*api.Empty, error) {
+	return nil, nil
+}
+
+func (s *Service) Pause(ctx context.Context, r *api.PauseContainerRequest) (*api.Empty, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	return nil, container.Pause()
+}
+
+func (s *Service) Resume(ctx context.Context, r *api.ResumeContainerRequest) (*api.Empty, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	return nil, container.Resume()
+}
+
+func (s *Service) CreateProcess(ctx context.Context, r *api.CreateProcessRequest) (*api.CreateProcessResponse, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	process, err := container.CreateProcess(r.Process)
+	if err != nil {
+		return nil, err
+	}
+
+	s.supervisor.Add(process)
+
+	r.Process.Pid = process.Pid()
+	return &api.CreateProcessResponse{
+		Process: r.Process,
+	}, nil
+}
+
+// containerd managed execs + system pids forked in container
+func (s *Service) GetProcess(ctx context.Context, r *api.GetProcessRequest) (*api.GetProcessResponse, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	process, err := container.Process(r.ProcessId)
+	if err != nil {
+		return nil, err
+	}
+	return &api.GetProcessResponse{
+		Process: process,
+	}, nil
+}
+
+func (s *Service) StartProcess(ctx context.Context, r *api.StartProcessRequest) (*api.StartProcessResponse, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	process, err := container.Process(r.Process.ID)
+	if err != nil {
+		return nil, err
+	}
+	if err := process.Start(); err != nil {
+		return nil, err
+	}
+	return &api.StartProcessRequest{
+		Process: process,
+	}, nil
+}
+
+func (s *Service) SignalProcess(ctx context.Context, r *api.SignalProcessRequest) (*api.Empty, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	process, err := container.Process(r.Process.ID)
+	if err != nil {
+		return nil, err
+	}
+	return nil, process.Signal(r.Signal)
+}
+
+func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest) (*api.Empty, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	if err := container.DeleteProcess(r.Process.ID); err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+func (s *Service) ListProcesses(ctx context.Context, r *api.ListProcessesRequest) (*api.ListProcessesResponse, error) {
+	container, err := s.executor.Load(r.ID)
+	if err != nil {
+		return nil, err
+	}
+	processes, err := container.Processes()
+	if err != nil {
+		return nil, err
+	}
+	return &api.ListProcessesResponse{
+		Processes: processes,
+	}, nil
+}
 
 var (
 	_ = (api.ExecutionServiceServer)(&Service{})