8000 pmap: implemented `--range` option by estodi · Pull Request #461 · uutils/procps · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

pmap: implemented --range option #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+261 −54
Open

pmap: implemented --range option #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b535de3
pmap: implemented range option
estodi Jul 7, 2025
8dbe00f
pmap: added tests for range option
estodi Jul 8, 2025
6837565
fixed lint errors
estodi Jul 8, 2025
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
91 changes: 91 additions & 0 deletions src/uu/pmap/src/maps_format_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ impl Address {
pub fn zero_pad(&self) -> String {
format!("{:0>16}", self.start)
}

// Checks whether an entry's address range overlaps the limits specified by the range option.
// Note: Even if a reversed range (high < low) is given, an entry still hits
// only if the specified range lies entirely within the entry's address range.
pub fn is_within_range(&self, pmap_config: &PmapConfig) -> bool {
pmap_config.range_low < self.high && self.low <= pmap_config.range_high
}
}

// Represents a set of permissions from the "perms" column of /proc/<PID>/maps.
Expand Down Expand Up @@ -341,6 +348,90 @@ mod test {
assert!(parse_address("ffffffffff600000-zfffffffff601000").is_err());
}

fn limit_address_range_and_assert(address: &Address, low: u64, high: u64, expected: bool) {
let mut pmap_config = PmapConfig::default();
(pmap_config.range_low, pmap_config.range_high) = (low, high);
assert_eq!(
address.is_within_range(&pmap_config),
expected,
"`--range 0x{low:x},0x{high:x}` expected to be {expected} for address 0x{:x},0x{:x}",
address.low,
address.high,
);
}

#[test]
fn test_limit_address_range() {
let low: u64 = 0x71af50000000;
let high: u64 = 0x71af50021000;
let address = Address {
start: "0x71af50000000".to_string(),
low,
high,
};

limit_address_range_and_assert(&address, 0x0, u64::MAX, true);
limit_address_range_and_assert(&address, 0x70000000, 0xffffffffffff, true);

limit_address_range_and_assert(&address, 0x0, 0x0, false);
limit_address_range_and_assert(&address, 0x0, 0x70000000, false);
limit_address_range_and_assert(&address, 0x0, low - 1, false);
limit_address_range_and_assert(&address, low - 1, low - 1, false);

limit_address_range_and_assert(&address, 0x0, low + 0, true);
limit_address_range_and_assert(&address, low - 1, low + 0, true);
limit_address_range_and_assert(&address, low + 0, low + 0, true);

limit_address_range_and_assert(&address, low - 1, high - 1, true);
limit_address_range_and_assert(&address, low - 1, high + 0, true);
limit_address_range_and_assert(&address, low - 1, high + 1, true);
limit_address_range_and_assert(&address, low + 0, high - 1, true);
limit_address_range_and_assert(&address, low + 0, high + 0, true);
limit_address_range_and_assert(&address, low + 0, high + 1, true);
limit_address_range_and_assert(&address, low + 1, high - 1, true);
limit_address_range_and_assert(&address, low + 1, high + 0, true);
limit_address_range_and_assert(&address, low + 1, high + 1, true);

limit_address_range_and_assert(&address, high - 1, high - 1, true);
limit_address_range_and_assert(&address, high - 1, high + 0, true);
limit_address_range_and_assert(&address, high - 1, u64::MAX, true);

limit_address_range_and_assert(&address, high + 0, high + 0, false);
limit_address_range_and_assert(&address, high + 0, high + 1, false);
limit_address_range_and_assert(&address, high + 0, u64::MAX, false);
limit_address_range_and_assert(&address, 0xffffffffffff, u64::MAX, false);
limit_address_range_and_assert(&address, u64::MAX, u64::MAX, false);

// Reversed range

limit_address_range_and_assert(&address, u64::MAX, 0, false);
limit_address_range_and_assert(&address, 0xffffffffffff, 0x70000000, false);

limit_address_range_and_assert(&address, 0x70000000, 0x0, false);
limit_address_range_and_assert(&address, low - 1, 0x0, false);
limit_address_range_and_assert(&address, low - 1, low - 1, false);

limit_address_range_and_assert(&address, low + 0, 0x0, false);
limit_address_range_and_assert(&address, low + 0, low - 1, false);

limit_address_range_and_assert(&address, high - 1, low - 1, false);
limit_address_range_and_assert(&address, high + 0, low - 1, false);
limit_address_range_and_assert(&address, high + 1, low - 1, false);
limit_address_range_and_assert(&address, high - 1, low + 0, true); // true
limit_address_range_and_assert(&address, high + 0, low + 0, false);
limit_address_range_and_assert(&address, high + 1, low + 0, false);
limit_address_range_and_assert(&address, high - 1, low + 1, true); // true
limit_address_range_and_assert(&address, high + 0, low + 1, false);
limit_address_range_and_assert(&address, high + 1, low + 1, false);

limit_address_range_and_assert(&address, high + 0, high - 1, false);
limit_address_range_and_assert(&address, u64::MAX, high - 1, false);

limit_address_range_and_assert(&address, high + 1, high + 0, false);
limit_address_range_and_assert(&address, u64::MAX, high + 0, false);
limit_address_range_and_assert(&address, u64::MAX, 0xffffffffffff, false);
}

