NotAShelf/pscand
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scanner: make plugin interface ffi-safe with handle-based registry

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I8e4790db3cc29f84f4e0d7d8eff36c2c6a6a6964
This commit is contained in:
raf 2026-02-18 22:49:12 +03:00
commit f4961c7f95
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
9 changed files with 93 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scanners/scanner-power/src/lib.rs
View file

@ -1,4 +1,3 @@
#![allow(improper_ctypes)]
use pscand_core::helpers::PowerHelper;
use pscand_core::scanner::{MetricValue, Scanner};
use std::collections::HashMap;
@ -6,9 +5,9 @@ use std::time::Duration;
struct PowerScanner;
#[unsafe(no_mangle)]
pub extern "C" fn pscand_scanner() -> Box<dyn Scanner> {
Box::new(PowerScanner)
#[no_mangle]
pub extern "C" fn pscand_scanner() -> *mut std::os::raw::c_void {
Box::into_raw(Box::new(PowerScanner)) as *mut std::os::raw::c_void
}
impl Default for PowerScanner {
@ -52,7 +51,7 @@ impl Scanner for PowerScanner {
);
metrics.insert(
"battery_status".to_string(),
MetricValue::from_str(&battery.status),
MetricValue::from_string(&battery.status),
);
}
@ -61,7 +60,7 @@ impl Scanner for PowerScanner {
if let Some(status) = info.get("status") {
metrics.insert(
format!("supply_{}_status", name),
MetricValue::from_str(status),
MetricValue::from_string(status),
);
}
if let Some(online) = info.get("online") {
@ -82,7 +81,10 @@ impl Scanner for PowerScanner {
}
if let Ok(state) = PowerHelper::suspend_state() {
metrics.insert("suspend_state".to_string(), MetricValue::from_str(&state));
metrics.insert(
"suspend_state".to_string(),
MetricValue::from_string(&state),
);
}
Ok(metrics)