Skip to content

Commit

Permalink
Merge branch 'master' into python_3_13
Browse files Browse the repository at this point in the history
  • Loading branch information
benfred committed Oct 30, 2024
2 parents 38a6a69 + 114e698 commit 7a384e9
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 119 deletions.
137 changes: 34 additions & 103 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ console = "0.15"
ctrlc = "3"
indicatif = "0.17"
env_logger = "0.10"
goblin = "0.7.1"
inferno = "0.11.17"
goblin = "0.9.2"
inferno = "0.11.21"
lazy_static = "1.4.0"
libc = "0.2"
log = "0.4"
lru = "0.10"
regex = ">=1.6.0"
tempfile = "3.6.0"
proc-maps = "0.3.2"
memmap = "0.7.0"
proc-maps = "0.4.0"
memmap2 = "0.9.4"
cpp_demangle = "0.4"
serde = {version="1.0", features=["rc"]}
serde_derive = "1.0"
serde_json = "1.0"
rand = "0.8"
rand_distr = "0.4"
remoteprocess = {version="0.4.12", features=["unwind"]}
remoteprocess = {version="0.5.0", features=["unwind"]}
chrono = "0.4.26"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/binary_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::path::Path;

use anyhow::Error;
use goblin::Object;
use memmap::Mmap;
use memmap2::Mmap;

pub struct BinaryInfo {
pub symbols: HashMap<String, u64>,
Expand Down
3 changes: 2 additions & 1 deletion src/coredump.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ impl PythonCoreDump {

// lets us figure out which thread has the GIL
let config = Config::default();
let threadstate_address = get_threadstate_address(&python_info, &version, &config)?;
let threadstate_address =
get_threadstate_address(interpreter_address, &python_info, &version, &config)?;
info!("found threadstate at 0x{:016x}", threadstate_address);

Ok(PythonCoreDump {
Expand Down
Loading

0 comments on commit 7a384e9

Please sign in to comment.