Skip to content

Commit

Permalink
kernel tracing ui and search fix
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmarkclements committed Mar 20, 2018
1 parent d21aae0 commit 06ef99a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
3 changes: 2 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
* API: removed `quiet` (still part of CLI)
* API: removed `silent` (still part of CLI)
* API: removed `open` (still part of CLI)

* CLI: add `--on-port` flag
* API: add `onPort` option

# v3.4.1
* break out the ui and stack converter portions into separate modules: d3-fg and stacks-to-json-tree.
Expand Down
3 changes: 2 additions & 1 deletion lib/trace-stacks-to-ticks.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ function traceStacksToTicks (stacksPath) {
}
if (!line) return stacks
stacks[n] = stacks[n] || []
stacks[n].unshift({name: line.trim()})

stacks[n].unshift({name: line.trim().replace(/^LazyCompile:|Function:|Script:/, '')})
return stacks
}, [])

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"ajv": "^6.0.1",
"browserify": "^13.0.0",
"concat-stream": "^1.5.2",
"d3-fg": "^6.0.1",
"d3-fg": "^6.0.2",
"debounce": "^1.1.0",
"debug": "^2.2.0",
"end-of-stream": "^1.1.0",
Expand Down
12 changes: 6 additions & 6 deletions visualizer/cmp/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ const button = (render) => ({label, pressed, disabled, width}, action) => render

module.exports = (render) => (state, action) => {
const tiers = button(render)({label: 'Tiers', pressed: state.tiers}, () => action({type: 'tiers'}))
const view = button(render)({
const view = state.renderMergedBtn ? button(render)({
label: state.merged ? 'Unmerge' : 'Merge',
width: '6.85em',
pressed: state.merged
}, () => action({type: 'view'}))
const optimized = state.renderOptUnopt ? button(render)({
}, () => action({type: 'view'})) : ''
const optimized = button(render)({
label: 'Optimized',
pressed: !state.merged && state.optimized,
disabled: state.merged
}, () => action({type: 'optimized'})) : ''
const unoptimized = state.renderOptUnopt ? button(render)({
}, () => action({type: 'optimized'}))
const unoptimized = button(render)({
label: 'Unoptimized',
pressed: !state.merged && state.unoptimized,
disabled: state.merged
}, () => action({type: 'not-optimized'})) : ''
}, () => action({type: 'not-optimized'}))

return render`
<div style="">
Expand Down
2 changes: 1 addition & 1 deletion visualizer/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = ({colors, trees, exclude, merged = false, kernelTracing, title}
tiers: false,
optimized: false,
unoptimized: false,
renderOptUnopt: !kernelTracing,
renderMergedBtn: !kernelTracing,
merged: merged
},
typeFilters: {
Expand Down

0 comments on commit 06ef99a

Please sign in to comment.