Skip to content
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.

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

Add wrapper for acct(2) #952

Merged
merged 1 commit into from Oct 24, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -28,6 +28,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added support for `ptrace` on BSD operating systems ([#949](https://github.com/nix-rust/nix/pull/949))
- Added `ptrace` functions for reads and writes to tracee memory and ptrace kill
([#949](https://github.com/nix-rust/nix/pull/949))
- Added a `acct` wrapper module for enabling and disabling process accounting
([#952](https://github.com/nix-rust/nix/pull/952))

### Changed
- Increased required Rust version to 1.22.1/
Expand Down
25 changes: 25 additions & 0 deletions src/unistd.rs
Expand Up @@ -1508,6 +1508,31 @@ pub fn sleep(seconds: c_uint) -> c_uint {
unsafe { libc::sleep(seconds) }
}

pub mod acct {
use libc;
use {Result, NixPath};
use errno::Errno;
use std::ptr;

/// Enable process accounting
///
/// See also [acct(2)](https://linux.die.net/man/2/acct)
pub fn enable<P: ?Sized + NixPath>(filename: &P) -> Result<()> {
let res = try!(filename.with_nix_path(|cstr| {
unsafe { libc::acct(cstr.as_ptr()) }
}));

Errno::result(res).map(drop)
}

/// Disable process accounting
pub fn disable() -> Result<()> {
let res = unsafe { libc::acct(ptr::null()) };

Errno::result(res).map(drop)
}
}

/// Creates a regular file which persists even after process termination
///
/// * `template`: a path whose 6 rightmost characters must be X, e.g. `/tmp/tmpfile_XXXXXX`
Expand Down
27 changes: 24 additions & 3 deletions test/test_unistd.rs
Expand Up @@ -4,12 +4,13 @@ use nix::unistd::ForkResult::*;
use nix::sys::signal::{SaFlags, SigAction, SigHandler, SigSet, Signal, sigaction};
use nix::sys::wait::*;
use nix::sys::stat::{self, Mode, SFlag};
use std::{env, iter};
use std::{env, iter, thread, time};
use std::ffi::CString;
use std::fs::{self, File};
use std::fs::{self, File, metadata};
use std::io::Write;
use std::os::unix::prelude::*;
use tempfile::{self, tempfile};
use std::process::Command;
use tempfile::{self, tempfile, NamedTempFile};
use libc::{self, _exit, off_t};

#[test]
Expand Down Expand Up @@ -378,6 +379,26 @@ fn test_lseek64() {
close(tmpfd).unwrap();
}

// Skip on FreeBSD because FreeBSD's CI environment is jailed, and jails
// aren't allowed to use acct(2)
#[cfg(not(target_os = "freebsd"))]
#[test]
fn test_acct() {
skip_if_not_root!("test_acct");
jabedude marked this conversation as resolved.
Show resolved Hide resolved
let file = NamedTempFile::new().unwrap();
let path = file.path().to_str().unwrap();

acct::enable(path).unwrap();
Command::new("echo").arg("Hello world");
acct::disable().unwrap();

loop {
let len = metadata(path).unwrap().len();
if len > 0 { break; }
jabedude marked this conversation as resolved.
Show resolved Hide resolved
thread::sleep(time::Duration::from_millis(10));
}
}
jabedude marked this conversation as resolved.
Show resolved Hide resolved

#[test]
fn test_fpathconf_limited() {
let f = tempfile().unwrap();
Expand Down