#[test]
fn test_parse_device() {
assert_eq!("12:34", parse_device("12:34").unwrap().to_string());
Expand Down
133 changes: 91 additions & 42 deletions src/uu/pmap/src/pmap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use pmap_config::{create_rc, pmap_field_name, PmapConfig};
use smaps_format_parser::{parse_smaps, SmapTable};
use std::env;
use std::fs;
use std::io::Error;
use uucore::error::{set_exit_code, UResult};
use std::io::{Error, ErrorKind};
use uucore::error::{set_exit_code, UResult, USimpleError};
use uucore::{format_usage, help_about, help_usage};

mod maps_format_parser;
Expand Down Expand Up @@ -98,8 +98,45 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {

// Options independent with field selection:
pmap_config.quiet = matches.get_flag(options::QUIET);
if matches.get_flag(options::SHOW_PATH) {
pmap_config.show_path = true;
pmap_config.show_path = matches.get_flag(options::SHOW_PATH);

if let Some(range) = matches.get_one::<String>(options::RANGE) {
match range.matches(',').count() {
0 => {
let address = u64::from_str_radix(range, 16).map_err(|_| {
USimpleError::new(1, format!("failed to parse argument: '{range}'"))
})?;
pmap_config.range_low = address;
pmap_config.range_high = address;
}
1 => {
let (low, high) = range
.split_once(',')
.ok_or_else(|| Error::from(ErrorKind::InvalidData))?;
pmap_config.range_low = if low.is_empty() {
0
} else {
u64::from_str_radix(low, 16).map_err(|_| {
USimpleError::new(1, format!("failed to parse argument: '{range}'"))
})?
};
pmap_config.range_high = if high.is_empty() {
u64::MAX
} else {
u64::from_str_radix(high, 16).map_err(|_| {
USimpleError::new(1, format!("failed to parse argument: '{range}'"))
})?
};
}
_ => {
eprintln!("pmap: failed to parse argument: '{range}'");
set_exit_code(1);
return Ok(());
}
}
} else {
pmap_config.range_low = 0;
pmap_config.range_high = u64::MAX;
}

let pids = matches
Expand Down Expand Up @@ -182,14 +219,16 @@ fn output_default_format(pid: &str, pmap_config: &PmapConfig) -> Result<(), Erro
let mut total = 0;

process_maps(pid, None, |map_line| {
println!(
"{} {:>6}K {} {}",
map_line.address.zero_pad(),
map_line.size_in_kb,
map_line.perms.mode(),
map_line.parse_mapping(pmap_config)
);
total += map_line.size_in_kb;
if map_line.address.is_within_range(pmap_config) {
println!(
"{} {:>6}K {} {}",
map_line.address.zero_pad(),
map_line.size_in_kb,
map_line.perms.mode(),
map_line.parse_mapping(pmap_config)
);
total += map_line.size_in_kb;
}
})?;

if !pmap_config.quiet {
Expand All @@ -206,25 +245,31 @@ fn output_extended_format(pid: &str, pmap_config: &PmapConfig) -> Result<(), Err
println!("Address 8000 Kbytes RSS Dirty Mode Mapping");
}

let mut total_size_in_kb = 0;
let mut total_rss_in_kb = 0;
let mut total_dirty_in_kb = 0;

for smap_entry in smap_table.entries {
println!(
"{} {:>7} {:>7} {:>7} {} {}",
smap_entry.map_line.address.zero_pad(),
smap_entry.map_line.size_in_kb,
smap_entry.rss_in_kb,
smap_entry.shared_dirty_in_kb + smap_entry.private_dirty_in_kb,
smap_entry.map_line.perms.mode(),
smap_entry.map_line.parse_mapping(pmap_config)
);
if smap_entry.map_line.address.is_within_range(pmap_config) {
println!(
"{} {:>7} {:>7} {:>7} {} {}",
smap_entry.map_line.address.zero_pad(),
smap_entry.map_line.size_in_kb,
smap_entry.rss_in_kb,
smap_entry.shared_dirty_in_kb + smap_entry.private_dirty_in_kb,
smap_entry.map_line.perms.mode(),
smap_entry.map_line.parse_mapping(pmap_config)
);
total_size_in_kb += smap_entry.map_line.size_in_kb;
total_rss_in_kb += smap_entry.rss_in_kb;
total_dirty_in_kb += smap_entry.shared_dirty_in_kb + smap_entry.private_dirty_in_kb;
}
}

if !pmap_config.quiet {
println!("---------------- ------- ------- ------- ");
println!(
"total kB {:>7} {:>7} {:>7}",
smap_table.info.total_size_in_kb,
smap_table.info.total_rss_in_kb,
smap_table.info.total_shared_dirty_in_kb + smap_table.info.total_private_dirty_in_kb,
"total kB {total_size_in_kb:>7} {total_rss_in_kb:>7} {total_dirty_in_kb:>7}"
);
}

Expand Down Expand Up @@ -360,23 +405,25 @@ fn output_device_format(pid: &str, pmap_config: &PmapConfig) -> Result<(), Error
None
},
|map_line| {
println!(
"{} {:>7} {} {:0>16} {} {}",
map_line.address.zero_pad(),
map_line.size_in_kb,
map_line.perms.mode(),
map_line.offset,
map_line.device.device(),
map_line.parse_mapping(pmap_config)
);
total_mapped += map_line.size_in_kb;
if map_line.address.is_within_range(pmap_config) {
println!(
"{} {:>7} {} {:0>16} {} {}",
map_line.address.zero_pad(),
map_line.size_in_kb,
map_line.perms.mode(),
map_line.offset,
map_line.device.device(),
map_line.parse_mapping(pmap_config)
);
total_mapped += map_line.size_in_kb;

if map_line.perms.writable && !map_line.perms.shared {
total_writeable_private += map_line.size_in_kb;
}
if map_line.perms.writable && !map_line.perms.shared {
total_writeable_private += map_line.size_in_kb;
}

if map_line.perms.shared {
total_shared += map_line.size_in_kb;
if map_line.perms.shared {
total_shared += map_line.size_in_kb;
}
}
},
)?;
Expand Down Expand Up @@ -547,7 +594,9 @@ pub fn uu_app() -> Command {
Arg::new(options::RANGE)
.short('A')
.long("range")
.num_args(1..=2)
.help("limit results to the given range"),
.num_args(1)
.help("limit results to the given range < 9E81 ;low>[,<high>]"),
// This option applies only to the default, extended, or device formats,
// yet it will not raise an error in any other case.
)
}
2 changes: 2 additions & 0 deletions src/uu/pmap/src/pmap_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ pub struct PmapConfig {
// Misc
pub quiet: bool,
pub custom_format_enabled: bool,
pub range_low: u64,
pub range_high: u64,
}

impl PmapConfig {
Expand Down
Loading
Loading
0