mirror of
https://github.com/servo/servo.git
synced 2025-06-27 18:43:40 +01:00
This changeset implements the beginnings of fine-grained measurement of Servo's data structures. - It adds a new `SizeOf` trait, which is used to measure the memory used by heap data structures, and implements it for some std types: Box, String, Option, Arc, Vec, and DList. - It adds a new `MemoryReporter` trait which is used to report memory measurements from other threads to the memory profiler. Reporters are registered and unregistered with the memory profiler, and the memory profiler makes measurement requests of reporters when necessary. - It plumbs a MemoryProfilerChan through to the layout task so it can register a memory reporter. - It implements the `SizeOf` trait for `DisplayList` and associated types, and adds a memory reporter that uses it. The display list hits 14.77 MiB when viewing tests/html/perf-rainbow.html, and 2.51 MiB when viewing the Guardians of the Galaxy Wikipedia page from servo-static-suite. Example output: 0.29: display-list::http://www.reddit.com/ 0.00: display-list::http://static.adzerk.net/reddit/ads.html?sr=-reddit.com,loggedout&bust2#http://www.reddit.com 0.00: display-list::http://www.reddit.com/static/createadframe.html There are a number of FIXME comments indicating sub-optimal things. This is a big enough change for now that doing them as follow-ups seems best.
232 lines
9.7 KiB
Rust
232 lines
9.7 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use CompositorProxy;
|
|
use layout_traits::{LayoutControlMsg, LayoutTaskFactory, LayoutControlChan};
|
|
use script_traits::{ScriptControlChan, ScriptTaskFactory};
|
|
use script_traits::{NewLayoutInfo, ConstellationControlMsg};
|
|
|
|
use devtools_traits::DevtoolsControlChan;
|
|
use geom::rect::{TypedRect};
|
|
use gfx::paint_task::Msg as PaintMsg;
|
|
use gfx::paint_task::{PaintChan, PaintTask};
|
|
use gfx::font_cache_task::FontCacheTask;
|
|
use msg::constellation_msg::{ConstellationChan, Failure, FrameId, PipelineId, SubpageId};
|
|
use msg::constellation_msg::{LoadData, WindowSizeData, PipelineExitType};
|
|
use net::image_cache_task::ImageCacheTask;
|
|
use net::resource_task::ResourceTask;
|
|
use net::storage_task::StorageTask;
|
|
use url::Url;
|
|
use util::geometry::{PagePx};
|
|
use util::memory::MemoryProfilerChan;
|
|
use util::time::TimeProfilerChan;
|
|
use std::sync::mpsc::{Receiver, channel};
|
|
|
|
/// A uniquely-identifiable pipeline of script task, layout task, and paint task.
|
|
pub struct Pipeline {
|
|
pub id: PipelineId,
|
|
pub parent_info: Option<(PipelineId, SubpageId)>,
|
|
pub script_chan: ScriptControlChan,
|
|
pub layout_chan: LayoutControlChan,
|
|
pub paint_chan: PaintChan,
|
|
pub layout_shutdown_port: Receiver<()>,
|
|
pub paint_shutdown_port: Receiver<()>,
|
|
/// URL corresponding to the most recently-loaded page.
|
|
pub url: Url,
|
|
/// The title of the most recently-loaded page.
|
|
pub title: Option<String>,
|
|
pub rect: Option<TypedRect<PagePx, f32>>,
|
|
pub children: Vec<FrameId>,
|
|
}
|
|
|
|
/// The subset of the pipeline that is needed for layer composition.
|
|
#[derive(Clone)]
|
|
pub struct CompositionPipeline {
|
|
pub id: PipelineId,
|
|
pub script_chan: ScriptControlChan,
|
|
pub paint_chan: PaintChan,
|
|
}
|
|
|
|
impl Pipeline {
|
|
/// Starts a paint task, layout task, and possibly a script task.
|
|
/// Returns the channels wrapped in a struct.
|
|
/// If script_pipeline is not None, then subpage_id must also be not None.
|
|
pub fn create<LTF,STF>(id: PipelineId,
|
|
parent_info: Option<(PipelineId, SubpageId)>,
|
|
constellation_chan: ConstellationChan,
|
|
compositor_proxy: Box<CompositorProxy+'static+Send>,
|
|
devtools_chan: Option<DevtoolsControlChan>,
|
|
image_cache_task: ImageCacheTask,
|
|
font_cache_task: FontCacheTask,
|
|
resource_task: ResourceTask,
|
|
storage_task: StorageTask,
|
|
time_profiler_chan: TimeProfilerChan,
|
|
memory_profiler_chan: MemoryProfilerChan,
|
|
window_size: Option<WindowSizeData>,
|
|
script_chan: Option<ScriptControlChan>,
|
|
load_data: LoadData)
|
|
-> Pipeline
|
|
where LTF: LayoutTaskFactory, STF:ScriptTaskFactory {
|
|
let layout_pair = ScriptTaskFactory::create_layout_channel(None::<&mut STF>);
|
|
let (paint_port, paint_chan) = PaintChan::new();
|
|
let (paint_shutdown_chan, paint_shutdown_port) = channel();
|
|
let (layout_shutdown_chan, layout_shutdown_port) = channel();
|
|
let (pipeline_chan, pipeline_port) = channel();
|
|
|
|
let failure = Failure {
|
|
pipeline_id: id,
|
|
parent_info: parent_info,
|
|
};
|
|
|
|
let script_chan = match script_chan {
|
|
None => {
|
|
let (script_chan, script_port) = channel();
|
|
ScriptTaskFactory::create(None::<&mut STF>,
|
|
id,
|
|
compositor_proxy.clone_compositor_proxy(),
|
|
&layout_pair,
|
|
ScriptControlChan(script_chan.clone()),
|
|
script_port,
|
|
constellation_chan.clone(),
|
|
failure.clone(),
|
|
resource_task.clone(),
|
|
storage_task.clone(),
|
|
image_cache_task.clone(),
|
|
devtools_chan,
|
|
window_size,
|
|
load_data.clone());
|
|
ScriptControlChan(script_chan)
|
|
}
|
|
Some(script_chan) => {
|
|
let (containing_pipeline_id, subpage_id) = parent_info.expect("script_pipeline != None but subpage_id == None");
|
|
let new_layout_info = NewLayoutInfo {
|
|
containing_pipeline_id: containing_pipeline_id,
|
|
new_pipeline_id: id,
|
|
subpage_id: subpage_id,
|
|
layout_chan: ScriptTaskFactory::clone_layout_channel(None::<&mut STF>, &layout_pair),
|
|
load_data: load_data.clone(),
|
|
};
|
|
|
|
let ScriptControlChan(ref chan) = script_chan;
|
|
chan.send(ConstellationControlMsg::AttachLayout(new_layout_info)).unwrap();
|
|
script_chan.clone()
|
|
}
|
|
};
|
|
|
|
PaintTask::create(id,
|
|
paint_port,
|
|
compositor_proxy,
|
|
constellation_chan.clone(),
|
|
font_cache_task.clone(),
|
|
failure.clone(),
|
|
time_profiler_chan.clone(),
|
|
paint_shutdown_chan);
|
|
|
|
LayoutTaskFactory::create(None::<&mut LTF>,
|
|
id,
|
|
load_data.url.clone(),
|
|
layout_pair,
|
|
pipeline_port,
|
|
constellation_chan,
|
|
failure,
|
|
script_chan.clone(),
|
|
paint_chan.clone(),
|
|
resource_task,
|
|
image_cache_task,
|
|
font_cache_task,
|
|
time_profiler_chan,
|
|
memory_profiler_chan,
|
|
layout_shutdown_chan);
|
|
|
|
Pipeline::new(id,
|
|
parent_info,
|
|
script_chan,
|
|
LayoutControlChan(pipeline_chan),
|
|
paint_chan,
|
|
layout_shutdown_port,
|
|
paint_shutdown_port,
|
|
load_data.url)
|
|
}
|
|
|
|
pub fn new(id: PipelineId,
|
|
parent_info: Option<(PipelineId, SubpageId)>,
|
|
script_chan: ScriptControlChan,
|
|
layout_chan: LayoutControlChan,
|
|
paint_chan: PaintChan,
|
|
layout_shutdown_port: Receiver<()>,
|
|
paint_shutdown_port: Receiver<()>,
|
|
url: Url)
|
|
-> Pipeline {
|
|
Pipeline {
|
|
id: id,
|
|
parent_info: parent_info,
|
|
script_chan: script_chan,
|
|
layout_chan: layout_chan,
|
|
paint_chan: paint_chan,
|
|
layout_shutdown_port: layout_shutdown_port,
|
|
paint_shutdown_port: paint_shutdown_port,
|
|
url: url,
|
|
title: None,
|
|
children: vec!(),
|
|
rect: None,
|
|
}
|
|
}
|
|
|
|
pub fn grant_paint_permission(&self) {
|
|
let _ = self.paint_chan.send(PaintMsg::PaintPermissionGranted);
|
|
}
|
|
|
|
pub fn revoke_paint_permission(&self) {
|
|
debug!("pipeline revoking paint channel paint permission");
|
|
let _ = self.paint_chan.send(PaintMsg::PaintPermissionRevoked);
|
|
}
|
|
|
|
pub fn exit(&self, exit_type: PipelineExitType) {
|
|
debug!("pipeline {:?} exiting", self.id);
|
|
|
|
// Script task handles shutting down layout, and layout handles shutting down the painter.
|
|
// For now, if the script task has failed, we give up on clean shutdown.
|
|
let ScriptControlChan(ref chan) = self.script_chan;
|
|
if chan.send(ConstellationControlMsg::ExitPipeline(self.id, exit_type)).is_ok() {
|
|
// Wait until all slave tasks have terminated and run destructors
|
|
// NOTE: We don't wait for script task as we don't always own it
|
|
let _ = self.paint_shutdown_port.recv();
|
|
let _ = self.layout_shutdown_port.recv();
|
|
}
|
|
|
|
}
|
|
|
|
pub fn freeze(&self) {
|
|
let ScriptControlChan(ref script_channel) = self.script_chan;
|
|
let _ = script_channel.send(ConstellationControlMsg::Freeze(self.id)).unwrap();
|
|
}
|
|
|
|
pub fn thaw(&self) {
|
|
let ScriptControlChan(ref script_channel) = self.script_chan;
|
|
let _ = script_channel.send(ConstellationControlMsg::Thaw(self.id)).unwrap();
|
|
}
|
|
|
|
pub fn force_exit(&self) {
|
|
let ScriptControlChan(ref script_channel) = self.script_chan;
|
|
let _ = script_channel.send(
|
|
ConstellationControlMsg::ExitPipeline(self.id,
|
|
PipelineExitType::PipelineOnly)).unwrap();
|
|
let _ = self.paint_chan.send(PaintMsg::Exit(None, PipelineExitType::PipelineOnly));
|
|
let LayoutControlChan(ref layout_channel) = self.layout_chan;
|
|
let _ = layout_channel.send(
|
|
LayoutControlMsg::ExitNowMsg(PipelineExitType::PipelineOnly)).unwrap();
|
|
}
|
|
|
|
pub fn to_sendable(&self) -> CompositionPipeline {
|
|
CompositionPipeline {
|
|
id: self.id.clone(),
|
|
script_chan: self.script_chan.clone(),
|
|
paint_chan: self.paint_chan.clone(),
|
|
}
|
|
}
|
|
|
|
pub fn add_child(&mut self, frame_id: FrameId) {
|
|
self.children.push(frame_id);
|
|
}
|
|
}
|