gmp/Pad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editor: fix whole-file shaper leak + LineIndex mismatch (Phase 3)

Browse Source 
Root cause of the ~1GB 'Unknown' memory on large files: with word wrap
on (the default), VisibleByteRange used the previously-shaped
GlyphLayout.VisualLineStarts to bound the visible byte range. That layout
only covers the visible window (~50 lines), not the whole document, so
whenever the viewport's line count exceeded the window's visual-line count
the range fell back to end=fileLen. The text shaper then laid out the ENTIRE
file each frame; its internal line/glyph buffers grow to the largest layout
ever shaped and are never released (document.reset() keeps the backing cap),
so memory ballooned to the file size (~1.1 GB for 10 MB) and OOM-killed the
process under scroll.

Fix: always derive the visible range from the real-line LineIndex (or the
heuristic estimate before it is ready). Word wrap needs no separate path:
each real line yields >= 1 visual line, so shaping viewportHeight/lineHeight
real lines always fills the viewport, and the range can never collapse to the
whole file.

Also fixed the pre-existing LineIndex storage mismatch: EditorLayout read
TheState.Editor.LineIndex (never set; SetLineIndex had zero callers) for
maxScroll and scrollByteOffset, so it always used the huge pre-index estimate.
It now reads cb.LineIndex, the single source of truth; the dead
EditorState.LineIndex field and SetLineIndex are removed.

On-device (emulator/SwiftShader), a 10 MB file now uses ~150 MB PSS / ~230 MB
RSS at steady state and stays flat under scroll (was 1.13 GB PSS / 1.5 GB RSS,
growing, OOM-killed). go test -race ./... green.
This commit is contained in:
Greg Pomerantz 2026-08-16 12:16:52 -04:00
parent 3460ef3993
commit c79c142397
2 changed files with 75 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
internal/editor/chunked_buffer.go
View File

