Comment on attachment 725534 [details] [diff] [review] Part 3: Rename headers Generated using: find . -type f -name "*.cpp" | xargs grep -l \"sampler.h\" | xargs perl -pi -e 's/\"sampler.h\"/\"GeckoProfiler.h\"/g' (copied for .h and .mm)

I only need one review. But I'd love to land this by Monday for snappy.

Fixed linux build failure

remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/77f321ed3d9e remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/c75481a07302 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/d195190adc48 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/ecce21507ea0

Backed out for breaking the build: https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=ecce21507ea0 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/74795c6fd7d6 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/be8691daf71e remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/1bed4fd2b0fa remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/e23e43a2c14e

*sigh* It was just a conflict that wasn't properly resolved in something that changes. These patches are changing a lot so its going to hit a lot of rot. Pushing to try just to be safe but this should be fine: https://tbpl.mozilla.org/?tree=Try&rev=a0a6f3bf555b

Someone accidentally canceled the previous push: https://tbpl.mozilla.org/?tree=Try&rev=edfb1e65e9e5

Try reset. Repush: https://tbpl.mozilla.org/?tree=Try&rev=edfb1e65e9e5

Ok after repushing my data started showup again. Assuming it's the data for the right push I'm putting this on inbound.

remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/99e09a7e03e6 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/7b508d11a791 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/bf04a3230bfe remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/a428deb3fa9a

I think this broke platforms where MOZ_ENABLE_PROFILER_SPS is undef.. 18:30.27 In file included from /src/mozilla-central/xpcom/base/nsCycleCollector.cpp:129: 18:30.27 ../../dist/include/GeckoProfiler.h:107:51: error: unknown type name 'TimeStamp'; did you mean 'mozilla::TimeStamp'? 18:30.27 static inline void profiler_responsinveness(const TimeStamp& aTime) {} 18:30.27 ^~~~~~~~~ 18:30.27 mozilla::TimeStamp 18:30.27 ../../dist/include/mozilla/TimeStamp.h:204:7: note: 'mozilla::TimeStamp' declared here 18:30.27 class TimeStamp 18:30.27 ^ Trying the obvious fixes it here.

Hm, spoke too fast, more might be needed : 18:18.18 /src/mozilla-central/gfx/layers/opengl/LayerManagerOGL.cpp:934:3: error: use of undeclared identifier 'profiler_set_frame_number'; did you mean 'profile_set_frame_number'? 18:18.18 profiler_set_frame_number(sFrameCount); 18:18.18 ^~~~~~~~~~~~~~~~~~~~~~~~~ 18:18.18 profile_set_frame_number 18:18.18 ../../dist/include/GeckoProfiler.h:113:20: note: 'profile_set_frame_number' declared here 18:18.18 static inline void profile_set_frame_number(int frameNumber) {}

Comment on attachment 729203 [details] [diff] [review] Followup : fix platforms without sps profiler Review of attachment 729203 [details] [diff] [review]: ----------------------------------------------------------------- Feel free to also ride along s/profile_set_frame_number/profiler_set_frame_number/g. Thanks for fixing!

https://hg.mozilla.org/mozilla-central/rev/99e09a7e03e6 https://hg.mozilla.org/mozilla-central/rev/7b508d11a791 https://hg.mozilla.org/mozilla-central/rev/bf04a3230bfe https://hg.mozilla.org/mozilla-central/rev/a428deb3fa9a

There were 3 actual typos : profiler_responsinveness -> profiler_responsiveness, profile_set_frame_number -> profiler_set_frame_number and the missing mozilla::. https://hg.mozilla.org/integration/mozilla-inbound/rev/795b10c2a7f4 Reopening for mergetool.