Update containerd deps
This includes general fixes and the license change where the license is included in all files. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
		
							
								
								
									
										14
									
								
								vendor.conf
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								vendor.conf
									
									
									
									
									
								
							| @@ -1,10 +1,14 @@ | ||||
| github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 | ||||
| github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f | ||||
| github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e | ||||
| github.com/containerd/go-runc bcb223a061a3dd7de1a89c0b402a60f4dd9bd307 | ||||
| github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925 | ||||
| github.com/containerd/cgroups c0710c92e8b3a44681d1321dcfd1360fc5c6c089 | ||||
| github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788 | ||||
| github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c | ||||
| github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244 | ||||
| github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371 | ||||
| github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 | ||||
| github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098 | ||||
| github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 | ||||
| github.com/docker/go-units v0.3.1 | ||||
| github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f | ||||
| github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823 | ||||
| github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c | ||||
| @@ -12,15 +16,12 @@ github.com/prometheus/common 89604d197083d4781071d3c65855d24ecfb0a563 | ||||
| github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd | ||||
| github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 | ||||
| github.com/matttproud/golang_protobuf_extensions v1.0.0 | ||||
| github.com/docker/go-units v0.3.1 | ||||
| github.com/gogo/protobuf v0.5 | ||||
| github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9 | ||||
| github.com/opencontainers/runtime-spec v1.0.1 | ||||
| github.com/opencontainers/runc a618ab5a0186905949ee463dbb762c3d23e12a80 | ||||
| github.com/sirupsen/logrus v1.0.0 | ||||
| github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244 | ||||
| github.com/pmezard/go-difflib v1.0.0 | ||||
| github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6 | ||||
| github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c | ||||
| golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6 | ||||
| google.golang.org/grpc v1.7.4 | ||||
| @@ -28,7 +29,6 @@ github.com/pkg/errors v0.8.0 | ||||
| github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 | ||||
| golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 https://github.com/golang/sys | ||||
| github.com/opencontainers/image-spec v1.0.1 | ||||
| github.com/containerd/continuity d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371 | ||||
| golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c | ||||
| github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895 | ||||
| github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/console.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/console.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/console_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/console_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build linux | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										18
									
								
								vendor/github.com/containerd/console/console_unix.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								vendor/github.com/containerd/console/console_unix.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,4 +1,20 @@ | ||||
| // +build darwin freebsd linux solaris | ||||
| // +build darwin freebsd linux openbsd solaris | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/console_windows.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/console_windows.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/tc_darwin.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/tc_darwin.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/tc_freebsd.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/tc_freebsd.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										36
									
								
								vendor/github.com/containerd/console/tc_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										36
									
								
								vendor/github.com/containerd/console/tc_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
| @@ -13,25 +29,21 @@ const ( | ||||
| 	cmdTcSet = unix.TCSETS | ||||
| ) | ||||
|  | ||||
| func ioctl(fd, flag, data uintptr) error { | ||||
| 	if _, _, err := unix.Syscall(unix.SYS_IOCTL, fd, flag, data); err != 0 { | ||||
| // unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f. | ||||
| // unlockpt should be called before opening the slave side of a pty. | ||||
| func unlockpt(f *os.File) error { | ||||
| 	var u int32 | ||||
| 	if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))); err != 0 { | ||||
| 		return err | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| // unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f. | ||||
| // unlockpt should be called before opening the slave side of a pty. | ||||
| func unlockpt(f *os.File) error { | ||||
| 	var u int32 | ||||
| 	return ioctl(f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))) | ||||
| } | ||||
|  | ||||
| // ptsname retrieves the name of the first available pts for the given master. | ||||
| func ptsname(f *os.File) (string, error) { | ||||
| 	n, err := unix.IoctlGetInt(int(f.Fd()), unix.TIOCGPTN) | ||||
| 	if err != nil { | ||||
| 	var u uint32 | ||||
| 	if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCGPTN, uintptr(unsafe.Pointer(&u))); err != 0 { | ||||
| 		return "", err | ||||
| 	} | ||||
| 	return fmt.Sprintf("/dev/pts/%d", n), nil | ||||
| 	return fmt.Sprintf("/dev/pts/%d", u), nil | ||||
| } | ||||
|   | ||||
							
								
								
									
										51
									
								
								vendor/github.com/containerd/console/tc_openbsd_cgo.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										51
									
								
								vendor/github.com/containerd/console/tc_openbsd_cgo.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,51 @@ | ||||
