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

Add mozjs feature for profiling.

Browse source
This commit is contained in:
Josh Matthews 2019-03-22 16:04:24 -04:00
parent f45bea7e7c
commit 896aae1c14
5 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Cargo.lock generated
View file

@ -2483,7 +2483,7 @@ dependencies = [
"hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.21.0", "selectors 0.21.0",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2707,20 +2707,20 @@ dependencies = [
[[package]] [[package]]
name = "mozjs" name = "mozjs"
version = "0.10.0" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs_sys 0.61.6 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.61.8 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "mozjs_sys" name = "mozjs_sys"
version = "0.61.6" version = "0.61.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)", "bindgen 0.46.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3496,7 +3496,7 @@ dependencies = [
"mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
"mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1", "msg 0.0.1",
"net_traits 0.0.1", "net_traits 0.0.1",
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -5397,8 +5397,8 @@ dependencies = [
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
"checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f" "checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f"
"checksum mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "45a8a18a41cfab0fde25cc2f43ea89064d211a0fbb33225b8ff93ab20406e0e7" "checksum mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "45a8a18a41cfab0fde25cc2f43ea89064d211a0fbb33225b8ff93ab20406e0e7"
"checksum mozjs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7eea7a83e5f237500eb7d66c8ca9c6dc97e3dc4f129eae2dc63fa17fb87f9a" "checksum mozjs 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "622108d35f4fdd68b3aa39bfe9bedaee5fa9efd19711d046e1d56ff607c0a36f"
"checksum mozjs_sys 0.61.6 (registry+https://github.com/rust-lang/crates.io-index)" = "610d0fce234d68723526bfdc57091f6f4fe5ed661a343125014cd61823711cb5" "checksum mozjs_sys 0.61.8 (registry+https://github.com/rust-lang/crates.io-index)" = "acb0b4cda864ca0a15aee92d578922ff7a6290ef9f481868da90f07e2c78af5b"
"checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" "checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729"
"checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f"
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"

3
components/script/Cargo.toml
View file

@ -14,6 +14,7 @@ path = "lib.rs"
[features] [features]
debugmozjs = ['js/debugmozjs'] debugmozjs = ['js/debugmozjs']
profilemozjs = ['js/profilemozjs']
unstable = [] unstable = []
unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"] unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
default = ["unrooted_must_root_lint"] default = ["unrooted_must_root_lint"]
@ -63,7 +64,7 @@ indexmap = "1.0.2"
ipc-channel = "0.11" ipc-channel = "0.11"
itertools = "0.8" itertools = "0.8"
jstraceable_derive = {path = "../jstraceable_derive"} jstraceable_derive = {path = "../jstraceable_derive"}
js = {package = "mozjs", version = "0.10.0"} js = {package = "mozjs", version = "0.10.1"}
keyboard-types = "0.4.4" keyboard-types = "0.4.4"
lazy_static = "1" lazy_static = "1"
libc = "0.2" libc = "0.2"

1
components/servo/Cargo.toml
View file

@ -16,6 +16,7 @@ max_log_level = ["log/release_max_level_info"]
webdriver = ["webdriver_server"] webdriver = ["webdriver_server"]
energy-profiling = ["profile_traits/energy-profiling"] energy-profiling = ["profile_traits/energy-profiling"]
debugmozjs = ["script/debugmozjs"] debugmozjs = ["script/debugmozjs"]
profilemozjs = ["script/profilemozjs"]
googlevr = ["webvr/googlevr"] googlevr = ["webvr/googlevr"]
js_backtrace = ["script/js_backtrace"] js_backtrace = ["script/js_backtrace"]
native-bluetooth = ["bluetooth/native-bluetooth"] native-bluetooth = ["bluetooth/native-bluetooth"]

1
ports/servo/Cargo.toml
View file

@ -34,6 +34,7 @@ max_log_level = ["log/release_max_level_info"]
webdriver = ["libservo/webdriver"] webdriver = ["libservo/webdriver"]
energy-profiling = ["libservo/energy-profiling"] energy-profiling = ["libservo/energy-profiling"]
debugmozjs = ["libservo/debugmozjs"] debugmozjs = ["libservo/debugmozjs"]
profilemozjs = ["libservo/profilemozjs"]
unstable = ["libservo/unstable"] unstable = ["libservo/unstable"]
webgl_backtrace = ["libservo/webgl_backtrace"] webgl_backtrace = ["libservo/webgl_backtrace"]
webrender_debugger = ["libservo/webrender_debugger"] webrender_debugger = ["libservo/webrender_debugger"]

9
python/servo/build_commands.py
View file

@ -283,6 +283,7 @@ class MachCommands(CommandBase):
opts += ["--target", target] opts += ["--target", target]
env = self.build_env(target=target, is_build=True)
self.ensure_bootstrapped(target=target) self.ensure_bootstrapped(target=target)
self.ensure_clobbered() self.ensure_clobbered()
@ -291,6 +292,10 @@ class MachCommands(CommandBase):
if debug_mozjs: if debug_mozjs:
features += ["debugmozjs"] features += ["debugmozjs"]
if with_frame_pointer:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
features += ["profilemozjs"]
if self.config["build"]["webgl-backtrace"]: if self.config["build"]["webgl-backtrace"]:
features += ["webgl-backtrace"] features += ["webgl-backtrace"]
if self.config["build"]["dom-backtrace"]: if self.config["build"]["dom-backtrace"]:
@ -300,15 +305,11 @@ class MachCommands(CommandBase):
opts += ["--features", "%s" % ' '.join(features)] opts += ["--features", "%s" % ' '.join(features)]
build_start = time() build_start = time()
env = self.build_env(target=target, is_build=True)
env["CARGO_TARGET_DIR"] = target_path env["CARGO_TARGET_DIR"] = target_path
if with_debug_assertions: if with_debug_assertions:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions" env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"
if with_frame_pointer:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
if android: if android:
if "ANDROID_NDK" not in env: if "ANDROID_NDK" not in env:
print("Please set the ANDROID_NDK environment variable.") print("Please set the ANDROID_NDK environment variable.")