measure blocked layout queries #23115

pylbrecht · 2019-03-27T16:51:18Z

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #19797

There are tests for these changes

This change is

highfive · 2019-03-27T16:51:25Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @jdm (or someone else) soon.

highfive · 2019-03-27T16:51:26Z

Heads up! This PR modifies the following files:

@asajeffrey: components/constellation/pipeline.rs, components/script/script_thread.rs, components/script/dom/window.rs
@cbrewster: components/constellation/pipeline.rs
@paulrouget: components/constellation/pipeline.rs
@KiChjang: components/script/script_thread.rs, components/script/dom/window.rs, components/script_traits/lib.rs

highfive · 2019-03-27T16:51:27Z

Warning

These commits modify script code, but no tests are modified. Please consider adding a test!

jdm

This is the right idea, but we're currently sharing too many atomic values that should be independent. As for the panic not triggering, what pages are you testing against?

jdm · 2019-03-29T16:57:05Z

components/layout_thread/lib.rs

@@ -673,7 +682,12 @@ impl LayoutThread {
                self.paint_time_metrics.maybe_set_metric(epoch, paint_time);
                true
            },
-            Request::FromScript(msg) => self.handle_request_helper(msg, possibly_locked_rw_data),
+            Request::FromScript(msg) => {
+                self.busy.store(true, Ordering::Relaxed);


Rather than only marking when we process script messages, we should be setting this to false before the select! and setting it to true immediately afterwards.

Fixed this in 8b88526.

jdm · 2019-03-29T16:57:05Z

components/layout_thread/lib.rs

@@ -865,6 +879,7 @@ impl LayoutThread {
            self.webrender_api.clone_sender(),
            self.webrender_document,
            info.paint_time_metrics,
+            self.busy.clone(),


We should be passing an AtomicBoolean that is stored in LayoutThreadInit, rather than cloning the one that is used by the current layout thread.

My previous comment here is still valid - there's now a member of LayoutThreadInit that we should be passing here instead.

jdm · 2019-03-29T16:57:05Z

components/script/script_thread.rs

+
+    // TODO pylbrecht
+    // write meaningful docstring
+    layout_thread_is_busy: Arc<AtomicBool>,


We probably do not need to store this in ScriptThread?

Well, the busy flag is created in UnprivilegedPipelineContent::start_all() and passed via clone() to the layout and script thread. I'm not quite sure how to retain the relationship between the two threads, when creating Windows in ScriptThread::load(), unless storing the busy flag in ScriptThread itself.

You're right, but I think that we can store it as a member of InProgressLoad instead.

jdm · 2019-03-29T16:57:05Z

components/script/script_thread.rs

@@ -2857,6 +2864,7 @@ impl ScriptThread {
            self.microtask_queue.clone(),
            self.webrender_document,
            self.webrender_api_sender.clone(),
+            self.layout_thread_is_busy.clone(),


Each Window should get its own busy boolean, since there is a 1:1 window:layout thread ratio.

Does this mean there is a separate layout thread for every window? To me it looks like n:1 window:layout thread, but please correct me if I'm wrong.

Each window has its own layout thread, yes.

jdm · 2019-03-29T16:57:05Z

components/script_traits/lib.rs

+    // TODO pylbrecht
+    // write meaningful docstring
+    ///
+    pub layout_thread_is_busy: Arc<AtomicBool>,


This probably isn't necessary given the earlier changes.

I feel like storing the busy flag in InitialScriptState is the only way of passing it to argument to ScriptThreadFactory::create().
If I would create it further down the line, it would not be shared across the layout and script thread. Or am I missing something here?

pylbrecht · 2019-03-31T17:06:19Z

As for the panic not triggering, what pages are you testing against?

Just the one in this comment so far. Any web pages that are definitely creating blocked layout queries?

jdm · 2019-04-01T13:45:37Z

If you modify that page to do the layout modification and query in a loop and also add a looping CSS animation/transition, I would expect that to hit the case where the layout query starts while the layout thread is processing an animation tick from the compositor.

pylbrecht · 2019-04-08T20:09:38Z

With my latest changes the only thing remaining should be creating appropriate output in Profiler::print_buckets() (and testing the final changes).

Any specifics on how I should format the output?
And should I create output for all OutputOptions?

pylbrecht · 2019-04-12T18:47:42Z

I verified my changes by running ./mach run -d -- -p path/to/test.html & and checking its output.

Content of test.html:

<!DOCTYPE html>
<html>
  <head>
    <title>Test</title>
  </head>
  <body>
    <div id="test">
      test
    </div>
    <script>
      setInterval(function() {
        for (i = 0; i < 100; i++) {
          document.getElementById("test").getBoundingClientRect();
        }
      }, 200);
      setInterval(function() {
        for (i = 0; i < 100; i++) {
          document.getElementById("test").style.color = "blue";
        }
      }, 250);
    </script>
  </body>
</html>```

jdm · 2019-04-12T18:57:53Z

@pylbrecht Huh, does that page generate reports of blocked layout queries? It shouldn't as far as I can tell :<

jdm · 2019-04-12T19:00:17Z

Actually, I think I'm wrong - the layout thread could be busy finishing up creating the display list for the previous frame while the script thread is trying to perform a new layout query in the next frame.


        Measure layout queries blocked by ongoing layout

pylbrecht · 2019-04-13T09:39:28Z

@pylbrecht Huh, does that page generate reports of blocked layout queries? It shouldn't as far as I can tell :<

Yes, it does.

Actually, I think I'm wrong - the layout thread could be busy finishing up creating the display list for the previous frame while the script thread is trying to perform a new layout query in the next frame.

I hope so, because otherwise just thinking of debugging this makes me anxious.

jdm · 2019-04-16T16:21:33Z

components/layout_thread/lib.rs

@@ -865,6 +879,7 @@ impl LayoutThread {
            self.webrender_api.clone_sender(),
            self.webrender_document,
            info.paint_time_metrics,
+            self.busy.clone(),


My previous comment here is still valid - there's now a member of LayoutThreadInit that we should be passing here instead.

jdm · 2019-04-16T16:21:33Z

components/profile/time.rs

+
+                writeln!(&mut lock, "_url_\t_blocked layout queries_").unwrap();
+                for (url, count) in &self.blocked_layout_queries {
+                    writeln!(&mut lock, "{}\t{}", url, count).unwrap();


Can you paste some example output that you saw?

jdm · 2019-04-16T16:21:33Z

components/profile_traits/time.rs

@@ -46,6 +46,11 @@ pub enum ProfilerMsg {
    ),
    /// Message used to force print the profiling metrics
    Print,
+
+    // TODO pylbrecht
+    // write meaningful docstring


/// Report a layout query that could not be processed immediately for a particular URL.

jdm · 2019-04-16T16:21:33Z

components/script/script_thread.rs

@@ -202,6 +203,8 @@ struct InProgressLoad {
    navigation_start_precise: u64,
    /// For cancelling the fetch
    canceller: FetchCanceller,
+    /// Flag to indicate if the layout thread is busy handling a request.


/// Flag for sharing with the layout thread that is not yet created.


        fixup! Measure layout queries blocked by ongoing layout

pylbrecht · 2019-04-17T15:31:20Z

Oh wow.. and I'm sitting here like "Why is this not merged yet?". That's really embarrassing.. (I even left a TODO in the code) ..sorry for that!

I pushed the suggested changes and will drop an example output in the comments on the weekend. Busy schedule during the week.

pylbrecht · 2019-04-22T10:06:10Z

I ran the command ./mach run -d -- -z ../test.html -p for about 10 seconds and that's its output:

VMware, Inc.
llvmpipe (LLVM 7.0, 256 bits)
3.3 (Core Profile) Mesa 19.0.0
_category_                          _incremental?_ _iframe?_             _url_                  _mean (ms)_   _median (ms)_      _min (ms)_      _max (ms)_       _events_ 
Compositing                             N/A          N/A                  N/A                       59.0078          0.8786          0.0526        408.9181               7
Layout                                  yes          yes     file:///home/palbrecht/dev/tes          0.7743          0.7029          0.2757          5.7982             507
Layout                                  no           yes     file:///home/palbrecht/dev/tes         82.5015         82.5015         82.5015         82.5015               1
+ Style Recalc                          yes          yes     file:///home/palbrecht/dev/tes          3.6386          3.6386          3.6386          3.6386               1
+ Style Recalc                          no           yes     file:///home/palbrecht/dev/tes         19.0794         19.0794         19.0794         19.0794               1
| + Text Shaping                        yes          yes     file:///home/palbrecht/dev/tes          0.0000          0.0000          0.0000          0.0000               1
| + Text Shaping                        no           yes     file:///home/palbrecht/dev/tes          0.7069          0.7069          0.7069          0.7069               1
+ Restyle Damage Propagation            yes          yes     file:///home/palbrecht/dev/tes          0.0063          0.0054          0.0033          0.0292             507
+ Restyle Damage Propagation            no           yes     file:///home/palbrecht/dev/tes          0.0061          0.0061          0.0061          0.0061               1
+ Generated Content Resolution          yes          yes     file:///home/palbrecht/dev/tes          0.0102          0.0079          0.0049          0.0952             507
+ Generated Content Resolution          no           yes     file:///home/palbrecht/dev/tes          0.0104          0.0104          0.0104          0.0104               1
+ Float Placement Speculation           yes          yes     file:///home/palbrecht/dev/tes          0.0009          0.0007          0.0003          0.0248             507
+ Float Placement Speculation           no           yes     file:///home/palbrecht/dev/tes          0.0235          0.0235          0.0235          0.0235               1
+ Primary Layout Pass                   yes          yes     file:///home/palbrecht/dev/tes          0.2904          0.2904          0.2904          0.2904               1
+ Primary Layout Pass                   no           yes     file:///home/palbrecht/dev/tes          0.3777          0.3777          0.3777          0.3777               1
+ Store Overflow                        yes          yes     file:///home/palbrecht/dev/tes          0.0005          0.0004          0.0002          0.0313             507
+ Store Overflow                        no           yes     file:///home/palbrecht/dev/tes          0.0347          0.0347          0.0347          0.0347               1
+ Display List Construction             yes          yes     file:///home/palbrecht/dev/tes          0.0203          0.0059          0.0036          3.7504             507
+ Display List Construction             no           yes     file:///home/palbrecht/dev/tes          1.6878          1.6878          1.6878          1.6878               1
Script JS Evaluate                      no           yes     file:///home/palbrecht/dev/tes          1.9410          1.9410          1.9410          1.9410               1
Script Parse HTML                       no           yes     file:///home/palbrecht/dev/tes         26.8207         23.1572          0.0113         84.0995               4
Time To First Paint                     yes          yes     file:///home/palbrecht/dev/tes          0.0000          0.0000          0.0000          0.0000               1
Time To First Contentful Paint          yes          yes     file:///home/palbrecht/dev/tes          0.0000          0.0000          0.0000          0.0000               1

_url_	_blocked layout queries_
file:///home/palbrecht/dev/test.html	7

Servo exited with return value -2

The longer I wait, the more the counter of blocked layout queries increases.

jdm · 2019-04-22T14:30:18Z

@bors-servo r+
Looks good! Thanks for finishing this off!

bors-servo · 2019-04-22T14:30:19Z

📌 Commit 4fd9fea has been approved by jdm

bors-servo · 2019-04-22T14:52:51Z

⌛ Testing commit 4fd9fea with merge 4e12deb...


        Auto merge of #23115 - pylbrecht:measure.blocked.layout.queries, r=jdm

measure blocked layout queries  ---  - [X] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #19797  - [ ] There are tests for these changes    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23115)

bors-servo · 2019-04-22T16:39:54Z

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: jdm
Pushing 4e12deb to master...

highfive assigned jdm Mar 27, 2019

highfive added the S-awaiting-review label Mar 27, 2019

jdm requested changes Mar 29, 2019

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Mar 29, 2019

highfive added S-awaiting-review and removed S-needs-code-changes labels Mar 31, 2019

jdm added S-needs-code-changes and removed S-awaiting-review labels Apr 5, 2019

highfive added S-awaiting-review and removed S-needs-code-changes labels Apr 8, 2019

pylbrecht force-pushed the pylbrecht:measure.blocked.layout.queries branch from 1beeef5 to 3f4f463 Apr 12, 2019

Measure layout queries blocked by ongoing layout

Loading status checks…

858011c

pylbrecht force-pushed the pylbrecht:measure.blocked.layout.queries branch from 3f4f463 to 858011c Apr 13, 2019

jdm requested changes Apr 16, 2019

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Apr 16, 2019

fixup! Measure layout queries blocked by ongoing layout

Loading status checks…

4fd9fea

highfive added S-awaiting-review and removed S-needs-code-changes labels Apr 17, 2019

highfive added S-awaiting-merge and removed S-awaiting-review labels Apr 22, 2019

highfive removed the S-awaiting-merge label Apr 22, 2019

bors-servo mentioned this pull request Apr 22, 2019

Remove unnecessary explicit reflows #23118

Open

4 of 4 tasks complete

servo / servo

measure blocked layout queries #23115

measure blocked layout queries #23115

pylbrecht commented Mar 27, 2019 •

edited

highfive commented Mar 27, 2019

highfive commented Mar 27, 2019

highfive commented Mar 27, 2019

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pylbrecht commented Mar 31, 2019

jdm commented Apr 1, 2019

pylbrecht commented Apr 8, 2019 •

edited

pylbrecht commented Apr 12, 2019

jdm commented Apr 12, 2019

jdm commented Apr 12, 2019

pylbrecht commented Apr 13, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pylbrecht commented Apr 17, 2019

pylbrecht commented Apr 22, 2019

jdm commented Apr 22, 2019

bors-servo commented Apr 22, 2019

bors-servo commented Apr 22, 2019

bors-servo commented Apr 22, 2019

servo / servo

Join GitHub today

measure blocked layout queries #23115

measure blocked layout queries #23115

Conversation

pylbrecht commented Mar 27, 2019 • edited

highfive commented Mar 27, 2019

highfive commented Mar 27, 2019

highfive commented Mar 27, 2019

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pylbrecht Mar 31, 2019 • edited

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pylbrecht Apr 7, 2019 • edited

pylbrecht commented Mar 31, 2019

jdm commented Apr 1, 2019

pylbrecht commented Apr 8, 2019 • edited

pylbrecht commented Apr 12, 2019

jdm commented Apr 12, 2019

jdm commented Apr 12, 2019

pylbrecht commented Apr 13, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

pylbrecht commented Apr 17, 2019

pylbrecht commented Apr 22, 2019

jdm commented Apr 22, 2019

bors-servo commented Apr 22, 2019

bors-servo commented Apr 22, 2019

bors-servo commented Apr 22, 2019

pylbrecht commented Mar 27, 2019 •

edited

pylbrecht Mar 31, 2019 •

edited

pylbrecht Apr 7, 2019 •

edited

pylbrecht commented Apr 8, 2019 •

edited