Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9204 - connorimes:update-hb-energymon, r=Manishearth

Browse source 
Update heartbeats and energymon dependencies

Also aligns the heartbeats profiling script with current ProfilerCategory values.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9204)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-11 03:41:06 +05:30
commit 663ac945c1
4 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/servo/Cargo.lock generated
View file

@ -483,7 +483,7 @@ dependencies = [
[[package]] [[package]]
name = "energymon-default-sys" name = "energymon-default-sys"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/energymon/energymon-sys.git#92eaa056a7b7098ff8b0516da184bc94253de132" source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
dependencies = [ dependencies = [
"energymon-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)", "energymon-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -493,7 +493,7 @@ dependencies = [
[[package]] [[package]]
name = "energymon-sys" name = "energymon-sys"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/energymon/energymon-sys.git#92eaa056a7b7098ff8b0516da184bc94253de132" source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
dependencies = [ dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -753,7 +753,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-common-sys" name = "hbs-common-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -761,7 +761,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow" name = "hbs-pow"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf" source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
dependencies = [ dependencies = [
"hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -770,7 +770,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow-sys" name = "hbs-pow-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

6
ports/cef/Cargo.lock generated
View file

@ -711,7 +711,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-common-sys" name = "hbs-common-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -719,7 +719,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow" name = "hbs-pow"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf" source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
dependencies = [ dependencies = [
"hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -728,7 +728,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow-sys" name = "hbs-pow-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

6
ports/gonk/Cargo.lock generated
View file

@ -679,7 +679,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-common-sys" name = "hbs-common-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -687,7 +687,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow" name = "hbs-pow"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf" source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
dependencies = [ dependencies = [
"hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -696,7 +696,7 @@ dependencies = [
[[package]] [[package]]
name = "hbs-pow-sys" name = "hbs-pow-sys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f" source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
dependencies = [ dependencies = [
"hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)", "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

12
tests/heartbeats/characterize.py
View file

@ -18,10 +18,12 @@ GUARD_TIME = 10
HEARTBEAT_DEFAULT_WINDOW_SIZE = 20 HEARTBEAT_DEFAULT_WINDOW_SIZE = 20
# Use a larger window sizes to reduce or prevent writing log files until benchmark completion # Use a larger window sizes to reduce or prevent writing log files until benchmark completion
# (profiler name, window size) # (profiler name, window size)
# These categories need to be kept aligned with ProfilerCategory in components/profile_traits/time.rs
HEARTBEAT_PROFILER_CATEGORIES = [ HEARTBEAT_PROFILER_CATEGORIES = [
("Compositing", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("Compositing", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutPerform", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutPerform", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutStyleRecalc", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutStyleRecalc", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutTextShaping", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutRestyleDamagePropagation", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutRestyleDamagePropagation", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutNonIncrementalReset", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutNonIncrementalReset", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutSelectorMatch", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutSelectorMatch", HEARTBEAT_DEFAULT_WINDOW_SIZE),
@ -30,7 +32,6 @@ HEARTBEAT_PROFILER_CATEGORIES = [
("LayoutGeneratedContent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutGeneratedContent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutMain", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutMain", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutParallelWarmup", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutParallelWarmup", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutShaping", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("LayoutDispListBuild", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("LayoutDispListBuild", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("PaintingPerTile", 50), ("PaintingPerTile", 50),
("PaintingPrepBuff", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("PaintingPrepBuff", HEARTBEAT_DEFAULT_WINDOW_SIZE),
@ -41,18 +42,19 @@ HEARTBEAT_PROFILER_CATEGORIES = [
("ScriptDevtoolsMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptDevtoolsMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptDocumentEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptDocumentEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptDomEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptDomEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptFileRead", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptFileRead", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptImageCacheMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptImageCacheMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptInputEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptInputEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptNetworkEvent", 200), ("ScriptNetworkEvent", 200),
("ScriptResize", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptResize", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptUpdateReplacedElement", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptSetViewport", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptSetViewport", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptTimerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptStylesheetLoad", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptUpdateReplacedElement", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptWebSocketEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptWebSocketEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ScriptWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
("ScriptXhrEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE), ("ApplicationHeartbeat", 100),
("ApplicationHeartbeat", 100)
] ]
ENERGY_READER_BIN = "energymon" ENERGY_READER_BIN = "energymon"
ENERGY_READER_TEMP_OUTPUT = "energymon.txt" ENERGY_READER_TEMP_OUTPUT = "energymon.txt"