mirror of
https://github.com/servo/servo.git
synced 2025-07-25 16:20:36 +01:00
Auto merge of #15136 - nox:mitochondria-finally-makes-it-into-the-tree, r=jdm
Use mitochondria::OnceCell to store ScriptThread in TLS <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15136) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
ca6376a714
4 changed files with 42 additions and 45 deletions
7
Cargo.lock
generated
7
Cargo.lock
generated
|
|
@ -1622,6 +1622,11 @@ dependencies = [
|
|||
"ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mitochondria"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "mozjs_sys"
|
||||
version = "0.0.0"
|
||||
|
|
@ -2280,6 +2285,7 @@ dependencies = [
|
|||
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mime 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mime_guess 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"msg 0.0.1",
|
||||
"net_traits 0.0.1",
|
||||
"num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
@ -3507,6 +3513,7 @@ dependencies = [
|
|||
"checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54"
|
||||
"checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
|
||||
"checksum miow 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3e690c5df6b2f60acd45d56378981e827ff8295562fc8d34f573deb267a59cd1"
|
||||
"checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f"
|
||||
"checksum mozjs_sys 0.0.0 (git+https://github.com/servo/mozjs)" = "<none>"
|
||||
"checksum mp3-metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2f61cf32f7fc3cec83a15a255ac60bceb6cac59a7ce190cb824ca25c0fce0feb"
|
||||
"checksum mp4parse 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1736d06703a9cb5228b5a8151acc79bf5ba7669a810243852bcad4d3a25504"
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ libc = "0.2"
|
|||
log = "0.3.5"
|
||||
mime = "0.2.1"
|
||||
mime_guess = "1.8.0"
|
||||
mitochondria = "1.1.2"
|
||||
msg = {path = "../msg"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
num-traits = "0.1.32"
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ extern crate log;
|
|||
#[macro_use]
|
||||
extern crate mime;
|
||||
extern crate mime_guess;
|
||||
extern crate mitochondria;
|
||||
extern crate msg;
|
||||
extern crate net_traits;
|
||||
extern crate num_traits;
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ use js::jsval::UndefinedValue;
|
|||
use js::rust::Runtime;
|
||||
use layout_wrapper::ServoLayoutNode;
|
||||
use mem::heap_size_of_self_and_children;
|
||||
use mitochondria::OnceCell;
|
||||
use msg::constellation_msg::{FrameId, FrameType, PipelineId, PipelineNamespace};
|
||||
use net_traits::{CoreResourceMsg, FetchMetadata, FetchResponseListener};
|
||||
use net_traits::{IpcSend, Metadata, ReferrerPolicy, ResourceThreads};
|
||||
|
|
@ -120,13 +121,13 @@ use webdriver_handlers;
|
|||
use webvr_traits::WebVRMsg;
|
||||
|
||||
thread_local!(pub static STACK_ROOTS: Cell<Option<RootCollectionPtr>> = Cell::new(None));
|
||||
thread_local!(static SCRIPT_THREAD_ROOT: Cell<Option<*const ScriptThread>> = Cell::new(None));
|
||||
thread_local!(static SCRIPT_THREAD_ROOT: OnceCell<ScriptThread> = OnceCell::new());
|
||||
|
||||
pub unsafe fn trace_thread(tr: *mut JSTracer) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
if let Some(script_thread) = root.get() {
|
||||
if let Some(script_thread) = root.as_ref() {
|
||||
debug!("tracing fields of ScriptThread");
|
||||
(*script_thread).trace(tr);
|
||||
script_thread.trace(tr);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -534,13 +535,9 @@ impl ScriptThreadFactory for ScriptThread {
|
|||
let parent_info = state.parent_info;
|
||||
let mem_profiler_chan = state.mem_profiler_chan.clone();
|
||||
let window_size = state.window_size;
|
||||
let script_thread = ScriptThread::new(state,
|
||||
script_port,
|
||||
script_chan.clone());
|
||||
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
root.set(Some(&script_thread as *const _));
|
||||
});
|
||||
let script_thread = root.init_once(|| ScriptThread::new(state, script_port, script_chan.clone()));
|
||||
|
||||
let mut failsafe = ScriptMemoryFailsafe::new(&script_thread);
|
||||
|
||||
|
|
@ -557,6 +554,7 @@ impl ScriptThreadFactory for ScriptThread {
|
|||
|
||||
// This must always be the very last operation performed before the thread completes
|
||||
failsafe.neuter();
|
||||
});
|
||||
}).expect("Thread spawning failed");
|
||||
|
||||
(sender, receiver)
|
||||
|
|
@ -567,7 +565,7 @@ impl ScriptThread {
|
|||
pub fn page_headers_available(id: &PipelineId, metadata: Option<Metadata>)
|
||||
-> Option<Root<ServoParser>> {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
let script_thread = unsafe { &*root.get().unwrap() };
|
||||
let script_thread = root.as_ref().unwrap();
|
||||
script_thread.handle_page_headers_available(id, metadata)
|
||||
})
|
||||
}
|
||||
|
|
@ -575,7 +573,7 @@ impl ScriptThread {
|
|||
#[allow(unrooted_must_root)]
|
||||
pub fn schedule_job(job: Job, global: &GlobalScope) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
let script_thread = unsafe { &*root.get().unwrap() };
|
||||
let script_thread = root.as_ref().unwrap();
|
||||
let job_queue = &*script_thread.job_queue_map;
|
||||
job_queue.schedule_job(job, global, &script_thread);
|
||||
});
|
||||
|
|
@ -583,8 +581,7 @@ impl ScriptThread {
|
|||
|
||||
pub fn process_event(msg: CommonScriptMsg) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
if let Some(script_thread) = root.get() {
|
||||
let script_thread = unsafe { &*script_thread };
|
||||
if let Some(script_thread) = root.as_ref() {
|
||||
script_thread.handle_msg_from_script(MainThreadScriptMsg::Common(msg));
|
||||
}
|
||||
});
|
||||
|
|
@ -594,8 +591,7 @@ impl ScriptThread {
|
|||
pub fn await_stable_state<T: Runnable + Send + 'static>(task: T) {
|
||||
//TODO use microtasks when they exist
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
if let Some(script_thread) = root.get() {
|
||||
let script_thread = unsafe { &*script_thread };
|
||||
if let Some(script_thread) = root.as_ref() {
|
||||
let _ = script_thread.chan.send(CommonScriptMsg::RunnableMsg(
|
||||
ScriptThreadEventCategory::DomEvent,
|
||||
box task));
|
||||
|
|
@ -605,8 +601,7 @@ impl ScriptThread {
|
|||
|
||||
pub fn process_attach_layout(new_layout_info: NewLayoutInfo, origin: Origin) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
if let Some(script_thread) = root.get() {
|
||||
let script_thread = unsafe { &*script_thread };
|
||||
if let Some(script_thread) = root.as_ref() {
|
||||
script_thread.profile_event(ScriptThreadEventCategory::AttachLayout, || {
|
||||
script_thread.handle_new_layout(new_layout_info, origin);
|
||||
})
|
||||
|
|
@ -615,10 +610,11 @@ impl ScriptThread {
|
|||
}
|
||||
|
||||
pub fn find_document(id: PipelineId) -> Option<Root<Document>> {
|
||||
SCRIPT_THREAD_ROOT.with(|root| root.get().and_then(|script_thread| {
|
||||
let script_thread = unsafe { &*script_thread };
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
root.as_ref().and_then(|script_thread| {
|
||||
script_thread.documents.borrow().find_document(id)
|
||||
}))
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/// Creates a new script thread.
|
||||
|
|
@ -2167,14 +2163,14 @@ impl ScriptThread {
|
|||
|
||||
pub fn enqueue_promise_job(job: EnqueuedPromiseCallback, global: &GlobalScope) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
let script_thread = unsafe { &*root.get().unwrap() };
|
||||
let script_thread = root.as_ref().unwrap();
|
||||
script_thread.promise_job_queue.enqueue(job, global);
|
||||
});
|
||||
}
|
||||
|
||||
pub fn flush_promise_jobs(global: &GlobalScope) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
let script_thread = unsafe { &*root.get().unwrap() };
|
||||
let script_thread = root.as_ref().unwrap();
|
||||
let _ = script_thread.dom_manipulation_task_source.queue(
|
||||
box FlushPromiseJobs, global);
|
||||
})
|
||||
|
|
@ -2192,14 +2188,6 @@ impl Runnable for FlushPromiseJobs {
|
|||
}
|
||||
}
|
||||
|
||||
impl Drop for ScriptThread {
|
||||
fn drop(&mut self) {
|
||||
SCRIPT_THREAD_ROOT.with(|root| {
|
||||
root.set(None);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Shuts down layout for the given window.
|
||||
fn shut_down_layout(window: &Window) {
|
||||
// Tell the layout thread to begin shutting down, and wait until it
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue