Constellation can now optionally report memory usage when the page is loaded. (#37151)

The constellation can now tell the memory reporter to report the memory
to a trace file when a page is loaded.
Additionally, we amend the memory reporter to allow a simple message
where it will report the memory to a tracing provider (at the moment
only OHOS/hitrace is supported but easy extension is possible).

I am not sure if this is the right approach or if the embedder should
decide to have the memory reporting done.

Testing: This does not change functionality of any of the rendering.

---------

Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
This commit is contained in:
Narfinger 2025-05-30 19:15:06 +02:00 committed by GitHub
parent 5580704438
commit 13a980ff22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 32 additions and 1 deletions

View file

@ -148,6 +148,7 @@ use net_traits::pub_domains::reg_host;
use net_traits::request::Referrer;
use net_traits::storage_thread::{StorageThreadMsg, StorageType};
use net_traits::{self, IpcSend, ReferrerPolicy, ResourceThreads};
use profile_traits::mem::ProfilerMsg;
use profile_traits::{mem, time};
use script_layout_interface::{LayoutFactory, ScriptThreadFactory};
use script_traits::{
@ -1488,6 +1489,9 @@ where
) => {
self.handle_evaluate_javascript(webview_id, evaluation_id, script);
},
EmbedderToConstellationMessage::CreateMemoryReport(sender) => {
self.mem_profiler_chan.send(ProfilerMsg::Report(sender));
},
}
}

View file

@ -78,6 +78,7 @@ mod from_compositor {
Self::SetScrollStates(..) => target!("SetScrollStates"),
Self::PaintMetric(..) => target!("PaintMetric"),
Self::EvaluateJavaScript(..) => target!("EvaluateJavaScript"),
Self::CreateMemoryReport(..) => target!("CreateMemoryReport"),
}
}
}

View file

@ -114,7 +114,6 @@ impl Profiler {
let _ = sender.send(MemoryReportResult { results });
true
},
ProfilerMsg::Exit => false,
}
}

View file

@ -92,6 +92,7 @@ use media::{GlApi, NativeDisplay, WindowGLContext};
use net::protocols::ProtocolRegistry;
use net::resource_thread::new_resource_threads;
use profile::{mem as profile_mem, time as profile_time};
use profile_traits::mem::MemoryReportResult;
use profile_traits::{mem, time};
use script::{JSEngineSetup, ServiceWorkerManager};
use servo_config::opts::Opts;
@ -633,6 +634,11 @@ impl Servo {
log::set_max_level(filter);
}
pub fn create_memory_report(&self, snd: IpcSender<MemoryReportResult>) {
self.constellation_proxy
.send(EmbedderToConstellationMessage::CreateMemoryReport(snd));
}
pub fn start_shutting_down(&self) {
if self.shutdown_state.get() != ShutdownState::NotShuttingDown {
warn!("Requested shutdown while already shutting down");

View file

@ -26,6 +26,7 @@ use euclid::Vector2D;
pub use from_script_message::*;
use ipc_channel::ipc::IpcSender;
use malloc_size_of_derive::MallocSizeOf;
use profile_traits::mem::MemoryReportResult;
use serde::{Deserialize, Serialize};
use servo_url::{ImmutableOrigin, ServoUrl};
pub use structured_data::*;
@ -95,6 +96,8 @@ pub enum EmbedderToConstellationMessage {
/// Evaluate a JavaScript string in the context of a `WebView`. When execution is complete or an
/// error is encountered, a correpsonding message will be sent to the embedding layer.
EvaluateJavaScript(WebViewId, JavaScriptEvaluationId, String),
/// Create a memory report and return it via the ipc sender
CreateMemoryReport(IpcSender<MemoryReportResult>),
}
/// A description of a paint metric that is sent from the Servo renderer to the

View file

@ -152,6 +152,24 @@ impl WebViewDelegate for RunningAppState {
self.callbacks
.host_callbacks
.notify_load_status_changed(load_status);
#[cfg(feature = "tracing")]
if load_status == LoadStatus::Complete {
#[cfg(feature = "tracing-hitrace")]
let (snd, recv) = ipc_channel::ipc::channel().expect("Could not create channel");
self.servo.create_memory_report(snd);
std::thread::spawn(move || {
let result = recv.recv().expect("Could not get memory report");
let reports = result
.results
.first()
.expect("We should have some memory report");
for report in &reports.reports {
let path = String::from("servo_memory_profiling:") + &report.path.join("/");
hitrace::trace_metric_str(&path, report.size as i64);
}
});
}
}
fn notify_closed(&self, webview: WebView) {