Skip to content

remove unnecessary Heap::forceLink #7553

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.

Sign up for GitHub

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

Merged
lizan merged 2 commits into from
Jul 12, 2019
Merged

remove unnecessary Heap::forceLink #7553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20dbd47
remove unnecessary Heap::forceLink
lizan Jul 11, 2019
8807334
Merge remote-tracking branch 'upstream/master' into redundant_force_link
lizan Jul 12, 2019
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
2 changes: 1 addition & 1 deletion bazel/PPROF.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ specific place yourself.

Static linking is already available (because of a `HeapProfilerDump()` call
inside
[`Envoy::Profiler::Heap::forceLink()`](https://github.com/envoyproxy/envoy/blob/master/source/common/profiler/profiler.cc#L21-L26)).
[`Envoy::Profiler::Heap::stopProfiler())`](https://github.com/envoyproxy/envoy/blob/master/source/common/profiler/profiler.cc#L32-L39)).

### Compiling a statically-linked Envoy

Expand Down
7 changes: 0 additions & 7 deletions source/common/profiler/profiler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ bool Heap::stopProfiler() {
return true;
}

void Heap::forceLink() {
// Currently this is here to force the inclusion of the heap profiler during static linking.
// Without this call the heap profiler will not be included and cannot be started via env
// variable. In the future we can add admin support.
HeapProfilerDump("");
}

} // namespace Profiler
} // namespace Envoy

Expand Down
3 changes: 0 additions & 3 deletions source/common/profiler/profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ class Heap {
* @return bool whether the file is dumped
*/
static bool stopProfiler();

private:
static void forceLink();
};

} // namespace Profiler
Expand Down