Send message to profiler if layout is busy

servo · Apr 8, 2019 · 1beeef5 · 1beeef5
1 parent 3e60918
commit 1beeef5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
@@ -92,7 +92,7 @@ use net_traits::{ReferrerPolicy, ResourceThreads};
 use num_traits::ToPrimitive;
 use profile_traits::ipc as ProfiledIpc;
 use profile_traits::mem::ProfilerChan as MemProfilerChan;
-use profile_traits::time::ProfilerChan as TimeProfilerChan;
+use profile_traits::time::{ProfilerChan as TimeProfilerChan, ProfilerMsg};
 use script_layout_interface::message::{Msg, QueryMsg, Reflow, ReflowGoal, ScriptReflow};
 use script_layout_interface::rpc::{ContentBoxResponse, ContentBoxesResponse, LayoutRPC};
 use script_layout_interface::rpc::{
@@ -1563,9 +1563,9 @@ impl Window {
 
     pub fn layout_reflow(&self, query_msg: QueryMsg) -> bool {
         if self.layout_is_busy.load(Ordering::Relaxed) {
-            // TODO(pylbrecht)
-            // send message to profiler that layout thread is busy
-            panic!("TODO(pylbrecht): layout thread is busy");
+            let url = self.get_url().into_string();
+            self.time_profiler_chan()
+                .send(ProfilerMsg::BlockedLayoutQuery(url));
         }
 
         self.reflow(

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
@@ -219,7 +219,7 @@ impl InProgressLoad {
         window_size: WindowSizeData,
         url: ServoUrl,
         origin: MutableOrigin,
-        layout_is_busy: Arc<AtomicBool>
+        layout_is_busy: Arc<AtomicBool>,
     ) -> InProgressLoad {
         let current_time = get_time();
         let navigation_start_precise = precise_time_ns();

diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs
@@ -19,8 +19,8 @@ use script_traits::{ScrollState, UntrustedNodeAddress, WindowSizeData};
 use servo_arc::Arc as ServoArc;
 use servo_atoms::Atom;
 use servo_url::ServoUrl;
-use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 use style::context::QuirksMode;
 use style::dom::OpaqueNode;
 use style::properties::PropertyId;