diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2024-08-05 14:52:26 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2024-08-06 08:24:55 +0000 |
| commit | a3f4678cf05abc5cc55d005e3446da56f60b7ad1 (patch) | |
| tree | 0940d9f3e35236fd307460ff05f548a332784562 | |
| parent | 02d235671dbf89097f52a94a165703fa274079a2 (diff) | |
syz-manager: move fullReproLog() to pkg/repro
| -rw-r--r-- | pkg/repro/repro.go | 10 | ||||
| -rw-r--r-- | syz-manager/manager.go | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go index bce3563e6..5565460c2 100644 --- a/pkg/repro/repro.go +++ b/pkg/repro/repro.go @@ -886,3 +886,13 @@ var cSimplifies = append(progSimplifies, []Simplify{ return true }, }...) + +func (stats *Stats) FullLog() []byte { + if stats == nil { + return nil + } + return []byte(fmt.Sprintf("Extracting prog: %v\nMinimizing prog: %v\n"+ + "Simplifying prog options: %v\nExtracting C: %v\nSimplifying C: %v\n\n\n%s", + stats.ExtractProgTime, stats.MinimizeProgTime, + stats.SimplifyProgTime, stats.ExtractCTime, stats.SimplifyCTime, stats.Log)) +} diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 7486b771f..116af87cf 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -956,7 +956,7 @@ func truncateReproLog(log []byte) []byte { } func (mgr *Manager) saveFailedRepro(rep *report.Report, stats *repro.Stats) { - reproLog := fullReproLog(stats) + reproLog := stats.FullLog() if mgr.dash != nil { if rep.Type == crash_pkg.MemoryLeak { // Don't send failed leak repro attempts to dashboard @@ -1049,7 +1049,7 @@ func (mgr *Manager) saveRepro(res *ReproResult) { ReproOpts: repro.Opts.Serialize(), ReproSyz: progText, ReproC: cprogText, - ReproLog: truncateReproLog(fullReproLog(res.stats)), + ReproLog: truncateReproLog(res.stats.FullLog()), Assets: mgr.uploadReproAssets(repro), OriginalTitle: res.crash.Title, } @@ -1099,7 +1099,7 @@ func (mgr *Manager) saveRepro(res *ReproResult) { osutil.WriteFile(filepath.Join(dir, "strace.log"), res.strace.Output) } } - if reproLog := fullReproLog(res.stats); len(reproLog) > 0 { + if reproLog := res.stats.FullLog(); len(reproLog) > 0 { osutil.WriteFile(filepath.Join(dir, "repro.stats"), reproLog) } } @@ -1131,16 +1131,6 @@ func (mgr *Manager) uploadReproAssets(repro *repro.Result) []dashapi.NewAsset { return ret } -func fullReproLog(stats *repro.Stats) []byte { - if stats == nil { - return nil - } - return []byte(fmt.Sprintf("Extracting prog: %v\nMinimizing prog: %v\n"+ - "Simplifying prog options: %v\nExtracting C: %v\nSimplifying C: %v\n\n\n%s", - stats.ExtractProgTime, stats.MinimizeProgTime, - stats.SimplifyProgTime, stats.ExtractCTime, stats.SimplifyCTime, stats.Log)) -} - func (mgr *Manager) corpusInputHandler(updates <-chan corpus.NewItemEvent) { for update := range updates { if len(update.NewCover) != 0 && mgr.coverFilter != nil { |