diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-07-26 11:42:15 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-07-26 13:48:19 +0000 |
| commit | 46eb10b79c61c4032281212d862c913683ab32a0 (patch) | |
| tree | 5e1ca2335b0c18301ff9e2d97d44cd4403c849fb /syz-manager | |
| parent | 7e805b6a42655e3b327f820cd56f88b99ab4db2a (diff) | |
vm/dispatcher: move boot duration calculation to vm
This should be calculated in dispatcher.Pool that actually does boot
VMs.
Diffstat (limited to 'syz-manager')
| -rw-r--r-- | syz-manager/manager.go | 7 | ||||
| -rw-r--r-- | syz-manager/stats.go | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/syz-manager/manager.go b/syz-manager/manager.go index e8af56520..15d76dd4e 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -118,8 +118,6 @@ type Manager struct { assetStorage *asset.Storage - bootTime stat.AverageValue[time.Duration] - reproMgr *reproManager Stats @@ -730,8 +728,6 @@ func (mgr *Manager) fuzzerInstance(ctx context.Context, inst *vm.Instance, updIn func (mgr *Manager) runInstanceInner(ctx context.Context, inst *vm.Instance, instanceName string, injectExec <-chan bool) (*report.Report, []byte, error) { - start := time.Now() - fwdAddr, err := inst.Forward(mgr.serv.Port) if err != nil { return nil, nil, fmt.Errorf("failed to setup port forwarding: %w", err) @@ -748,8 +744,7 @@ func (mgr *Manager) runInstanceInner(ctx context.Context, inst *vm.Instance, ins } // Run the fuzzer binary. - mgr.bootTime.Save(time.Since(start)) - start = time.Now() + start := time.Now() host, port, err := net.SplitHostPort(fwdAddr) if err != nil { diff --git a/syz-manager/stats.go b/syz-manager/stats.go index f096e4423..29c938453 100644 --- a/syz-manager/stats.go +++ b/syz-manager/stats.go @@ -44,7 +44,7 @@ func (mgr *Manager) initStats() { mgr.statAvgBootTime = stat.New("instance restart", "Average VM restart time (sec)", stat.NoGraph, func() int { - return int(mgr.bootTime.Value().Seconds()) + return int(mgr.pool.BootTime.Value().Seconds()) }, func(v int, _ time.Duration) string { return fmt.Sprintf("%v sec", v) |