diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-04-11 15:06:11 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-04-11 14:27:17 +0000 |
| commit | 3f7932d24f9b230ac0e3592093a15a5a8c0a3770 (patch) | |
| tree | 904de8641bddcba7d52263dfb361cdba5faeaa03 /pkg/instance/instance.go | |
| parent | da2de8407550b81caeab72cf2fe645d1705f409e (diff) | |
vm: combine Run and MonitorExecution
All callers of Run always call MonitorExecution right after it.
Combine these 2 methods. This allows to hide some implementation
details and simplify users of vm package.
Diffstat (limited to 'pkg/instance/instance.go')
| -rw-r--r-- | pkg/instance/instance.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go index 1e4787c94..4c61b1d24 100644 --- a/pkg/instance/instance.go +++ b/pkg/instance/instance.go @@ -388,11 +388,11 @@ func (inst *inst) testInstance() error { cmd := OldFuzzerCmd(fuzzerBin, executorBin, targets.TestOS, inst.cfg.TargetOS, inst.cfg.TargetArch, fwdAddr, inst.cfg.Sandbox, inst.cfg.SandboxArg, 0, inst.cfg.Cover, true, inst.optionalFlags, inst.cfg.Timeouts.Slowdown) - outc, errc, err := inst.vm.Run(10*time.Minute*inst.cfg.Timeouts.Scale, nil, cmd) + timeout := 10 * time.Minute * inst.cfg.Timeouts.Scale + _, rep, err := inst.vm.Run(timeout, inst.reporter, cmd) if err != nil { return fmt.Errorf("failed to run binary in VM: %w", err) } - rep := inst.vm.MonitorExecution(outc, errc, inst.reporter, vm.ExitNormal) if rep != nil { if err := inst.reporter.Symbolize(rep); err != nil { // TODO(dvyukov): send such errors to dashboard. @@ -424,9 +424,9 @@ func (inst *inst) testRepro() ([]byte, error) { return nil, err } if res != nil && res.Report != nil { - return res.RawOutput, &CrashError{Report: res.Report} + return res.Output, &CrashError{Report: res.Report} } - return res.RawOutput, nil + return res.Output, nil } out := []byte{} if len(inst.reproSyz) > 0 { |