| // +build openbsd,cgo | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
| 	"os" | ||||
|  | ||||
| 	"golang.org/x/sys/unix" | ||||
| ) | ||||
|  | ||||
| //#include <stdlib.h> | ||||
| import "C" | ||||
|  | ||||
| const ( | ||||
| 	cmdTcGet = unix.TIOCGETA | ||||
| 	cmdTcSet = unix.TIOCSETA | ||||
| ) | ||||
|  | ||||
| // ptsname retrieves the name of the first available pts for the given master. | ||||
| func ptsname(f *os.File) (string, error) { | ||||
| 	ptspath, err := C.ptsname(C.int(f.Fd())) | ||||
| 	if err != nil { | ||||
| 		return "", err | ||||
| 	} | ||||
| 	return C.GoString(ptspath), nil | ||||
| } | ||||
|  | ||||
| // unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f. | ||||
| // unlockpt should be called before opening the slave side of a pty. | ||||
| func unlockpt(f *os.File) error { | ||||
| 	if _, err := C.grantpt(C.int(f.Fd())); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| 	return nil | ||||
| } | ||||
							
								
								
									
										47
									
								
								vendor/github.com/containerd/console/tc_openbsd_nocgo.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								vendor/github.com/containerd/console/tc_openbsd_nocgo.go
									
									
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | ||||
| // +build openbsd,!cgo | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| // | ||||
| // Implementing the functions below requires cgo support.  Non-cgo stubs | ||||
| // versions are defined below to enable cross-compilation of source code | ||||
| // that depends on these functions, but the resultant cross-compiled | ||||
| // binaries cannot actually be used.  If the stub function(s) below are | ||||
| // actually invoked they will display an error message and cause the | ||||
| // calling process to exit. | ||||
| // | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
| 	"os" | ||||
|  | ||||
| 	"golang.org/x/sys/unix" | ||||
| ) | ||||
|  | ||||
| const ( | ||||
| 	cmdTcGet = unix.TIOCGETA | ||||
| 	cmdTcSet = unix.TIOCSETA | ||||
| ) | ||||
|  | ||||
| func ptsname(f *os.File) (string, error) { | ||||
| 	panic("ptsname() support requires cgo.") | ||||
| } | ||||
|  | ||||
| func unlockpt(f *os.File) error { | ||||
| 	panic("unlockpt() support requires cgo.") | ||||
| } | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/tc_solaris_cgo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/tc_solaris_cgo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build solaris,cgo | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/console/tc_solaris_nocgo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/console/tc_solaris_nocgo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build solaris,!cgo | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| // | ||||
| // Implementing the functions below requires cgo support.  Non-cgo stubs | ||||
| // versions are defined below to enable cross-compilation of source code | ||||
|   | ||||
							
								
								
									
										18
									
								
								vendor/github.com/containerd/console/tc_unix.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								vendor/github.com/containerd/console/tc_unix.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,4 +1,20 @@ | ||||
