reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2025-03-04 01:27:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm/gvisor: use timeout for all runsc invocations

Browse Source 
runsc likes to hang dead. Add timeouts to all invocations.
This commit is contained in:
Dmitry Vyukov 2018-06-22 18:37:02 +02:00
parent b5323c280f
commit 412bfd3c58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vm/gvisor/gvisor.go
View File

@ -111,7 +111,7 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) {
}
// Kill the previous instance in case it's still running.
inst.runscCmd("delete", "-force", inst.name).CombinedOutput()
osutil.Run(time.Minute, inst.runscCmd("delete", "-force", inst.name))
time.Sleep(3 * time.Second)
cmd := inst.runscCmd("run", "-bundle", bundleDir, inst.name)
@ -187,11 +187,11 @@ func (inst *instance) runscCmd(add ...string) *exec.Cmd {
func (inst *instance) Close() {
time.Sleep(3 * time.Second)
inst.runscCmd("delete", "-force", inst.name).CombinedOutput()
osutil.Run(time.Minute, inst.runscCmd("delete", "-force", inst.name))
inst.cmd.Process.Kill()
inst.merger.Wait()
inst.cmd.Wait()
inst.runscCmd("delete", "-force", inst.name).CombinedOutput()
osutil.Run(time.Minute, inst.runscCmd("delete", "-force", inst.name))
time.Sleep(3 * time.Second)
}
@ -308,7 +308,7 @@ func (inst *instance) guestProxy() (*os.File, error) {
}
func (inst *instance) Diagnose() bool {
inst.runscCmd("debug", "-stacks", inst.name).CombinedOutput()
osutil.Run(time.Minute, inst.runscCmd("debug", "-stacks", inst.name))
return true
}