gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-09 18:17:07 -05:00
Code Issues Releases Wiki Activity

Fixes #509, Creates a Allocation Rate Debug Metric. (#510)

Browse Source 
In order to be stable, it needs to collect many samples. Hence, I use a Ring to always know what was the Total Allocation 100 frames before.
This commit is contained in:
Maxime Lavigne (malavv) 2020-07-01 00:10:15 -04:00 committed by GitHub
parent fa20b9ee51
commit 0f9e846834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
d2app/app.go
View File

@ -3,6 +3,7 @@ package d2app
import ( import (
"bytes" "bytes"
"container/ring"
"errors" "errors"
"fmt" "fmt"
"image" "image"
@ -53,6 +54,7 @@ type App struct {
gitCommit string gitCommit string
terminal d2interface.Terminal terminal d2interface.Terminal
audio d2interface.AudioProvider audio d2interface.AudioProvider
tAllocSamples *ring.Ring
} }
type bindTerminalEntry struct { type bindTerminalEntry struct {
@ -63,6 +65,7 @@ type bindTerminalEntry struct {
const defaultFPS = 0.04 // 1/25 const defaultFPS = 0.04 // 1/25
const bytesToMegabyte = 1024 * 1024 const bytesToMegabyte = 1024 * 1024
const nSamplesTAlloc = 100
// Create creates a new instance of the application // Create creates a new instance of the application
func Create(gitBranch, gitCommit string, terminal d2interface.Terminal, audio d2interface.AudioProvider) *App { func Create(gitBranch, gitCommit string, terminal d2interface.Terminal, audio d2interface.AudioProvider) *App {
@ -71,6 +74,7 @@ func Create(gitBranch, gitCommit string, terminal d2interface.Terminal, audio d2
gitCommit: gitCommit, gitCommit: gitCommit,
terminal: terminal, terminal: terminal,
audio: audio, audio: audio,
tAllocSamples: createZeroedRing(nSamplesTAlloc),
} }
return result return result
@ -274,16 +278,18 @@ func (p *App) renderDebug(target d2interface.Surface) error {
runtime.ReadMemStats(&m) runtime.ReadMemStats(&m)
target.PushTranslation(680, 0) target.PushTranslation(680, 0)
target.DrawText("Alloc " + strconv.FormatInt(int64(m.Alloc)/bytesToMegabyte, 10)) target.DrawText("Alloc " + strconv.FormatInt(int64(m.Alloc)/bytesToMegabyte, 10))
target.PushTranslation(0, 16) target.PushTranslation(0, 16)
target.DrawText("Pause " + strconv.FormatInt(int64(m.PauseTotalNs/bytesToMegabyte), 10)) target.DrawText("TAlloc/s " + strconv.FormatFloat(p.allocRate(m.TotalAlloc, fps), 'f', 2, 64))
target.PushTranslation(0, 16) target.PushTranslation(0, 16)
target.DrawText("HeapSys " + strconv.FormatInt(int64(m.HeapSys/bytesToMegabyte), 10)) target.DrawText("Pause " + strconv.FormatInt(int64(m.PauseTotalNs/bytesToMegabyte), 10))
target.PushTranslation(0, 16) target.PushTranslation(0, 16)
target.DrawText("NumGC " + strconv.FormatInt(int64(m.NumGC), 10)) target.DrawText("HeapSys " + strconv.FormatInt(int64(m.HeapSys/bytesToMegabyte), 10))
target.PushTranslation(0, 16) target.PushTranslation(0, 16)
target.DrawText("Coords " + strconv.FormatInt(int64(cx), 10) + "," + strconv.FormatInt(int64(cy), 10)) target.DrawText("NumGC " + strconv.FormatInt(int64(m.NumGC), 10))
target.PopN(5) //nolint:gomnd This is the number of records we have popped target.PushTranslation(0, 16)
target.DrawText("Coords " + strconv.FormatInt(int64(cx), 10) + "," + strconv.FormatInt(int64(cy), 10))
target.PopN(6) //nolint:gomnd This is the number of records we have popped
return nil return nil
} }
@ -453,6 +459,14 @@ func (p *App) update(target d2interface.Surface) error {
return nil return nil
} }
func (p *App) allocRate(totalAlloc uint64, fps float64) float64 {
p.tAllocSamples.Value = totalAlloc
p.tAllocSamples = p.tAllocSamples.Next()
deltaAllocPerFrame := float64(totalAlloc - p.tAllocSamples.Value.(uint64)) / nSamplesTAlloc
return deltaAllocPerFrame * fps / bytesToMegabyte
}
func (p *App) dumpHeap() { func (p *App) dumpHeap() {
if err := os.Mkdir("./pprof/", 0750); err != nil { if err := os.Mkdir("./pprof/", 0750); err != nil {
log.Fatal(err) log.Fatal(err)
@ -519,6 +533,16 @@ func (p *App) enterGuiPlayground() {
d2screen.SetNextScreen(d2gamescreen.CreateGuiTestMain()) d2screen.SetNextScreen(d2gamescreen.CreateGuiTestMain())
} }
func createZeroedRing(n int) *ring.Ring {
r := ring.New(n)
for i := 0; i < n; i++ {
r.Value = uint64(0)
r = r.Next()
}
return r
}
func enableProfiler(profileOption string) interface{ Stop() } { func enableProfiler(profileOption string) interface{ Stop() } {
var options []func(*profile.Profile) var options []func(*profile.Profile)