implemented generic linux sal with heuristics

src/sal/heuristic/discovery.rs

@@ -0,0 +1,185 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+use std::time::Duration;
+use std::thread;
+use std::sync::mpsc;
+use crate::sal::heuristic::schema::{SensorDiscovery, ActuatorDiscovery, Conflict};
+use tracing::{debug, warn};
+
+/// Strongly-typed findings about the current system.
+#[derive(Debug, Clone, Default)]
+pub struct SystemFactSheet {
+    pub vendor: String,
+    pub model: String,
+    pub temp_path: Option<PathBuf>,
+    pub fan_paths: Vec<PathBuf>,
+    pub rapl_paths: Vec<PathBuf>,
+    pub active_conflicts: Vec<String>, // List of conflict IDs found active
+}
+
+/// Probes the system for hardware sensors, actuators, and service conflicts.
+pub fn discover_facts(
+    sensors: &SensorDiscovery, 
+    actuators: &ActuatorDiscovery,
+    conflicts: &[Conflict]
+) -> SystemFactSheet {
+    let (vendor, model) = read_dmi_info();
+    
+    debug!("DMI Identity: Vendor='{}', Model='{}'", vendor, model);
+
+    let (temp_path, fan_paths) = discover_hwmon(sensors);
+    let rapl_paths = discover_rapl(actuators);
+    
+    let mut active_conflicts = Vec::new();
+    for conflict in conflicts {
+        for service in &conflict.services {
+            if is_service_active(service) {
+                debug!("Detected active conflict: {} (Service: {})", conflict.id, service);
+                active_conflicts.push(conflict.id.clone());
+                break; // Found one service in this conflict, move to next conflict
+            }
+        }
+    }
+
+    SystemFactSheet {
+        vendor,
+        model,
+        temp_path,
+        fan_paths,
+        rapl_paths,
+        active_conflicts,
+    }
+}
+
+/// Reads DMI information from sysfs with a safety timeout.
+fn read_dmi_info() -> (String, String) {
+    let vendor = read_sysfs_with_timeout(Path::new("/sys/class/dmi/id/sys_vendor"), Duration::from_millis(100))
+        .unwrap_or_else(|| "Unknown".to_string());
+    let model = read_sysfs_with_timeout(Path::new("/sys/class/dmi/id/product_name"), Duration::from_millis(100))
+        .unwrap_or_else(|| "Unknown".to_string());
+    (vendor, model)
+}
+
+/// Discovers hwmon sensors by matching labels and prioritizing drivers.
+fn discover_hwmon(cfg: &SensorDiscovery) -> (Option<PathBuf>, Vec<PathBuf>) {
+    let mut temp_candidates = Vec::new();
+    let mut fan_candidates = Vec::new();
+
+    let hwmon_base = Path::new("/sys/class/hwmon");
+    let entries = match fs::read_dir(hwmon_base) {
+        Ok(e) => e,
+        Err(e) => {
+            warn!("Could not read /sys/class/hwmon: {}", e);
+            return (None, Vec::new());
+        }
+    };
+
+    for entry in entries.flatten() {
+        let hwmon_path = entry.path();
+        
+        let driver_name = read_sysfs_with_timeout(&hwmon_path.join("name"), Duration::from_millis(100))
+            .unwrap_or_default();
+
+        let priority = cfg.hwmon_priority
+            .iter()
+            .position(|p| p == &driver_name)
+            .unwrap_or(usize::MAX);
+
+        if let Ok(hw_entries) = fs::read_dir(&hwmon_path) {
+            for hw_entry in hw_entries.flatten() {
+                let file_name = hw_entry.file_name().into_string().unwrap_or_default();
+                
+                // Temperature Sensors
+                if file_name.starts_with("temp") && file_name.ends_with("_label") {
+                    if let Some(label) = read_sysfs_with_timeout(&hw_entry.path(), Duration::from_millis(100)) {
+                        if cfg.temp_labels.iter().any(|l| label.contains(l)) {
+                            let input_path = hwmon_path.join(file_name.replace("_label", "_input"));
+                            if input_path.exists() {
+                                temp_candidates.push((priority, input_path));
+                            }
+                        }
+                    }
+                }
+
+                // Fan Sensors
+                if file_name.starts_with("fan") && file_name.ends_with("_label") {
+                    if let Some(label) = read_sysfs_with_timeout(&hw_entry.path(), Duration::from_millis(100)) {
+                        if cfg.fan_labels.iter().any(|l| label.contains(l)) {
+                            let input_path = hwmon_path.join(file_name.replace("_label", "_input"));
+                            if input_path.exists() {
+                                fan_candidates.push((priority, input_path));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    temp_candidates.sort_by_key(|(p, _)| *p);
+    fan_candidates.sort_by_key(|(p, _)| *p);
+
+    let best_temp = temp_candidates.first().map(|(_, p)| p.clone());
+    let best_fans = fan_candidates.into_iter().map(|(_, p)| p).collect();
+
+    (best_temp, best_fans)
+}
+
+/// Discovers RAPL powercap paths.
+fn discover_rapl(cfg: &ActuatorDiscovery) -> Vec<PathBuf> {
+    let mut paths = Vec::new();
+    let powercap_base = Path::new("/sys/class/powercap");
+    
+    let entries = match fs::read_dir(powercap_base) {
+        Ok(e) => e,
+        Err(_) => return Vec::new(),
+    };
+
+    for entry in entries.flatten() {
+        let path = entry.path();
+        let dir_name = entry.file_name().into_string().unwrap_or_default();
+        
+        if cfg.rapl_paths.contains(&dir_name) {
+            paths.push(path);
+            continue;
+        }
+
+        if let Some(name) = read_sysfs_with_timeout(&path.join("name"), Duration::from_millis(100)) {
+            if cfg.rapl_paths.iter().any(|p| p == &name) {
+                paths.push(path);
+            }
+        }
+    }
+    paths
+}
+
+/// Checks if a systemd service is currently active.
+pub fn is_service_active(service: &str) -> bool {
+    let status = Command::new("systemctl")
+        .arg("is-active")
+        .arg("--quiet")
+        .arg(service)
+        .status();
+
+    match status {
+        Ok(s) => s.success(),
+        Err(_) => false,
+    }
+}
+
+/// Helper to read a sysfs file with a timeout.
+fn read_sysfs_with_timeout(path: &Path, timeout: Duration) -> Option<String> {
+    let (tx, rx) = mpsc::channel();
+    let path_buf = path.to_path_buf();
+    
+    thread::spawn(move || {
+        let res = fs::read_to_string(path_buf).map(|s| s.trim().to_string());
+        let _ = tx.send(res);
+    });
+
+    match rx.recv_timeout(timeout) {
+        Ok(Ok(content)) => Some(content),
+        _ => None,
+    }
+}

src/sal/heuristic/engine.rs

@@ -0,0 +1,60 @@
+use miette::{Result, IntoDiagnostic, Context};
+use std::fs;
+use regex::Regex;
+use tracing::{info, debug};
+
+use crate::sal::traits::PlatformSal;
+use crate::sal::dell_xps_9380::DellXps9380Sal;
+use crate::sal::generic_linux::GenericLinuxSal;
+use crate::sal::heuristic::schema::HardwareDb;
+use crate::sal::heuristic::discovery::{discover_facts};
+
+pub struct HeuristicEngine;
+
+impl HeuristicEngine {
+    /// Loads the hardware database, probes the system, and builds the appropriate SAL.
+    pub fn detect_and_build() -> Result<Box<dyn PlatformSal>> {
+        // 1. Load Hardware DB
+        let db_path = "assets/hardware_db.toml";
+        let db_content = fs::read_to_string(db_path)
+            .into_diagnostic()
+            .with_context(|| format!("Failed to read hardware database at {}", db_path))?;
+        let db: HardwareDb = toml::from_str(&db_content)
+            .into_diagnostic()
+            .context("Failed to parse hardware_db.toml")?;
+
+        // 2. Discover Facts
+        let facts = discover_facts(&db.discovery.sensors, &db.discovery.actuators, &db.conflicts);
+        info!("System Identity: {} {}", facts.vendor, facts.model);
+
+        // 3. Routing Logic
+        
+        // --- Special Case: Dell XPS 13 9380 ---
+        if is_match(&facts.vendor, "(?i)Dell.*") && is_match(&facts.model, "(?i)XPS.*13.*9380.*") {
+            info!("Specialized SAL Match Found: Dell XPS 13 9380");
+            let sal = DellXps9380Sal::init().map_err(|e| miette::miette!(e))?;
+            return Ok(Box::new(sal));
+        }
+
+        // --- Fallback: Generic Linux SAL ---
+        debug!("No specialized SAL match. Falling back to GenericLinuxSal with DB quirks.");
+        
+        // Validation: Ensure we found at least a temperature sensor if required
+        if facts.temp_path.is_none() {
+            return Err(miette::miette!("No temperature sensor discovered. Generic fallback impossible."));
+        }
+        if facts.rapl_paths.is_empty() {
+            return Err(miette::miette!("No RAPL power interface discovered. Generic fallback impossible."));
+        }
+
+        Ok(Box::new(GenericLinuxSal::new(facts, db)))
+    }
+}
+
+fn is_match(input: &str, pattern: &str) -> bool {
+    if let Ok(re) = Regex::new(pattern) {
+        re.is_match(input)
+    } else {
+        false
+    }
+}

src/sal/heuristic/mod.rs

@@ -0,0 +1,3 @@
+pub mod schema;
+pub mod discovery;
+pub mod engine;

src/sal/heuristic/schema.rs

@@ -0,0 +1,90 @@
+use serde::Deserialize;
+use std::collections::HashMap;
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct HardwareDb {
+    pub metadata: Metadata,
+    pub conflicts: Vec<Conflict>,
+    pub ecosystems: HashMap<String, Ecosystem>,
+    pub quirks: Vec<Quirk>,
+    pub discovery: Discovery,
+    pub preflight_checks: Vec<PreflightCheck>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Metadata {
+    pub version: String,
+    pub updated: String,
+    pub description: String,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Conflict {
+    pub id: String,
+    pub services: Vec<String>,
+    pub contention: String,
+    pub severity: String,
+    pub fix_action: String,
+    pub help_text: String,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Ecosystem {
+    pub vendor_regex: String,
+    pub polling_cap_ms: Option<u64>,
+    pub drivers: Option<Vec<String>>,
+    pub fan_manual_mode_cmd: Option<String>,
+    pub fan_auto_mode_cmd: Option<String>,
+    pub safety_register: Option<String>,
+    pub lap_mode_path: Option<String>,
+    pub profiles_path: Option<String>,
+    pub ec_write_required: Option<bool>,
+    pub thermal_policy_path: Option<String>,
+    pub policy_map: Option<HashMap<String, i32>>,
+    pub msr_lock_register: Option<String>,
+    pub msr_lock_bit: Option<u32>,
+    pub fan_boost_path: Option<String>,
+    pub ec_tool: Option<String>,
+    pub optimization: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Quirk {
+    pub model_regex: String,
+    pub id: String,
+    pub issue: String,
+    pub action: String,
+    pub monitor_msr: Option<String>,
+    pub reset_bit: Option<u32>,
+    pub trigger_path: Option<String>,
+    pub trigger_value: Option<String>,
+    pub target_path: Option<String>,
+    pub format: Option<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Discovery {
+    pub sensors: SensorDiscovery,
+    pub actuators: ActuatorDiscovery,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct SensorDiscovery {
+    pub temp_labels: Vec<String>,
+    pub fan_labels: Vec<String>,
+    pub hwmon_priority: Vec<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct ActuatorDiscovery {
+    pub rapl_paths: Vec<String>,
+    pub amd_energy_paths: Vec<String>,
+    pub governor_files: Vec<String>,
+}
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct PreflightCheck {
+    pub name: String,
+    pub check_cmd: String,
+    pub fail_help: String,
+}