8000 Bug 1831094: Add a process reader and module reader for each platform by afranchuk · Pull Request #168 · rust-minidump/minidump-writer · GitHub
[go: up one dir, main page]

Skip to content
8000
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
1 change: 1 addition & 0 deletions Cargo.lock

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

11 changes: 9 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ license = "MIT"
bitflags = "2.10"
cfg-if = "1.0"
crash-context = "0.6"
error-graph = { version = "0.1.1", features = ["serde"] }
failspot = "0.2.0"
# goblin >= 0.10 uses scroll 0.13
goblin = "0.9.2"
log = "0.4"
# Type definitions and utilities for working with the Minidump format
minidump-common = "0.26"
Expand All @@ -24,8 +28,6 @@ thiserror = "2.0"

[target.'cfg(unix)'.dependencies]
libc = "0.2"
# goblin >= 0.10 uses scroll 0.13
goblin = "0.9"
memmap2 = "0.9"

[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
Expand All @@ -46,6 +48,11 @@ procfs-core = { version = "0.18", default-features = false, features = ["serde1"

[target.'cfg(target_os = "windows")'.dependencies]
bitflags = "2.4"
windows-sys = { version = ">=0.52", features = [
"Win32_Foundation",
"Win32_System_Diagnostics_Debug",
"Win32_System_ProcessStatus",
] }

[target.'cfg(target_os = "macos")'.dependencies]
# Binds some additional mac specifics not in libc, note that other dependents
Expand Down
10 changes: 5 additions & 5 deletions src/bin/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ mod linux {
}

fn test_copy_from_process(stack_var: usize, heap_var: usize) -> Result<()> {
use minidump_writer::mem_reader::MemReader;
use minidump_writer::process_reader::ProcessReader;

let ppid = getppid().as_raw();
let dumper = fail_on_soft_error!(
Expand All @@ -91,7 +91,7 @@ mod linux {
let expected_stack = 0x11223344usize.to_ne_bytes();
let expected_heap = 0x55667788usize.to_ne_bytes();

let validate = |reader: &mut MemReader| -> Result<()> {
let validate = |reader: &mut ProcessReader| -> Result<()> {
let mut val = [0u8; std::mem::size_of::<usize>()];
let read = reader.read(stack_var, &mut val)?;
assert_eq!(read, val.len());
Expand All @@ -106,22 +106,22 @@ mod linux {

// virtual mem
{
let mut mr = MemReader::for_virtual_mem(ppid);
let mut mr = ProcessReader::for_virtual_mem(ppid);
validate(&mut mr)
.map_err(|err| format!("failed to validate memory for {mr:?}: {err}"))?;
}

// file
{
let mut mr = MemReader::for_file(ppid)
let mut mr = ProcessReader::for_file(ppid)
.map_err(|err| format!("failed to open `/proc/{ppid}/mem`: {err}"))?;
validate(&mut mr)
.map_err(|err| format!("failed to validate memory for {mr:?}: {err}"))?;
}

// ptrace
{
let mut mr = MemReader::for_ptrace(ppid);
let mut mr = ProcessReader::for_ptrace(ppid);
validate(&mut mr)
.map_err(|err| format!("failed to validate memory for {mr:?}: {err}"))?;
}
Expand Down
2 changes: 2 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ pub mod dir_section;
pub mod mem_writer;
pub mod minidump_cpu;
pub mod minidump_format;
pub mod module_reader;
pub mod process_reader;

mod serializers;
4 changes: 2 additions & 2 deletions src/linux/android.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::{
Pid, maps_reader::MappingInfo, mem_reader::CopyFromProcessError,
minidump_writer::MinidumpWriter,
Pid, maps_reader::MappingInfo, minidump_writer::MinidumpWriter,
process_reader::CopyFromProcessError,
},
goblin::elf,
};
Expand Down
2 changes: 1 addition & 1 deletion src/linux/dso_debug.rs