[incompatible] killall child processes when sending SIGKILL on Unix systems

Makefile

@@ -15,7 +15,6 @@ lint: deps
 	golint -set_exit_status ./...
 
 cover: deps
-	go get github.com/axw/gocov/gocov
 	goveralls
 
 .PHONY: test deps lint cover

appveyor.yml

@@ -0,0 +1,9 @@
+version: "{build}"
+clone_folder: c:\gopath\src\github.com\Songmu\timeout
+environment:
+  GOPATH: c:\gopath
+build: false
+test_script:
+- go get -d -v -t ./...
+- go tool vet -all .
+- go test ./...

timeout.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
-	"strconv"
 
 	"syscall"
 	"time"
@@ -104,7 +103,7 @@ func (tio *Timeout) signal() os.Signal {
 
 // Run is synchronous interface of executing command and returning information
 func (tio *Timeout) Run() (ExitStatus, string, string, error) {
-	cmd := tio.Cmd
+	cmd := tio.getCmd()
 	var outBuffer, errBuffer bytes.Buffer
 	cmd.Stdout = &outBuffer
 	cmd.Stderr = &errBuffer
@@ -120,7 +119,7 @@ func (tio *Timeout) Run() (ExitStatus, string, string, error) {
 
 // RunSimple executes command and only returns integer as exit code. It is mainly for go-timeout command
 func (tio *Timeout) RunSimple(preserveStatus bool) int {
-	cmd := tio.Cmd
+	cmd := tio.getCmd()
 
 	stdoutPipe, err := cmd.StdoutPipe()
 	if err != nil {
@@ -168,7 +167,7 @@ func getExitCodeFromErr(err error) int {
 
 // RunCommand is executing the command and handling timeout. This is primitive interface of Timeout
 func (tio *Timeout) RunCommand() (chan ExitStatus, error) {
-	cmd := tio.Cmd
+	cmd := tio.getCmd()
 
 	if err := cmd.Start(); err != nil {
 		switch {
@@ -199,7 +198,7 @@ func (tio *Timeout) RunCommand() (chan ExitStatus, error) {
 }
 
 func (tio *Timeout) handleTimeout() (ex ExitStatus) {
-	cmd := tio.Cmd
+	cmd := tio.getCmd()
 	exitChan := getExitChan(cmd)
 	select {
 	case exitCode := <-exitChan:
@@ -215,9 +214,8 @@ func (tio *Timeout) handleTimeout() (ex ExitStatus) {
 		select {
 		case ex.Code = <-exitChan:
 		case <-time.After(tio.KillAfter):
-			if runtime.GOOS == "windows" {
-				exec.Command("taskkill", "/F", "/T", "/PID", strconv.Itoa(cmd.Process.Pid)).Run()
-			}
+			tio.killall()
+			// just to make sure
 			cmd.Process.Kill()
 			ex.Code = exitKilled
 			ex.typ = exitTypeKilled

timeout_test.go

@@ -72,7 +72,7 @@ func TestPreserveStatus(t *testing.T) {
 		t.Skipf("skip test on Windows")
 	}
 	tio := &Timeout{
-		Cmd:      exec.Command("perl", "test/exit_with_23.pl"),
+		Cmd:      exec.Command("perl", "testdata/exit_with_23.pl"),
 		Duration: 1 * time.Second,
 	}
 
@@ -84,7 +84,7 @@ func TestPreserveStatus(t *testing.T) {
 
 func TestKillAfter(t *testing.T) {
 	tio := &Timeout{
-		Cmd:       exec.Command("perl", "test/ignore_sigterm.pl"),
+		Cmd:       exec.Command("perl", "testdata/ignore_sigterm.pl"),
 		Signal:    syscall.SIGTERM,
 		Duration:  1 * time.Second,
 		KillAfter: 1 * time.Second,
@@ -98,7 +98,7 @@ func TestKillAfter(t *testing.T) {
 
 func TestKillAfterNotKilled(t *testing.T) {
 	tio := &Timeout{
-		Cmd:       exec.Command("perl", "test/ignore_sigterm.pl"),
+		Cmd:       exec.Command("perl", "testdata/ignore_sigterm.pl"),
 		Signal:    syscall.SIGTERM,
 		Duration:  1 * time.Second,
 		KillAfter: 5 * time.Second,
@@ -116,7 +116,7 @@ func TestCommandCannotBeInvoked(t *testing.T) {
 		t.Skipf("skip test on Windows")
 	}
 	tio := &Timeout{
-		Cmd:      exec.Command("test/dummy"),
+		Cmd:      exec.Command("testdata/dummy"),
 		Duration: 1 * time.Second,
 	}
 	exit := tio.RunSimple(false)
@@ -132,7 +132,7 @@ func TestCommandNotFound(t *testing.T) {
 		t.Skipf("skip test on Windows")
 	}
 	tio := &Timeout{
-		Cmd:      exec.Command("test/ignore_sigterm.pl-xxxxxxxxxxxxxxxxxxxxx"),
+		Cmd:      exec.Command("testdata/ignore_sigterm.pl-xxxxxxxxxxxxxxxxxxxxx"),
 		Duration: 1 * time.Second,
 	}
 	exit := tio.RunSimple(false)

timeout_unix.go

@@ -0,0 +1,19 @@
+// +build !windows
+
+package timeout
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+func (tio *Timeout) getCmd() *exec.Cmd {
+	if tio.Cmd.SysProcAttr == nil {
+		tio.Cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+	}
+	return tio.Cmd
+}
+
+func (tio *Timeout) killall() error {
+	return syscall.Kill(-tio.Cmd.Process.Pid, syscall.SIGKILL)
+}

timeout_windows.go

@@ -0,0 +1,20 @@
+package timeout
+
+import (
+	"os/exec"
+	"strconv"
+	"syscall"
+)
+
+func (tio *Timeout) getCmd() *exec.Cmd {
+	if tio.Cmd.SysProcAttr == nil {
+		tio.Cmd.SysProcAttr = &syscall.SysProcAttr{
+			CreationFlags: syscall.CREATE_UNICODE_ENVIRONMENT | 0x00000200,
+		}
+	}
+	return tio.Cmd
+}
+
+func (tio *Timeout) killall() error {
+	return exec.Command("taskkill", "/F", "/T", "/PID", strconv.Itoa(tio.Cmd.Process.Pid)).Run()
+}