| // +build darwin freebsd linux solaris | ||||
| // +build darwin freebsd linux openbsd solaris | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package console | ||||
|  | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/fifo/fifo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/fifo/fifo.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package fifo | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/fifo/handle_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/fifo/handle_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build linux | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package fifo | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/fifo/handle_nolinux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/fifo/handle_nolinux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build !linux | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package fifo | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/fifo/mkfifo_nosolaris.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/fifo/mkfifo_nosolaris.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build !solaris | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package fifo | ||||
|  | ||||
| import "syscall" | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/fifo/mkfifo_solaris.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/fifo/mkfifo_solaris.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build solaris | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package fifo | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/command_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/command_linux.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/command_other.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/command_other.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,5 +1,21 @@ | ||||
| // +build !linux | ||||
|  | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/console.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/console.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/container.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/container.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import "time" | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/events.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/events.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| type Event struct { | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/io.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/io.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										16
									
								
								vendor/github.com/containerd/go-runc/monitor.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/containerd/go-runc/monitor.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
|   | ||||
							
								
								
									
										39
									
								
								vendor/github.com/containerd/go-runc/runc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										39
									
								
								vendor/github.com/containerd/go-runc/runc.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,3 +1,19 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
| @@ -21,6 +37,15 @@ import ( | ||||
| // Format is the type of log formatting options avaliable | ||||
| type Format string | ||||
|  | ||||
| // TopBody represents the structured data of the full ps output | ||||
| type TopResults struct { | ||||
| 	// Processes running in the container, where each is process is an array of values corresponding to the headers | ||||
| 	Processes [][]string `json:"Processes"` | ||||
|  | ||||
| 	// Headers are the names of the columns | ||||
| 	Headers []string `json:"Headers"` | ||||
| } | ||||
|  | ||||
| const ( | ||||
| 	none Format = "" | ||||
| 	JSON Format = "json" | ||||
| @@ -379,6 +404,20 @@ func (r *Runc) Ps(context context.Context, id string) ([]int, error) { | ||||
| 	return pids, nil | ||||
| } | ||||
|  | ||||
| // Top lists all the processes inside the container returning the full ps data | ||||
| func (r *Runc) Top(context context.Context, id string, psOptions string) (*TopResults, error) { | ||||
| 	data, err := cmdOutput(r.command(context, "ps", "--format", "table", id, psOptions), true) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("%s: %s", err, data) | ||||
| 	} | ||||
|  | ||||
| 	topResults, err := parsePSOutput(data) | ||||
| 	if err != nil { | ||||
| 		return nil, fmt.Errorf("%s: ", err) | ||||
| 	} | ||||
| 	return topResults, nil | ||||
| } | ||||
|  | ||||
| type CheckpointOpts struct { | ||||
| 	// ImagePath is the path for saving the criu image file | ||||
| 	ImagePath string | ||||
|   | ||||
							
								
								
									
										62
									
								
								vendor/github.com/containerd/go-runc/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										62
									
								
								vendor/github.com/containerd/go-runc/utils.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1,9 +1,26 @@ | ||||
| /* | ||||
|    Copyright The containerd Authors. | ||||
|  | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
|    You may obtain a copy of the License at | ||||
|  | ||||
|        http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  | ||||
|    Unless required by applicable law or agreed to in writing, software | ||||
|    distributed under the License is distributed on an "AS IS" BASIS, | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| */ | ||||
|  | ||||
| package runc | ||||
|  | ||||
| import ( | ||||
| 	"bytes" | ||||
| 	"io/ioutil" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"sync" | ||||
| 	"syscall" | ||||
| ) | ||||
| @@ -43,3 +60,48 @@ func putBuf(b *bytes.Buffer) { | ||||
| 	b.Reset() | ||||
| 	bytesBufferPool.Put(b) | ||||
| } | ||||
|  | ||||
| // fieldsASCII is similar to strings.Fields but only allows ASCII whitespaces | ||||
| func fieldsASCII(s string) []string { | ||||
| 	fn := func(r rune) bool { | ||||
| 		switch r { | ||||
| 		case '\t', '\n', '\f', '\r', ' ': | ||||
| 			return true | ||||
| 		} | ||||
| 		return false | ||||
| 	} | ||||
| 	return strings.FieldsFunc(s, fn) | ||||
| } | ||||
|  | ||||
| // parsePSOutput parses the runtime's ps raw output and returns a TopResults | ||||
| func parsePSOutput(output []byte) (*TopResults, error) { | ||||
| 	topResults := &TopResults{} | ||||
|  | ||||
| 	lines := strings.Split(string(output), "\n") | ||||
| 	topResults.Headers = fieldsASCII(lines[0]) | ||||
|  | ||||
| 	pidIndex := -1 | ||||
| 	for i, name := range topResults.Headers { | ||||
| 		if name == "PID" { | ||||
| 			pidIndex = i | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	for _, line := range lines[1:] { | ||||
| 		if len(line) == 0 { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		fields := fieldsASCII(line) | ||||
|  | ||||
| 		if fields[pidIndex] == "-" { | ||||
| 			continue | ||||
| 		} | ||||
|  | ||||
| 		process := fields[:len(topResults.Headers)-1] | ||||
| 		process = append(process, strings.Join(fields[len(topResults.Headers)-1:], " ")) | ||||
| 		topResults.Processes = append(topResults.Processes, process) | ||||
|  | ||||
| 	} | ||||
| 	return topResults, nil | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Michael Crosby
					Michael Crosby