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

Auto merge of #9926 - connorimes:update-em-interface-hbs-crates, r=asajeffrey

Browse source 
Update heartbeats and energymon profiler dependencies

Heartbeats now on crates.io.
Updates to energymon interface for energy profiling.
Profiling script for Android.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9926)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-10 23:09:23 +05:30
commit 396812b6d9
8 changed files with 236 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/profile/Cargo.toml
View file

@ -17,13 +17,11 @@ path = "../plugins"
[dependencies.util]
path = "../util"
[dependencies.hbs-pow]
git = "https://github.com/libheartbeats/heartbeats-simple-rust.git"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies]
hbs-pow = "0.2"
log = "0.3"
libc = "0.2"
regex = "0.1.55"

2
components/profile_traits/Cargo.toml
View file

@ -19,7 +19,7 @@ git = "https://github.com/energymon/energymon-rust.git"
optional = true
[dependencies.energy-monitor]
version = "0.1.0"
version = "0.2.0"
optional = true
[dependencies.plugins]

67
components/servo/Cargo.lock generated
View file

@ -236,6 +236,14 @@ dependencies = [
"winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cmake"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cocoa"
version = "0.2.5"
@ -509,33 +517,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "energy-monitor"
version = "0.1.1"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "energymon"
version = "0.1.0"
source = "git+https://github.com/energymon/energymon-rust.git#637e537934cdfc2142011a910490a408ea135af2"
version = "0.2.0"
source = "git+https://github.com/energymon/energymon-rust.git#7b30c4d88ac1fcfaf7755081ebdd810c5dcf4fea"
dependencies = [
"energy-monitor 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon-default-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
"energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon-default-sys 0.2.0 (git+https://github.com/energymon/energymon-sys.git)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "energymon-default-sys"
version = "0.1.0"
source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
name = "energymon-builder"
version = "0.2.0"
source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b110ae6378b5c89c2287172"
dependencies = [
"energymon-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "energymon-default-sys"
version = "0.2.0"
source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b110ae6378b5c89c2287172"
dependencies = [
"energymon-builder 0.2.0 (git+https://github.com/energymon/energymon-sys.git)",
"energymon-sys 0.2.0 (git+https://github.com/energymon/energymon-sys.git)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "energymon-sys"
version = "0.1.0"
source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
version = "0.2.0"
source = "git+https://github.com/energymon/energymon-sys.git#a0fb99b0312372958b110ae6378b5c89c2287172"
dependencies = [
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -798,10 +814,19 @@ dependencies = [
"pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "hbs-builder"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cmake 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "hbs-common-sys"
version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -809,20 +834,20 @@ dependencies = [
[[package]]
name = "hbs-pow"
version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"hbs-pow-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "hbs-pow-sys"
version = "0.2.0"
source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
"hbs-builder 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hbs-common-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"pkg-config 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1515,7 +1540,7 @@ dependencies = [
name = "profile"
version = "0.0.1"
dependencies = [
"hbs-pow 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-rust.git)",
"hbs-pow 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1531,8 +1556,8 @@ dependencies = [
name = "profile_traits"
version = "0.0.1"
dependencies = [
"energy-monitor 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon 0.1.0 (git+https://github.com/energymon/energymon-rust.git)",
"energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"energymon 0.2.0 (git+https://github.com/energymon/energymon-rust.git)",
"ipc-channel 0.2.1 (git+https://github.com/servo/ipc-channel)",
"plugins 0.0.1",
"serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",