Skip to content

Don't make vectors of program arguments in Run() #1

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

Merged
elbiazo merged 2 commits into from
Jan 12, 2023
Merged

Don't make vectors of program arguments in Run() #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f98f085
tmp
tokatoka Jan 9, 2023
60cedee
Merge branch 'main' into upd
andreafioraldi Jan 10, 2023
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
32 changes: 17 additions & 15 deletions src/tinyinst.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,16 @@ impl litecov::Coverage {

pub struct TinyInst {
tinyinst_ptr: UniquePtr<litecov::TinyInstInstrumentation>,
program_args: Vec<String>,
program_args_cstr: Vec<CString>,
program_args_ptr: Vec<*mut c_char>,
coverage_ptr: UniquePtr<litecov::Coverage>,
timeout: u32,
}

impl Debug for TinyInst {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
f.debug_struct("TinyInst")
.field("program_args", &self.program_args)
.field("program_args_cstr", &self.program_args_cstr)
.field("timeout", &self.timeout)
.finish_non_exhaustive()
}
Expand Down Expand Up @@ -162,17 +163,7 @@ impl TinyInst {
tinyinst_args_ptr.as_mut_ptr(),
);

TinyInst {
tinyinst_ptr,
program_args: program_args.to_vec(),
timeout,
coverage_ptr: litecov::Coverage::new(),
}
}

pub unsafe fn run(&mut self) -> litecov::RunResult {
let program_args_cstr: Vec<CString> = self
.program_args
let program_args_cstr: Vec<CString> = program_args
.iter()
.map(|arg| CString::new(arg.as_str()).unwrap())
.collect();
Expand All @@ -182,9 +173,20 @@ impl TinyInst {
.map(|arg| arg.as_ptr() as *mut c_char)
.collect();
program_args_ptr.push(core::ptr::null_mut());

TinyInst {
tinyinst_ptr,
program_args_cstr,
program_args_ptr,
timeout,
coverage_ptr: litecov::Coverage::new(),
}
}

pub unsafe fn run(&mut self) -> litecov::RunResult {
self.tinyinst_ptr.pin_mut().Run(
i32::try_from(self.program_args.len()).unwrap(),
program_args_ptr.as_mut_ptr(),
i32::try_from(self.program_args_cstr.len()).unwrap(),
self.program_args_ptr.as_mut_ptr(),
self.timeout,
self.timeout,
)
Expand Down