SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplification for netbsd-specific code (#750)

Browse Source 
the cpuset api is already present in libc...
This commit is contained in:
David CARLIER 2022-08-29 12:28:04 +01:00 committed by GitHub
parent 7257631ed5
commit 556bdc828c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libafl/src/bolts/core_affinity.rs
View File

@ -716,18 +716,14 @@ mod netbsd {
use alloc::vec::Vec; use alloc::vec::Vec;
use std::thread::available_parallelism; use std::thread::available_parallelism;
use libc::{_cpuset, pthread_self, pthread_setaffinity_np}; use libc::{
_cpuset, _cpuset_create, _cpuset_destroy, _cpuset_set, _cpuset_size, pthread_self,
pthread_setaffinity_np,
};
use super::CoreId; use super::CoreId;
use crate::Error; use crate::Error;
extern "C" {
fn _cpuset_create() -> *mut _cpuset;
fn _cpuset_destroy(c: *mut _cpuset);
fn _cpuset_set(i: usize, c: *mut _cpuset) -> i32;
fn _cpuset_size(c: *const _cpuset) -> usize;
}
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
pub fn get_core_ids() -> Result<Vec<CoreId>, Error> { pub fn get_core_ids() -> Result<Vec<CoreId>, Error> {
Ok((0..(usize::from(available_parallelism()?))) Ok((0..(usize::from(available_parallelism()?)))
@ -739,7 +735,7 @@ mod netbsd {
pub fn set_for_current(core_id: CoreId) -> Result<(), Error> { pub fn set_for_current(core_id: CoreId) -> Result<(), Error> {
let set = new_cpuset(); let set = new_cpuset();
unsafe { _cpuset_set(core_id.id, set) }; unsafe { _cpuset_set(core_id.id as u64, set) };
// Set the current thread's core affinity. // Set the current thread's core affinity.
let result = unsafe { let result = unsafe {
pthread_setaffinity_np( pthread_setaffinity_np(