diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-07-24 13:50:57 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-07-24 14:39:45 +0000 |
| commit | 63e964d2e8f81b4364fdd5fde9ffa74af9d04147 (patch) | |
| tree | 2698626e468651c0af4fa7c540d9f92290a54885 /pkg/stat | |
| parent | bd8900c38af45bfa8f8e451267d0e3548b68e295 (diff) | |
pkg/stat: don't depend on pkg/html/pages
It's useful to collect stats in low-level packages like prog,
but pkg/html/pages recursively depend on prog, so currently it's impossible.
Make pkg/stat not dependent on pkg/html/pages.
Diffstat (limited to 'pkg/stat')
| -rw-r--r-- | pkg/stat/set.go | 92 | ||||
| -rw-r--r-- | pkg/stat/set_test.go | 8 |
2 files changed, 25 insertions, 75 deletions
diff --git a/pkg/stat/set.go b/pkg/stat/set.go index 4f8f75375..4982362d9 100644 --- a/pkg/stat/set.go +++ b/pkg/stat/set.go @@ -4,7 +4,6 @@ package stat import ( - "bytes" "fmt" "reflect" "sort" @@ -14,7 +13,6 @@ import ( "time" "github.com/VividCortex/gohistogram" - "github.com/google/syzkaller/pkg/html/pages" "github.com/prometheus/client_golang/prometheus" ) @@ -28,7 +26,7 @@ import ( // // stat.New("metric name", "metric description", LenOf(mySlice, rwMutex)) // -// Metric visualization code uses Collect/RenderHTML functions to obtain values of all registered metrics. +// Metric visualization code uses Collect/RenderGraphs functions to obtain values of all registered metrics. type UI struct { Name string @@ -47,8 +45,8 @@ func Collect(level Level) []UI { return global.Collect(level) } -func RenderHTML() ([]byte, error) { - return global.RenderHTML() +func RenderGraphs() []UIGraph { + return global.RenderGraphs() } var global = newSet(256, true) @@ -391,22 +389,24 @@ func (s *set) compress() { } } -func (s *set) RenderHTML() ([]byte, error) { +type UIGraph struct { + ID int + Title string + Stacked bool + Level Level + Lines []string + Points []UIPoint +} + +type UIPoint struct { + X int + Y []float64 +} + +func (s *set) RenderGraphs() []UIGraph { s.mu.Lock() defer s.mu.Unlock() - type Point struct { - X int - Y []float64 - } - type Graph struct { - ID int - Title string - Stacked bool - Level Level - Lines []string - Points []Point - } - var graphs []Graph + var graphs []UIGraph tick := s.historyScale * int(tickPeriod.Seconds()) for title, graph := range s.graphs { if len(graph.lines) == 0 { @@ -419,12 +419,12 @@ func (s *set) RenderHTML() ([]byte, error) { sort.Slice(lines, func(i, j int) bool { return lines[i].order < lines[j].order }) - g := Graph{ + g := UIGraph{ ID: len(graphs), Title: title, Stacked: graph.stacked, Level: graph.level, - Points: make([]Point, s.historyPos), + Points: make([]UIPoint, s.historyPos), } for i := 0; i < s.historyPos; i++ { g.Points[i].X = i * tick @@ -456,53 +456,5 @@ func (s *set) RenderHTML() ([]byte, error) { } return graphs[i].Title < graphs[j].Title }) - buf := new(bytes.Buffer) - err := htmlTemplate.Execute(buf, graphs) - return buf.Bytes(), err + return graphs } - -var htmlTemplate = pages.Create(` -<!doctype html> -<html> -<head> - <title>syzkaller stats</title> - <script type="text/javascript" src="https://www.google.com/jsapi"></script> - <script type="text/javascript"> - google.load("visualization", "1", {packages:["corechart"]}); - google.setOnLoadCallback(function() { - {{range $g := .}} - new google.visualization. {{if $g.Stacked}} AreaChart {{else}} LineChart {{end}} ( - document.getElementById('div_{{$g.ID}}')). - draw(google.visualization.arrayToDataTable([ - ["-" {{range $line := $g.Lines}} , '{{$line}}' {{end}}], - {{range $p := $g.Points}} [ {{$p.X}} {{range $y := $p.Y}} , {{$y}} {{end}} ], {{end}} - ]), { - title: '{{$g.Title}}', - titlePosition: 'in', - width: "95%", - height: "400", - chartArea: {width: '95%', height: '85%'}, - legend: {position: 'in'}, - lineWidth: 2, - focusTarget: "category", - {{if $g.Stacked}} isStacked: true, {{end}} - vAxis: {minValue: 1, textPosition: 'in', gridlines: {multiple: 1}, minorGridlines: {multiple: 1}}, - hAxis: {minValue: 1, textPosition: 'out', maxAlternation: 1, gridlines: {multiple: 1}, - minorGridlines: {multiple: 1}}, - }) - {{end}} - - {{/* Preserve vertical scroll position after page reloads. Otherwise it's random. */}} - window.scroll(0, window.location.hash.substring(1)); - document.onscroll = function(e) { window.location.hash = Math.round(window.scrollY); }; - }); - </script> - {{HEAD}} -</head> -<body> -{{range $g := .}} - <div id="div_{{$g.ID}}"></div> -{{end}} -</body> -</html> -`) diff --git a/pkg/stat/set_test.go b/pkg/stat/set_test.go index 4313db1ef..4f087b7ff 100644 --- a/pkg/stat/set_test.go +++ b/pkg/stat/set_test.go @@ -17,8 +17,7 @@ func TestSet(t *testing.T) { a := assert.New(t) set := newSet(4, false) a.Empty(set.Collect(All)) - _, err := set.RenderHTML() - a.NoError(err) + set.RenderGraphs() v0 := set.New("v0", "desc0") a.Equal(v0.Val(), 0) @@ -80,8 +79,7 @@ func TestSet(t *testing.T) { a.Equal(len(ui2), 1) a.Equal(ui2[0].Name, "v2") - _, err = set.RenderHTML() - a.NoError(err) + set.RenderGraphs() } func TestSetRateFormat(t *testing.T) { @@ -211,7 +209,7 @@ func TestSetStress(t *testing.T) { } }() start(func() { set.Collect(All) }) - start(func() { set.RenderHTML() }) + start(func() { set.RenderGraphs() }) start(func() { set.tick() }) } time.Sleep(time.Second) |