Make exec driver run a blocking command

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-01-17 17:42:22 -08:00
parent 92e6db7beb
commit f846ecdc77
5 changed files with 82 additions and 53 deletions
+15 -5
View File
@@ -17,7 +17,7 @@ func (d *driver) String() string {
return "chroot"
}
func (d *driver) Start(c *execdriver.Process) error {
func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallback) (int, error) {
params := []string{
"chroot",
c.Rootfs,
@@ -40,17 +40,27 @@ func (d *driver) Start(c *execdriver.Process) error {
c.Args = append([]string{name}, arg...)
if err := c.Start(); err != nil {
return err
return -1, err
}
var (
waitErr error
waitLock = make(chan struct{})
)
go func() {
if err := c.Wait(); err != nil {
c.WaitError = err
waitErr = err
}
close(c.WaitLock)
close(waitLock)
}()
return nil
if startCallback != nil {
startCallback(c)
}
<-waitLock
return c.GetExitCode(), waitErr
}
func (d *driver) Kill(p *execdriver.Process, sig int) error {