895015 - OdinMonkey: make asm.js entries show up builtin FF profiler

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Luke Wagner [:luke]]

Attachment: patch

Right now they don't because there is a regexp match and the asm.js entry doesn't match it.

Comment 1

[Benjamin Bouvier [:bbouvier] (inactive)]

Comment on attachment 777242 [details] [diff] [review]
patch

Review of attachment 777242 [details] [diff] [review]:
-----------------------------------------------------------------

Nice!

::: js/src/ion/AsmJSLink.cpp
@@ +261,5 @@
>      resumePC_(NULL)
>  {
>      if (cx->runtime()->spsProfiler.enabled()) {
> +        // Use a profiler string that matches jsMatch regex in
> +        // browser/devtools/profiler/cleopatra/parserWorker.js.

parserWorker is actually contained in the js/ subdirectory, so it should be browser/devtools/profiler/cleopatra/js/parserWorker.js

::: js/src/vm/SPSProfiler.cpp
@@ +205,5 @@
>  const char*
>  SPSProfiler::allocProfileString(JSContext *cx, JSScript *script, JSFunction *maybeFun)
>  {
> +    // Note: this profiler string is regexp-matched by
> +    // browser/devtools/profiler/cleopatra/parserWorker.js.

Ditto.

Comment 2

[Luke Wagner [:luke]]

Good catch!
https://hg.mozilla.org/integration/mozilla-inbound/rev/cadcb731a8fb

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Backed out for making test_asmjs.html perma-timeout on Android.
https://hg.mozilla.org/integration/mozilla-inbound/rev/fe3437dad963

https://tbpl.mozilla.org/php/getParsedLog.php?id=25440154&tree=Mozilla-Inbound

Comment 4

[Luke Wagner [:luke]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/27cea830532a

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/27cea830532a