Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/traceDuration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export function getTraceRootDuration(currentDuration: number, line: { ts: number, dur?: number }): number {
if (line.dur === Number.MAX_SAFE_INTEGER)
return currentDuration

return Math.max(currentDuration, line.ts + (line.dur ?? 0))
}
8 changes: 4 additions & 4 deletions src/traceTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { TraceData, TraceLine, TypeLine } from '../shared/src/traceData'
import { getWorkspacePath } from './storage'
import { postMessage } from './webview'
import { traceFiles } from './appState'
import { getTraceRootDuration } from './traceDuration'

export interface Tree { id: number, line: TraceLine, children: Tree[], types: TypeLine[], childCnt: number, childTypeCnt: number, typeCnt: number }
function getRoot(): Tree {
Expand Down Expand Up @@ -31,7 +32,7 @@ export function toTree(traceData: TraceData, workspacePath: string): Tree {
const tree: Tree = { ...getRoot() }
let endTs = Number.MAX_SAFE_INTEGER
let curr = tree
let maxDur = 0
let maxEndTs = 0
let id = 0

const stack: Tree[] = []
Expand All @@ -44,8 +45,7 @@ export function toTree(traceData: TraceData, workspacePath: string): Tree {
if ('args' in line && line.args?.path && isAbsolute(line.args?.path))
line.args.path = relative(workspacePath, line.args.path)

if (line.dur !== Number.MAX_SAFE_INTEGER && (line.dur ?? 0) > maxDur)
maxDur = line.ts
maxEndTs = getTraceRootDuration(maxEndTs, line)

while (line.ts > endTs) {
if (stack.length === 0)
Expand All @@ -70,7 +70,7 @@ export function toTree(traceData: TraceData, workspacePath: string): Tree {
}
}

tree.line.dur = maxDur
tree.line.dur = maxEndTs
return tree
}

Expand Down
12 changes: 12 additions & 0 deletions test/trace-duration.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { describe, expect, it } from 'vitest'
import { getTraceRootDuration } from '../src/traceDuration'

describe('getTraceRootDuration', () => {
it('uses the end timestamp of a finite trace event', () => {
expect(getTraceRootDuration(0, { dur: 5, ts: 10 })).toBe(15)
})

it('keeps the current duration for open-ended root events', () => {
expect(getTraceRootDuration(22, { dur: Number.MAX_SAFE_INTEGER, ts: 10 })).toBe(22)
})
})