tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/tools/procfs.rs: use libc::pid_t

Browse Source
This commit is contained in:
Dietmar Maurer
2019-04-04 08:05:43 +02:00
parent d3d7ab1273
commit 52ddc2522d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/procfs.rs
View File

@ -13,7 +13,7 @@ pub struct ProcFsPidStat {
pub rss: i64, pub rss: i64,
} }
pub fn read_proc_pid_stat(pid: nix::unistd::Pid) -> Result<ProcFsPidStat, Error> { pub fn read_proc_pid_stat(pid: libc::pid_t) -> Result<ProcFsPidStat, Error> {
let statstr = tools::file_read_firstline(format!("/proc/{}/stat", pid))?; let statstr = tools::file_read_firstline(format!("/proc/{}/stat", pid))?;
@ -22,7 +22,7 @@ pub fn read_proc_pid_stat(pid: nix::unistd::Pid) -> Result<ProcFsPidStat, Error>
} }
if let Some(cap) = REGEX.captures(&statstr) { if let Some(cap) = REGEX.captures(&statstr) {
if pid != nix::unistd::Pid::from_raw(cap["pid"].parse::<i32>().unwrap()) { if pid != cap["pid"].parse::<i32>().unwrap() {
bail!("unable to read pid stat for process '{}' - got wrong pid", pid); bail!("unable to read pid stat for process '{}' - got wrong pid", pid);
} }
@ -40,7 +40,7 @@ pub fn read_proc_pid_stat(pid: nix::unistd::Pid) -> Result<ProcFsPidStat, Error>
bail!("unable to read pid stat for process '{}'", pid); bail!("unable to read pid stat for process '{}'", pid);
} }
pub fn read_proc_starttime(pid: nix::unistd::Pid) -> Result<u64, Error> { pub fn read_proc_starttime(pid: libc::pid_t) -> Result<u64, Error> {
let info = read_proc_pid_stat(pid)?; let info = read_proc_pid_stat(pid)?;