Remove support for energy and heartbeats profiling

components/config/opts.rs

@@ -109,9 +109,6 @@ pub struct Opts {
     /// Periodically print out on which events script threads spend their processing time.
     pub profile_script_events: bool,
 
-    /// Enable all heartbeats for profiling.
-    pub profile_heartbeats: bool,
-
     /// `None` to disable debugger or `Some` with a port number to start a server to listen to
     /// remote Firefox debugger connections.
     pub debugger_port: Option<u16>,
@@ -264,9 +261,6 @@ pub struct DebugOptions {
     /// Profile which events script threads spend their time on.
     pub profile_script_events: bool,
 
-    /// Enable all heartbeats for profiling.
-    pub profile_heartbeats: bool,
-
     /// Paint borders along fragment boundaries.
     pub show_fragment_borders: bool,
 
@@ -333,7 +327,6 @@ impl DebugOptions {
                 "dump-display-list-json" => self.dump_display_list_json = true,
                 "relayout-event" => self.relayout_event = true,
                 "profile-script-events" => self.profile_script_events = true,
-                "profile-heartbeats" => self.profile_heartbeats = true,
                 "show-fragment-borders" => self.show_fragment_borders = true,
                 "show-parallel-layout" => self.show_parallel_layout = true,
                 "trace-layout" => self.trace_layout = true,
@@ -397,10 +390,6 @@ fn print_debug_usage(app: &str) -> ! {
         "profile-script-events",
         "Enable profiling of script-related events.",
     );
-    print_option(
-        "profile-heartbeats",
-        "Enable heartbeats for all thread categories.",
-    );
     print_option(
         "show-fragment-borders",
         "Paint borders along fragment boundaries.",
@@ -509,7 +498,6 @@ pub fn default_opts() -> Opts {
         dump_display_list_json: false,
         relayout_event: false,
         profile_script_events: false,
-        profile_heartbeats: false,
         disable_share_style_cache: false,
         style_sharing_stats: false,
         convert_mouse_to_touch: false,
@@ -896,7 +884,6 @@ pub fn from_cmdline_args(mut opts: Options, args: &[String]) -> ArgumentParsingR
         hard_fail: opt_match.opt_present("f") && !opt_match.opt_present("F"),
         bubble_inline_sizes_separately: bubble_inline_sizes_separately,
         profile_script_events: debug_options.profile_script_events,
-        profile_heartbeats: debug_options.profile_heartbeats,
         trace_layout: debug_options.trace_layout,
         debugger_port: debugger_port,
         devtools_port: devtools_port,

components/layout_thread/lib.rs

@@ -1456,8 +1456,6 @@ impl LayoutThread {
                 &self.time_profiler_chan,
                 0,
                 text_shaping_time as u64,
-                0,
-                0,
             );
 
             // Retrieve the (possibly rebuilt) root flow.

components/metrics/lib.rs

@@ -81,8 +81,6 @@ fn set_metric<U: ProgressiveWebMetric>(
         &pwm.get_time_profiler_chan(),
         time,
         time,
-        0,
-        0,
     );
 
     // Print the metric to console if the print-pwm option was given.

components/profile/Cargo.toml

@@ -11,14 +11,11 @@ name = "profile"
 path = "lib.rs"
 
 [dependencies]
-heartbeats-simple = "0.4"
 ipc-channel = "0.14"
-log = "0.4"
 profile_traits = { path = "../profile_traits" }
 serde = "1.0"
 serde_json = "1.0"
 servo_config = { path = "../config" }
-time_crate = { package = "time", version = "0.1.12" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 task_info = { path = "../../support/rust-task_info" }