fowler/ALHP.GO
1
0
Fork 0
forked from ALHP/ALHP.GO
Code Issues Pull Requests Projects Releases Wiki Activity

better pgid killing

Browse Source
This commit is contained in:
Giovanni Harting
2021-06-14 16:14:17 +02:00
parent 877243dfce
commit 02fcc08f00
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@@ -59,7 +59,7 @@ type BuildManager struct {
exit bool exit bool
wg sync.WaitGroup wg sync.WaitGroup
failedMutex sync.RWMutex failedMutex sync.RWMutex
buildProcesses []*syscall.SysProcAttr buildProcesses []*os.Process
buildProcMutex sync.RWMutex buildProcMutex sync.RWMutex
} }
@@ -256,14 +256,14 @@ func (b *BuildManager) buildWorker(id int) {
check(cmd.Start()) check(cmd.Start())
b.buildProcMutex.Lock() b.buildProcMutex.Lock()
b.buildProcesses = append(b.buildProcesses, cmd.SysProcAttr) b.buildProcesses = append(b.buildProcesses, cmd.Process)
b.buildProcMutex.Unlock() b.buildProcMutex.Unlock()
err := cmd.Wait() err := cmd.Wait()
b.buildProcMutex.Lock() b.buildProcMutex.Lock()
for i := range b.buildProcesses { for i := range b.buildProcesses {
if b.buildProcesses[i].Pgid == cmd.SysProcAttr.Pgid { if b.buildProcesses[i].Pid == cmd.Process.Pid {
b.buildProcesses = append(b.buildProcesses[:i], b.buildProcesses[i+1:]...) b.buildProcesses = append(b.buildProcesses[:i], b.buildProcesses[i+1:]...)
break break
} }
@@ -675,7 +675,10 @@ func main() {
buildManager.exit = true buildManager.exit = true
buildManager.buildProcMutex.RLock() buildManager.buildProcMutex.RLock()
for _, p := range buildManager.buildProcesses { for _, p := range buildManager.buildProcesses {
check(syscall.Kill(p.Pgid*-1, syscall.SIGTERM)) pgid, err := syscall.Getpgid(p.Pid)
check(err)
check(syscall.Kill(-pgid, syscall.SIGTERM))
} }
buildManager.buildProcMutex.RUnlock() buildManager.buildProcMutex.RUnlock()