717769 - Fix Profiler on Linux

Status: RESOLVED FIXED

(Core :: Gecko Profiler, defect)

Description

[Benoit Girard (:BenWa)]

Attachment: patch

A few bugs where preventing the profiling from working on linux, this patch fixes this.

Comment 1

[Benoit Girard (:BenWa)]

mcote, this will fix the problem you saw today.

Comment 2

[Benoit Girard (:BenWa)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2cc49e58c516

Comment 3

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/2cc49e58c516

Comment 4

[Landry Breuil (:gaston)]

Attachment: Include sps_sampler.h if __linux__, not XP_UNIX

Erm... XP_UNIX is defined on the BSDs, so now the build fails with missing symbols.

../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_stop()'
../../dist/bin/libxul.so.1.0: undefined reference to `stack_key_initialized'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_start(int, int, char const**, unsigned int)'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_get_features()'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_is_active()'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_init()'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_responsiveness(mozilla::TimeStamp)'
../../dist/bin/libxul.so.1.0: undefined reference to `pkey_stack'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_get_profile()'
../../dist/bin/libxul.so.1.0: undefined reference to `mozilla_sampler_get_responsiveness()'

It seems better to use __linux__, or maybe XP_LINUX should be propagated as said in xpcom/base/Makefile.in#52. At least it fixes the build on OpenBSD, and i've sent the proposed fix to try in https://tbpl.mozilla.org/?tree=Try&usebuildbot=1&rev=70e335493537

Comment 5

[Landry Breuil (:gaston)]

Comment on attachment 588667 [details] [diff] [review]
Include sps_sampler.h if __linux__, not XP_UNIX

Reassigning..

Comment 6

[Benoit Girard (:BenWa)]

Thanks for the fix!
https://hg.mozilla.org/integration/mozilla-inbound/rev/cfd6e9dbc379

Comment 7

[Jonathan Kew [:jfkthame]]

I believe the convention is to not resolve the bug as fixed until it's landed on m-c.

Anyhow, it has now merged there:
https://hg.mozilla.org/mozilla-central/rev/cfd6e9dbc379