Skip to content

pkg/osutil: add a WriteJSON helper #5631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
a-nogikh merged 1 commit into from
Dec 20, 2024
Merged

pkg/osutil: add a WriteJSON helper #5631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/osutil/osutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"bytes"
"compress/gzip"
"context"
"encoding/json"
"errors"
"fmt"
"io"
Expand Down Expand Up @@ -279,6 +280,14 @@ func WriteFile(filename string, data []byte) error {
return os.WriteFile(filename, data, DefaultFilePerm)
}

func WriteJSON[T any](filename string, obj T) error {
jsonData, err := json.MarshalIndent(obj, "", "\t")
if err != nil {
return fmt.Errorf("failed to marshal: %w", err)
}
return WriteFile(filename, jsonData)
}

func WriteGzipStream(filename string, reader io.Reader) error {
f, err := os.Create(filename)
if err != nil {
Expand Down
20 changes: 8 additions & 12 deletions syz-manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,10 @@ func (mgr *Manager) saveCrash(crash *manager.Crash) bool {
log.Logf(0, "VM %v: crash: %v%v", crash.InstanceIndex, crash.Title, flags)

if mgr.mode.FailOnCrashes {
mgr.saveJSON("report.json", crash.Report)
path := filepath.Join(mgr.cfg.Workdir, "report.json")
if err := osutil.WriteJSON(path, crash.Report); err != nil {
log.Fatal(err)
}
log.Fatalf("kernel crashed in smoke testing mode, exiting")
}

Expand Down Expand Up @@ -742,16 +745,6 @@ func (mgr *Manager) saveCrash(crash *manager.Crash) bool {
return mgr.NeedRepro(crash)
}

func (mgr *Manager) saveJSON(filename string, object any) {
data, err := json.MarshalIndent(object, "", "\t")
if err != nil {
log.Fatalf("failed to serialize json data: %v", err)
}
if err := osutil.WriteFile(filepath.Join(mgr.cfg.Workdir, filename), data); err != nil {
log.Fatal(err)
}
}

func (mgr *Manager) needLocalRepro(crash *manager.Crash) bool {
if !mgr.cfg.Reproduce || crash.Corrupted || crash.Suppressed {
return false
Expand Down Expand Up @@ -1197,7 +1190,10 @@ func (mgr *Manager) MachineChecked(features flatrpc.Feature, enabledSyscalls map
if err != nil {
log.Fatalf("interface probing failed: %v", err)
}
mgr.saveJSON("interfaces.json", res)
path := filepath.Join(mgr.cfg.Workdir, "interfaces.json")
if err := osutil.WriteJSON(path, res); err != nil {
log.Fatal(err)
}
mgr.exit("interface probe")
}()
return exec
Expand Down
Loading