search

kornilova203 / FlameViewer

Tool for flamegraphs visualization
MIT License
80 stars 7 forks source link

Timeunits and duration added to TreeDrawer #57

Closed brtubb-patagonia closed 5 years ago

brtubb-patagonia commented 5 years ago

(merging to master this time)

Note: this doesn't include the 'samples' override in the AccumulatedTreeDrawer. Just 'ms' or blank.

Looks like you can accept the PR and squash via the GitHub UI. If you want me to squash it first, cancel the PR and I'll submit a new one!

kornilova203 commented 5 years ago

Could you please leave here only latest commit? I suppose, other changes are already in jfr branch

brtubb-patagonia commented 5 years ago

Are you asking to exclude 5d639b2? I'm not sure how to exclude it... I think a rebase would cover it.

Or squash all before the PR?

kornilova203 commented 5 years ago

Include only e4ead70bcf92caa5514d86c9a87c41ea3dc67b6c, let it be only about duration

brtubb-patagonia commented 5 years ago

Can I include 29d62ae in the new PR? Or in a separate PR? There is a FileOutputStream that needs to be closed before *.jfr files can be uploaded. The file is moved later in the code, but the stream isn't close so the move fails.

kornilova203 commented 5 years ago

I realised that I lost the 29d62aeb1d4f2b6fc5a9881c41a30a9963ce39d5 in jfr branch during squash and rebase, I've just pushed the fix e27288cc8b9723627622ae1dc78d90c187f74b36 with Kotlin use construction (replacement for try-catch with resource block in Java). So eventually it will be in master :)

brtubb-patagonia commented 5 years ago

Thanks for all the help! I submit a new PR to finish this off.