vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #112 from jhowardmsft/processsyscalls

Browse source 
Refactor process.go for platform specific
This commit is contained in:
Michael Crosby 2016-02-26 11:04:19 -08:00
commit ab74e7b2aa
3 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
runtime/process.go
View file

@ -8,7 +8,6 @@ import (
"os"
"path/filepath"
"strconv"
"syscall"
"time"
"github.com/opencontainers/specs"
@ -122,22 +121,6 @@ func loadProcess(root, id string, c *container, s *ProcessState) (*process, erro
return p, nil
}
func getExitPipe(path string) (*os.File, error) {
if err := syscall.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
return nil, err
}
// add NONBLOCK in case the other side has already closed or else
// this function would never return
return os.OpenFile(path, syscall.O_RDONLY|syscall.O_NONBLOCK, 0)
}
func getControlPipe(path string) (*os.File, error) {
if err := syscall.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
return nil, err
}
return os.OpenFile(path, syscall.O_RDWR|syscall.O_NONBLOCK, 0)
}
type process struct {
root string
id string
@ -190,11 +173,6 @@ func (p *process) ExitStatus() (int, error) {
return strconv.Atoi(string(data))
}
// Signal sends the provided signal to the process
func (p *process) Signal(s os.Signal) error {
return syscall.Kill(p.pid, s.(syscall.Signal))
}
func (p *process) Spec() specs.Process {
return p.spec
}