Skip to content

Commit 30d692c

Browse files
committed
Backed out 9 changesets (bug 1911021) for causing failures at ExecutionTracer.cpp. CLOSED TREE
Backed out changeset 3df922f26c68 (bug 1911021) Backed out changeset 5ae948b4c4cb (bug 1911021) Backed out changeset b3b69ca7a7e2 (bug 1911021) Backed out changeset addef9853a2b (bug 1911021) Backed out changeset aed1adb7245b (bug 1911021) Backed out changeset 285922033e2b (bug 1911021) Backed out changeset 217454e2cedc (bug 1911021) Backed out changeset c7365fc6d4ab (bug 1911021) Backed out changeset 6d1accf8bf38 (bug 1911021) UltraBlame original commit: f8229eb11c8571108c176fdc2308a6566b1912e0
1 parent cc541e1 commit 30d692c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4181
-6394
lines changed

devtools/client/performance-new/shared/utils.js

+39-34
Original file line numberDiff line numberDiff line change
@@ -3245,6 +3245,45 @@ windows
32453245
name
32463246
:
32473247
"
3248+
JSTracer
3249+
"
3250+
value
3251+
:
3252+
"
3253+
jstracer
3254+
"
3255+
title
3256+
:
3257+
"
3258+
Trace
3259+
JS
3260+
engine
3261+
"
3262+
experimental
3263+
:
3264+
true
3265+
disabledReason
3266+
:
3267+
"
3268+
JS
3269+
Tracer
3270+
is
3271+
currently
3272+
disabled
3273+
due
3274+
to
3275+
crashes
3276+
.
3277+
See
3278+
Bug
3279+
1565788
3280+
.
3281+
"
3282+
}
3283+
{
3284+
name
3285+
:
3286+
"
32483287
IPC
32493288
Messages
32503289
"
@@ -3826,40 +3865,6 @@ sample
38263865
.
38273866
"
38283867
}
3829-
{
3830-
name
3831-
:
3832-
"
3833-
JS
3834-
Execution
3835-
Tracing
3836-
"
3837-
value
3838-
:
3839-
"
3840-
tracing
3841-
"
3842-
title
3843-
:
3844-
"
3845-
Disable
3846-
periodic
3847-
stack
3848-
sampling
3849-
and
3850-
capture
3851-
information
3852-
about
3853-
every
3854-
JS
3855-
function
3856-
executed
3857-
.
3858-
"
3859-
experimental
3860-
:
3861-
true
3862-
}
38633868
]
38643869
;
38653870
module

devtools/server/actors/tracer.js

+7
Original file line numberDiff line numberDiff line change
@@ -1314,6 +1314,13 @@ tracingListener
13141314
.
13151315
stop
13161316
(
1317+
lazy
1318+
.
1319+
JSTracer
1320+
.
1321+
maybeGetNativeTrace
1322+
(
1323+
)
13171324
)
13181325
;
13191326
this

devtools/server/tracer/tracer.sys.mjs

