Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fake mappings should be merged into a single one during merging #357

Merged
merged 4 commits into from
Apr 6, 2018

Conversation

jqll
Copy link
Contributor

@jqll jqll commented Apr 6, 2018

No description provided.

profile/merge.go Outdated
m.File,
switch {
case m.BuildID != "":
key.buildidIDOrFile = m.BuildID
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildidIDOrFile -> buildIDOrFile?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Not sure if buildidIDOrFile was intentional, but buildIDOrFile sounds enough.

@@ -0,0 +1,167 @@
// Copyright 2014 Google Inc. All Rights Reserved.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: fix the year.

"testing"
)

func TestMapMapping(t *testing.T) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please confirm the test fails before the fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, TestMapMapping/same_fake_mapping fails before the change.

aalexand
aalexand previously approved these changes Apr 6, 2018
@aalexand
Copy link
Collaborator

aalexand commented Apr 6, 2018

I'll merge once CI finishes.

@aalexand
Copy link
Collaborator

aalexand commented Apr 6, 2018

@jqll CI fails, PTAL.

@codecov-io
Copy link

Codecov Report

Merging #357 into master will increase coverage by 0.05%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #357      +/-   ##
==========================================
+ Coverage   66.48%   66.54%   +0.05%     
==========================================
  Files          36       36              
  Lines        7454     7446       -8     
==========================================
- Hits         4956     4955       -1     
+ Misses       2094     2089       -5     
+ Partials      404      402       -2
Impacted Files Coverage Δ
profile/merge.go 91.96% <100%> (+2.47%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 58b78aa...671bc79. Read the comment docs.

@aalexand aalexand merged commit 2c64079 into google:master Apr 6, 2018
KISSMonX pushed a commit to KISSMonX/pprof that referenced this pull request Jun 14, 2018
* 'master' of github.com:google/pprof: (32 commits)
  record diff base profile label key/value constant (google#384)
  apply additional command overrides based on report format (google#381)
  profile: fix legacy format Go heap profile parsing (google#382)
  add -diff flag for better profile comparision (google#369)
  Use -u flag in pprof installation command so that it updates if needed. (google#376)
  Add GetBase support for ASLR kernel mappings (google#371)
  Add show_from profile filter. (google#372)
  Update README.md due to 8dff45d (google#375)
  Remove stale docs, move useful ones. (google#374)
  internal/driver: skip tests requiring tcp on js (google#373)
  Add "trim path" option which can be used to relocate sources. (google#366)
  Move update_d3flamegraph.sh script from the root directory. (google#370)
  Skip unsymbolizable mapping during symbolz pass. (google#368)
  remove -positive_percentages flag (google#365)
  Render icicle graph in "Flame Graph" view (google#367)
  Add command-line editing support for interactive pprof (google#362)
  Improve profile filter unit tests, fix show filtering of mappings (google#354)
  Fake mappings should be merged into a single one during merging (google#357)
  Hack the code so that both existing Go versions and current Go master format it the same (google#358)
  moved filter tests into their own test file which matches the implementation file, filter.go. (google#356)
  ...
gmarin13 pushed a commit to gmarin13/pprof that referenced this pull request Dec 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants