Merge pull request #175 from crosbymichael/container-signal

Add signal API to Container interface
This commit is contained in:
Alexander Morozov 2015-08-04 08:40:10 -07:00
commit 072fa6fdcc
3 changed files with 20 additions and 1 deletions

View File

@ -5,6 +5,8 @@
package libcontainer
import (
"os"
"github.com/opencontainers/runc/libcontainer/configs"
)
@ -159,4 +161,10 @@ type Container interface {
// errors:
// Systemerror - System error.
NotifyOOM() (<-chan struct{}, error)
// Signal sends the provided signal code to the container's initial process.
//
// errors:
// Systemerror - System error.
Signal(s os.Signal) error
}

View File

@ -118,6 +118,13 @@ func (c *linuxContainer) Start(process *Process) error {
return nil
}
func (c *linuxContainer) Signal(s os.Signal) error {
if err := c.initProcess.signal(s); err != nil {
return newSystemError(err)
}
return nil
}
func (c *linuxContainer) newParentProcess(p *Process, doInit bool) (parentProcess, error) {
parentPipe, childPipe, err := newPipe()
if err != nil {

View File

@ -106,7 +106,11 @@ func (p *nonChildProcess) startTime() (string, error) {
}
func (p *nonChildProcess) signal(s os.Signal) error {
return newGenericError(fmt.Errorf("restored process cannot be signaled"), SystemError)
proc, err := os.FindProcess(p.processPid)
if err != nil {
return err
}
return proc.Signal(s)
}
func (p *nonChildProcess) externalDescriptors() []string {