+182
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,24 @@ throws
11821182
*
11831183
param
11841184
{
1185+
Boolean
1186+
}
1187+
options
1188+
.
1189+
useNativeTracing
1190+
*
1191+
Optional
1192+
setting
1193+
to
1194+
enable
1195+
the
1196+
native
1197+
tracing
1198+
implementation
1199+
.
1200+
*
1201+
param
1202+
{
11851203
String
11861204
}
11871205
options
@@ -1817,6 +1835,16 @@ traceFunctionReturn
18171835
;
18181836
this
18191837
.
1838+
useNativeTracing
1839+
=
1840+
!
1841+
!
1842+
options
1843+
.
1844+
useNativeTracing
1845+
;
1846+
this
1847+
.
18201848
maxDepth
18211849
=
18221850
options
@@ -2388,6 +2416,24 @@ isTracing
23882416
=
23892417
true
23902418
;
2419+
if
2420+
(
2421+
this
2422+
.
2423+
useNativeTracing
2424+
)
2425+
{
2426+
this
2427+
.
2428+
dbg
2429+
.
2430+
nativeTracing
2431+
=
2432+
true
2433+
;
2434+
}
2435+
else
2436+
{
23912437
this
23922438
.
23932439
dbg
@@ -2398,6 +2444,7 @@ this
23982444
.
23992445
onEnterFrame
24002446
;
2447+
}
24012448
if
24022449
(
24032450
this
@@ -2669,6 +2716,16 @@ g
26692716
;
26702717
this
26712718
.
2719+
dbg
2720+
.
2721+
nativeTracing
2722+
=
2723+
this
2724+
.
2725+
useNativeTracing
2726+
;
2727+
this
2728+
.
26722729
debuggerNotificationObserver
26732730
.
26742731
connect
@@ -3704,6 +3761,49 @@ null
37043761
*
37053762
*
37063763
*
3764+
If
3765+
native
3766+
tracing
3767+
is
3768+
enabled
3769+
get
3770+
the
3771+
trace
3772+
from
3773+
the
3774+
native
3775+
tracer
3776+
*
3777+
/
3778+
maybeGetNativeTrace
3779+
(
3780+
)
3781+
{
3782+
if
3783+
(
3784+
this
3785+
.
3786+
useNativeTracing
3787+
)
3788+
{
3789+
return
3790+
this
3791+
.
3792+
dbg
3793+
.
3794+
collectNativeTrace
3795+
(
3796+
)
3797+
;
3798+
}
3799+
return
3800+
null
3801+
;
3802+
}
3803+
/
3804+
*
3805+
*
3806+
*
37073807
Stop
37083808
observing
37093809
execution
@@ -3768,6 +3868,25 @@ dbg
37683868
return
37693869
;
37703870
}
3871+
if
3872+
(
3873+
!
3874+
this
3875+
.
3876+
useNativeTracing
3877+
)
3878+
{
3879+
this
3880+
.
3881+
dbg
3882+
.
3883+
nativeTracing
3884+
=
3885+
false
3886+
;
3887+
}
3888+
else
3889+
{
37713890
this
37723891
.
37733892
dbg
@@ -3776,6 +3895,7 @@ onEnterFrame
37763895
=
37773896
undefined
37783897
;
3898+
}
37793899
this
37803900
.
37813901
dbg
@@ -6974,6 +7094,67 @@ tracing
69747094
*
69757095
*
69767096
*
7097+
If
7098+
native
7099+
tracing
7100+
is
7101+
enabled
7102+
get
7103+
the
7104+
trace
7105+
from
7106+
the
7107+
native
7108+
tracer
7109+
*
7110+
/
7111+
function
7112+
maybeGetNativeTrace
7113+
(
7114+
)
7115+
{
7116+
if
7117+
(
7118+
activeTracer
7119+
)
7120+
{
7121+
return
7122+
activeTracer
7123+
.
7124+
maybeGetNativeTrace
7125+
(
7126+
)
7127+
;
7128+
}
7129+
console
7130+
.
7131+
warn
7132+
(
7133+
"
7134+
Can
7135+
'
7136+
t
7137+
get
7138+
a
7139+
native
7140+
trace
7141+
as
7142+
we
7143+
were
7144+
not
7145+
tracing
7146+
.
7147+
"
7148+
)
7149+
;
7150+
return
7151+
null
7152+
;
7153+
}
7154+
/
7155+
*
7156+
*
7157+
*
69777158
Listen
69787159
for
69797160
tracing
@@ -7629,6 +7810,7 @@ JSTracer
76297810
{
76307811
startTracing
76317812
stopTracing
7813+
maybeGetNativeTrace
76327814
addTracingListener
76337815
removeTracingListener
76347816
NEXT_INTERACTION_MESSAGE

0 commit comments

Comments
 (0)