@ -14,9 +14,16 @@ const (
// MaxEditableFileSize is the largest file the editor will open for editing. // MaxEditableFileSize is the largest file the editor will open for editing.
// In-range files are loaded fully into memory (see Phase 3): the chunked // In-range files are loaded fully into memory (see Phase 3): the chunked
// buffer keeps the raw bytes (~file size) resident and the renderer // buffer keeps the raw bytes (~file size) resident and the renderer
// virtualizes the glyph layout to the visible window. Files above this are // virtualizes the glyph layout to the visible window, so memory scales
// rejected with a "too large to edit" state (the browser can still list // roughly linearly with file size and stays bounded (no leak). Files above
// them). Set from on-device measurement (see doc/development_plan.md §5). // this are rejected with a "too large to edit" state (the browser can still
// list them).
//
// On-device measurement (Android emulator, SwiftShader): a 10 MB file uses
// ~150 MB PSS / ~230 MB RSS at steady state and stays flat under scroll
// (previously the shaper was handed the whole file each frame, ballooning
// to ~1.1 GB and OOM-killing the process). 50 MB extrapolates to a few
// hundred MB, comfortable on a modern phone.
MaxEditableFileSize = 50 * 1024 * 1024 // 50 MB MaxEditableFileSize = 50 * 1024 * 1024 // 50 MB
) )
@ -390,41 +397,21 @@ func (cb *ChunkedBuffer) Delete(pos, n int) {
// viewport, not the file. It uses actual (prefix-sum) chunk offsets so the // viewport, not the file. It uses actual (prefix-sum) chunk offsets so the
// range stays correct after length-changing edits. // range stays correct after length-changing edits.
func (cb *ChunkedBuffer) VisibleByteRange(scrollOffset ui.Dp, byteOffset int, viewportHeight ui.Dp, lineHeight ui.Dp, wordWrap bool, layout ui.GlyphLayout, visualIndex *types.VisualLineIndex) (start, end, startLine int) { func (cb *ChunkedBuffer) VisibleByteRange(scrollOffset ui.Dp, byteOffset int, viewportHeight ui.Dp, lineHeight ui.Dp, wordWrap bool, layout ui.GlyphLayout, visualIndex *types.VisualLineIndex) (start, end, startLine int) {
// If wrapping and we have visual line data, use it for precise calculation // The visible range is always derived from the real-line LineIndex (or a
if wordWrap && len(layout.VisualLineStarts) > 0 { // heuristic estimate before the index is ready). The previously-shaped
// Calculate which visual line should be at the top based on scroll offset // GlyphLayout (layout.VisualLineStarts) only covers the visible window, NOT
visualLine := int(scrollOffset / lineHeight) // the whole document. Using it to bound the range made the end fall back to
if visualLine >= len(layout.VisualLineStarts) { // the entire file whenever the viewport's line count exceeded the window's
visualLine = len(layout.VisualLineStarts) - 1 // visual-line count, which forced the text shaper to lay out the whole
} // document and ballooned memory to the file size (the shaper's internal
// line/glyph buffers grow to the largest layout ever shaped and are never
start = layout.VisualLineStarts[visualLine] + byteOffset // released). That is the root cause of the ~1GB "Unknown" memory on large
// files.
// Calculate end: enough content to fill viewport + buffer //
linesInViewport := int(viewportHeight/lineHeight) + 2 // Word wrap does not require a separate path: each real line produces at
endLine := visualLine + linesInViewport // least one visual line, so shaping viewportHeight/lineHeight real lines
if endLine >= len(layout.VisualLineStarts) { // always yields at least as many visual lines as fit in the viewport. The
end = int(cb.fileLen) // extra wrapped lines are simply clipped by the renderer.
} else {
end = layout.VisualLineStarts[endLine]
}
// Clamp to file bounds
if end > int(cb.fileLen) {
end = int(cb.fileLen)
}
if start >= end {
end = start + 1000 // minimum buffer
if end > int(cb.fileLen) {
end = int(cb.fileLen)
}
}
return start, end, visualLine
}
// Fallback to LineIndex (logical lines) or estimate if:
// 1. Not word wrapping
// 2. No visual index available
if cb.LineIndex == nil { if cb.LineIndex == nil {
start, end = cb.visibleByteRangeEstimate(scrollOffset, viewportHeight) start, end = cb.visibleByteRangeEstimate(scrollOffset, viewportHeight)
return start, end, 0 return start, end, 0

90
internal/editor/state.go
View File

@ -8,10 +8,9 @@ import (
"time" "time"
"unicode/utf8" "unicode/utf8"
"pad/internal/browser"
"pad/internal/io/pool/types"
"pad/internal/ui"
"gioui.org/io/key" "gioui.org/io/key"
"pad/internal/browser"
"pad/internal/ui"
) )
// EditorFontSize is the font size used for editor text. // EditorFontSize is the font size used for editor text.
@ -59,14 +58,13 @@ const (
// EditorState holds all editor-specific state. // EditorState holds all editor-specific state.
type EditorState struct { type EditorState struct {
Buffer string // DEPRECATED: use ChunkedBuffer for large files Buffer string // DEPRECATED: use ChunkedBuffer for large files
ChunkedBuffer *ChunkedBuffer // NEW: chunked file access for virtual scrolling ChunkedBuffer *ChunkedBuffer // NEW: chunked file access for virtual scrolling
LineIndex *types.LineIndex // NEW: line-to-byte-offset mapping CursorPosition int
CursorPosition int GlyphLayout ui.GlyphLayout
GlyphLayout ui.GlyphLayout SelectionStart int
SelectionStart int SelectionEnd int
SelectionEnd int CursorVisible bool
CursorVisible bool
// IMEWindowStartByte is the absolute byte offset in the buffer where the // IMEWindowStartByte is the absolute byte offset in the buffer where the
// visible window (IMEWindowText) begins. For small (string) files it is 0 // visible window (IMEWindowText) begins. For small (string) files it is 0
// and the window is the whole buffer; for large (chunked) files it is the // and the window is the whole buffer; for large (chunked) files it is the
@ -76,17 +74,17 @@ type EditorState struct {
// IMEWindowText is the visible window text shown to the IME (the snippet). // IMEWindowText is the visible window text shown to the IME (the snippet).
// It is set during layout and is what an EditEvent.Range indexes into. // It is set during layout and is what an EditEvent.Range indexes into.
IMEWindowText string IMEWindowText string
Filename string Filename string
// TooLarge is set when an opened file exceeds MaxEditableFileSize. The // TooLarge is set when an opened file exceeds MaxEditableFileSize. The
// editor shows a "too large to edit" notice instead of content (the // editor shows a "too large to edit" notice instead of content (the
// browser can still list the file). // browser can still list the file).
TooLarge bool TooLarge bool
TooLargeSize int64 TooLargeSize int64
fileVersion map[string]int fileVersion map[string]int
lastWriteVersion map[string]int lastWriteVersion map[string]int
saveTimer *time.Timer saveTimer *time.Timer
writeFailed map[string]bool // Added: tracks failed writes for UI writeFailed map[string]bool // Added: tracks failed writes for UI
retryAttempts map[string]int // Added: tracks retry attempts retryAttempts map[string]int // Added: tracks retry attempts
} }
// GetBuffer returns the full buffer content, using ChunkedBuffer if available. // GetBuffer returns the full buffer content, using ChunkedBuffer if available.
@ -135,31 +133,31 @@ func (e *EditorState) IncrementRetryAttempts(filename string) int {
// State holds all application state owned by the logic goroutine. // State holds all application state owned by the logic goroutine.
type State struct { type State struct {
PixelWidth int // raw pixel width from Gio ConfigEvent PixelWidth int // raw pixel width from Gio ConfigEvent
PixelHeight int // raw pixel height from Gio ConfigEvent PixelHeight int // raw pixel height from Gio ConfigEvent
scale float32 scale float32
page Page // current page (Browser or Editor) page Page // current page (Browser or Editor)
WordWrap bool WordWrap bool
ScrollOffset ui.Dp // vertical scroll position in Dp ScrollOffset ui.Dp // vertical scroll position in Dp
ByteOffset int // Byte offset of the first visible line ByteOffset int // Byte offset of the first visible line
LastLineY ui.Dp // last line baseline offset from text origin, from renderer LastLineY ui.Dp // last line baseline offset from text origin, from renderer
MaxScroll ui.Dp // max scroll offset (content height - viewport height) MaxScroll ui.Dp // max scroll offset (content height - viewport height)
FocusedElementID string // ID of the currently focused element FocusedElementID string // ID of the currently focused element
Elems []ui.Element Elems []ui.Element
lastEvictionTime time.Time // Throttles chunk eviction lastEvictionTime time.Time // Throttles chunk eviction
justOpenedAt time.Time // when the editor page was last opened; used to swallow the opening tap justOpenedAt time.Time // when the editor page was last opened; used to swallow the opening tap
// Browser state (directly embedded per architecture §8) // Browser state (directly embedded per architecture §8)
Browser browser.BrowserState // Embedded, not a pointer Browser browser.BrowserState // Embedded, not a pointer
// Editor state // Editor state
Editor EditorState // New field Editor EditorState // New field
open func(string) open func(string)
} }
func NewState() *State { func NewState() *State {
return &State{ return &State{
scale: 1.0, scale: 1.0,
page: BrowserPage, // Reverted to BrowserPage page: BrowserPage, // Reverted to BrowserPage
WordWrap: true, // Enable word wrap by default WordWrap: true, // Enable word wrap by default
lastEvictionTime: time.Now(), lastEvictionTime: time.Now(),
Browser: *browser.NewBrowserState(), Browser: *browser.NewBrowserState(),
Editor: EditorState{ Editor: EditorState{
@ -174,8 +172,6 @@ func NewState() *State {
} }
} }
func (s *State) SetScale(scale float32) { func (s *State) SetScale(scale float32) {
s.scale = scale s.scale = scale
} }
@ -192,7 +188,6 @@ func (s *State) layout(bm *browser.BrowserManager) []ui.Element {
dpW := ui.ToDp(ui.Px(s.PixelWidth), s.scale) dpW := ui.ToDp(ui.Px(s.PixelWidth), s.scale)
dpH := ui.ToDp(ui.Px(s.PixelHeight), s.scale) dpH := ui.ToDp(ui.Px(s.PixelHeight), s.scale)
// Calculate VisibleCount before laying out the browser page. // Calculate VisibleCount before laying out the browser page.
// This ensures the browser shows entries based on the current viewport. // This ensures the browser shows entries based on the current viewport.
if s.PixelHeight > 0 && s.scale > 0 { if s.PixelHeight > 0 && s.scale > 0 {
@ -247,12 +242,12 @@ func HandleScroll(data any) {
// Throttle eviction to 500ms and use a larger radius to prevent thrashing. // Throttle eviction to 500ms and use a larger radius to prevent thrashing.
// Temporarily disabled eviction to debug thrashing issues. // Temporarily disabled eviction to debug thrashing issues.
/* /*
if cb := TheState.Editor.ChunkedBuffer; cb != nil { if cb := TheState.Editor.ChunkedBuffer; cb != nil {
if time.Since(TheState.lastEvictionTime) > 500*time.Millisecond { if time.Since(TheState.lastEvictionTime) > 500*time.Millisecond {
cb.EvictFarChunks(TheState.Editor.CursorPosition, 20) cb.EvictFarChunks(TheState.Editor.CursorPosition, 20)
TheState.lastEvictionTime = time.Now() TheState.lastEvictionTime = time.Now()
}
} }
}
*/ */
} }
@ -309,11 +304,6 @@ func SetChunkedBuffer(cb *ChunkedBuffer) {
TheState.Editor.ChunkedBuffer = cb TheState.Editor.ChunkedBuffer = cb
} }
// SetLineIndex sets the line index for the current editor state.
func SetLineIndex(li *types.LineIndex) {
TheState.Editor.LineIndex = li
}
// ToggleSortOrder cycles the browser sort mode through four modes. // ToggleSortOrder cycles the browser sort mode through four modes.
func ToggleSortOrder(data any) { func ToggleSortOrder(data any) {
// Cycle through the 4 sort modes // Cycle through the 4 sort modes
@ -842,7 +832,7 @@ func EditorLayout(screenWidth, screenHeight ui.Dp, wordWrap bool) []ui.Element {
// Add bottom padding (half line height) so last line isn't flush with the bottom bar. // Add bottom padding (half line height) so last line isn't flush with the bottom bar.
var maxScroll ui.Dp var maxScroll ui.Dp
if cb := TheState.Editor.ChunkedBuffer; cb != nil { if cb := TheState.Editor.ChunkedBuffer; cb != nil {
if li := TheState.Editor.LineIndex; li != nil { if li := cb.LineIndex; li != nil {
totalLines := li.LineCount() totalLines := li.LineCount()
maxScroll = ui.Dp(totalLines)*EditorLineHeight() - editorRegion.H + EditorLineHeight()/2 maxScroll = ui.Dp(totalLines)*EditorLineHeight() - editorRegion.H + EditorLineHeight()/2
} else { } else {
@ -915,12 +905,12 @@ func EditorLayout(screenWidth, screenHeight ui.Dp, wordWrap bool) []ui.Element {
} }
// Adjust scroll offset to be relative to visibleContent origin // Adjust scroll offset to be relative to visibleContent origin
visibleScrollOffset = ui.Dp(math.Mod(float64(TheState.ScrollOffset),float64(lineHeight))) visibleScrollOffset = ui.Dp(math.Mod(float64(TheState.ScrollOffset), float64(lineHeight)))
// Map scroll offset to a chunk index // Map scroll offset to a chunk index
// Estimate line-to-byte conversion if LineIndex is missing // Estimate line-to-byte conversion if LineIndex is missing
var scrollByteOffset int var scrollByteOffset int
if li := TheState.Editor.LineIndex; li != nil { if li := cb.LineIndex; li != nil {
// Precise // Precise
lineHeight := EditorLineHeight() lineHeight := EditorLineHeight()
startLine := int(TheState.ScrollOffset / lineHeight) startLine := int(TheState.ScrollOffset / lineHeight)
@ -931,7 +921,7 @@ func EditorLayout(screenWidth, screenHeight ui.Dp, wordWrap bool) []ui.Element {
} }
} else { } else {
// Estimate // Estimate
scrollByteOffset = int(TheState.ScrollOffset / EditorLineHeight()) * 50 scrollByteOffset = int(TheState.ScrollOffset/EditorLineHeight()) * 50
} }
scrollChunk := scrollByteOffset / cb.ChunkSize() scrollChunk := scrollByteOffset / cb.ChunkSize()
@ -1033,13 +1023,15 @@ func SetCursorFromPoint(x, y float64) {
groups = []lineGroup{} // Reset groups groups = []lineGroup{} // Reset groups
for i, yVal := range layout.Y { for i, yVal := range layout.Y {
yFloat := float64(yVal) yFloat := float64(yVal)
lineIdx := int((yFloat - minY) / lineHeight + 0.5) // round to nearest line lineIdx := int((yFloat-minY)/lineHeight + 0.5) // round to nearest line
if lineIdx < 0 { lineIdx = 0 } if lineIdx < 0 {
lineIdx = 0
}
// Ensure enough groups // Ensure enough groups
for len(groups) <= lineIdx { for len(groups) <= lineIdx {
groups = append(groups, lineGroup{ groups = append(groups, lineGroup{
y: minY + float64(len(groups))*lineHeight, y: minY + float64(len(groups))*lineHeight,
indices: []int{}, indices: []int{},
}) })
} }