diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c3d3bfb1..4351921d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -215,7 +215,7 @@ jobs: run: | cargo install grcov rustup component add llvm-tools-preview - python ./resources/coverage/run_coverage.py --require-percent 60 --test-args="--features=profiling" + python ./resources/coverage/run_coverage.py --require-percent 60 --test-args="--features=" - name: Build alpine wheel via docker if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.python, '3.8') diff --git a/Cargo.lock b/Cargo.lock index 20aa4d73..d958e62e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,15 +660,6 @@ dependencies = [ "str_stack", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "is-terminal" version = "0.4.12" @@ -996,17 +987,6 @@ dependencies = [ "group", ] -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -1014,21 +994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -1074,9 +1040,9 @@ dependencies = [ [[package]] name = "pprof" -version = "0.13.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb" +checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" dependencies = [ "backtrace", "cfg-if", @@ -1086,7 +1052,7 @@ dependencies = [ "log", "nix", "once_cell", - "parking_lot 0.12.3", + "parking_lot", "smallvec", "symbolic-demangle", "tempfile", @@ -1146,7 +1112,7 @@ dependencies = [ "indoc 2.0.4", "libc", "memoffset", - "parking_lot 0.11.2", + "parking_lot", "pyo3-build-config 0.20.2", "pyo3-ffi", "pyo3-macros", @@ -1269,15 +1235,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.3.5" diff --git a/Cargo.toml b/Cargo.toml index 4ce38186..d6afb091 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ rand = "0.8.5" rand_chacha = "0.3.1" [dependencies.pprof] -version = "0.23.0" +version = "0.12" features = ["flamegraph"] optional = true diff --git a/src/classic/clvm_tools/cmds.rs b/src/classic/clvm_tools/cmds.rs index 8d821b14..b9bf8afc 100644 --- a/src/classic/clvm_tools/cmds.rs +++ b/src/classic/clvm_tools/cmds.rs @@ -36,8 +36,6 @@ use crate::classic::clvm_tools::debug::{ trace_to_text, }; use crate::classic::clvm_tools::ir::reader::read_ir; -#[cfg(feature = "profiling")] -use crate::classic::clvm_tools::profiling::Profiler; use crate::classic::clvm_tools::sha256tree::sha256tree; use crate::classic::clvm_tools::stages; use crate::classic::clvm_tools::stages::stage_0::{ @@ -1078,13 +1076,6 @@ pub fn launch_tool(stdout: &mut Stream, args: &[String], tool_name: &str, defaul .set_type(Rc::new(OperatorsVersion {})) .set_default(ArgumentValue::ArgInt(OPERATORS_LATEST_VERSION as i64)), ); - #[cfg(feature = "profiling")] - parser.add_argument( - vec!["--profiling".to_string()], - Argument::new() - .set_action(TArgOptionAction::StoreTrue) - .set_help("Run with profiling".to_string()), - ); if tool_name == "run" { parser.add_argument( @@ -1112,16 +1103,6 @@ pub fn launch_tool(stdout: &mut Stream, args: &[String], tool_name: &str, defaul return; } - #[cfg(feature = "profiling")] - let _profiler = if matches!( - parsed_args.get("profiling"), - Some(ArgumentValue::ArgBool(true)) - ) { - Some(Profiler::new("prof.svc")) - } else { - None - }; - let empty_map = HashMap::new(); let keywords = match parsed_args.get("no_keywords") { Some(ArgumentValue::ArgBool(_b)) => &empty_map, diff --git a/src/classic/clvm_tools/mod.rs b/src/classic/clvm_tools/mod.rs index ed006955..a5bd8846 100644 --- a/src/classic/clvm_tools/mod.rs +++ b/src/classic/clvm_tools/mod.rs @@ -6,6 +6,5 @@ pub mod debug; pub mod ir; pub mod node_path; pub mod pattern_match; -mod profiling; pub mod sha256tree; pub mod stages;