diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-06-20 15:26:37 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-06-22 16:40:45 +0200 |
| commit | 87bfb99cfe1eef9469625911574b1caab04557d3 (patch) | |
| tree | d29a283db2df928698c2c39850b1133b11ef55b6 /pkg | |
| parent | ef9ddfbe36910afb0336375fec3cfed65a74897f (diff) | |
vm: pass instance to MonitorExecution
It may need it later to try to obtain additional
diagnostic from hanged instances.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/instance/instance.go | 4 | ||||
| -rw-r--r-- | pkg/repro/repro.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 9a1b95dae..2410713ae 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -240,7 +240,7 @@ func (inst *inst) testInstance() error { if err != nil { return fmt.Errorf("failed to run binary in VM: %v", err) } - rep := vm.MonitorExecution(outc, errc, inst.reporter, true) + rep := inst.vm.MonitorExecution(outc, errc, inst.reporter, true) if rep != nil { if err := inst.reporter.Symbolize(rep); err != nil { // TODO(dvyukov): send such errors to dashboard. @@ -323,7 +323,7 @@ func (inst *inst) testProgram(command string, testTime time.Duration) error { if err != nil { return fmt.Errorf("failed to run binary in VM: %v", err) } - rep := vm.MonitorExecution(outc, errc, inst.reporter, true) + rep := inst.vm.MonitorExecution(outc, errc, inst.reporter, true) if rep == nil { return nil } diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go index c6106b4bd..2501d1672 100644 --- a/pkg/repro/repro.go +++ b/pkg/repro/repro.go @@ -610,7 +610,7 @@ func (ctx *context) testImpl(inst *vm.Instance, command string, duration time.Du if err != nil { return false, fmt.Errorf("failed to run command in VM: %v", err) } - rep := vm.MonitorExecution(outc, errc, ctx.reporter, true) + rep := inst.MonitorExecution(outc, errc, ctx.reporter, true) if rep == nil { ctx.reproLog(2, "program did not crash") return false, nil |