1634784 - Unify MOZ_GECKO_PROFILER and MOZ_BASE_PROFILER ifdefs

Status: RESOLVED FIXED

(Core :: Gecko Profiler, task, P3)

Description

[Markus Stange [:mstange]]

Once all platforms with MOZ_GECKO_PROFILER also have MOZ_BASE_PROFILER defined, we should unify the two defines into one.

Then we can start depending on BaseProfiler headers / code in the Gecko Profiler code and reduce some code duplication.

Comment 1

[Markus Stange [:mstange]]

Attachment: Bug 1634784 - Remove MOZ_BASE_PROFILER and replace it with MOZ_GECKO_PROFILER everywhere. r=gerald

Comment 2

[Markus Stange [:mstange]]

Attachment: Bug 1634784 - Remove #ifdef MOZ_GECKO_PROFILER wrappers in mozglue/baseprofiler cpp files, and reorder includes. r=gerald

I apologize for mixing multiple types of changes in this patch. The mix is probably harder to review than necessary.

Because of the way these .cpp files are listed in mozglue/baseprofiler/moz.build,
they are only built when MOZ_GECKO_PROFILER is set. So the #ifdef MOZ_GECKO_PROFILER
wrapper is now unnecessary.
Removing this wrapper has many knock-on effects on other lines in these files
due to preprocessor line indentation.

As I was removing the #ifdefs, I was reordering includes as well, to follow the
include order laid out on https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes ;
namely, system headers should go before "your project's" .h files.

I also removed the BaseProfiler.h include from some files but not from all.
In the past, the BaseProfiler.h include served the purpose of picking up the
MOZ_BASE_PROFILER #define, and it's no longer needed for that reason.
There are probably lots of now-unnecessary BaseProfiler.h includes left.

Depends on D73526

Comment 3

[Markus Stange [:mstange]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=37be788acd5aa19caab585ca63434ea618d216fa

Comment 4

[Markus Stange [:mstange]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=acbd86ba39e1f0f0658c4825f968253caa0dd1cd

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/83bf4959aa4a
Remove MOZ_BASE_PROFILER and replace it with MOZ_GECKO_PROFILER everywhere. r=gerald
https://hg.mozilla.org/integration/autoland/rev/aea741f601bd
Remove #ifdef MOZ_GECKO_PROFILER wrappers in mozglue/baseprofiler cpp files, and reorder includes. r=gerald

Comment 6

[Raul Gurzau (:RaulG)]

https://hg.mozilla.org/mozilla-central/rev/83bf4959aa4a
https://hg.mozilla.org/mozilla-central/rev/aea741f601bd