Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "crates/instrument-hooks-bindings/instrument-hooks"]
path = crates/instrument-hooks-bindings/instrument-hooks
url = https://github.com/CodSpeedHQ/instrument-hooks.git
[submodule "crates/samply-codspeed"]
path = crates/samply-codspeed
url = https://github.com/CodSpeedHQ/samply-codspeed.git
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ repos:
rev: v1.0
hooks:
- id: fmt
args: [--all, --]
args: [--]
pass_filenames: false
- id: clippy
args: [--all-targets, --, -D, warnings]
- repo: https://github.com/cpp-linter/cpp-linter-hooks
Expand Down
55 changes: 17 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ rmp-serde = "1.3.1"
uuid = { version = "1.23.1", features = ["v4"] }
which = "8.0.2"
crc32fast = "1.5.0"
samply = { git = "https://github.com/CodSpeedHQ/samply-codspeed", rev = "81ba2c346e71" }
samply = { path = "crates/samply-codspeed/samply" }

# Memory profiling (memtrack) and the capability handling around it are Linux-only.
[target.'cfg(target_os = "linux")'.dependencies]
Expand Down Expand Up @@ -96,6 +96,7 @@ members = [
"crates/exec-harness",
"crates/instrument-hooks-bindings",
]
exclude = ["crates/samply-codspeed"]

[workspace.dependencies]
anyhow = "1.0"
Expand All @@ -106,7 +107,7 @@ serde_json = "1.0"
serde = { version = "1.0.228", features = ["derive"] }
ipc-channel = "0.20"
itertools = "0.14.0"
linux-perf-event-reader = "0.10.2" # matches the version linux-perf-data resolves to
linux-perf-event-reader = "0.10.2" # matches the version linux-perf-data resolves to
env_logger = "0.11.10"
tempfile = "3.27.0"
object = { version = "0.39", default-features = false, features = ["read_core", "elf"] }
Expand Down
1 change: 1 addition & 0 deletions crates/samply-codspeed
Submodule samply-codspeed added at 81ba2c
105 changes: 0 additions & 105 deletions scripts/samply-dev.sh

This file was deleted.