Made Env Vars modifyable during runtime

Author: jounathaen

src/arch/x86_64/kernel/mmio.rs

@@ -132,7 +132,7 @@ fn detect_device(phys_addr: usize) -> Option<VolatileRef<'static, DeviceRegister
 }
 
 fn check_linux_args(
-	linux_mmio: &'static [String],
+	linux_mmio: &[String],
 ) -> impl Iterator<Item = (VolatileRef<'static, DeviceRegisters>, u8)> {
 	linux_mmio
 		.iter()

src/env/mod.rs

@@ -9,16 +9,18 @@ use core::str;
 
 use ahash::RandomState;
 use hashbrown::HashMap;
-use hashbrown::hash_map::Iter;
-use hermit_sync::OnceCell;
+use hermit_sync::InterruptSpinMutex;
 use shlex::Shlex;
 
 pub use self::start_info::*;
 
-static CLI: OnceCell<Cli> = OnceCell::new();
+static CLI: InterruptSpinMutex<Option<Cli>> = InterruptSpinMutex::new(None);
 
 pub fn init() {
-	CLI.set(Cli::default()).unwrap();
+	assert!(
+		CLI.lock().replace(Cli::default()).is_none(),
+		"env::init must only be called once"
+	);
 }
 
 #[derive(Debug)]
@@ -118,25 +120,34 @@ impl Default for Cli {
 /// CPU Frequency in MHz if given through the -freq command-line parameter.
 #[cfg(not(target_arch = "riscv64"))]
 pub fn freq() -> Option<u16> {
-	CLI.get().unwrap().freq
+	CLI.lock().as_ref().unwrap().freq
 }
 
 #[allow(dead_code)]
-pub fn var(key: &str) -> Option<&String> {
-	CLI.get().unwrap().env_vars.get(key)
+pub fn var(key: &str) -> Option<String> {
+	CLI.lock().as_ref().unwrap().env_vars.get(key).cloned()
 }
 
-pub fn vars() -> Iter<'static, String, String> {
-	CLI.get().unwrap().env_vars.iter()
+#[cfg(feature = "snapshot")]
+pub fn insert_var(key: &str, value: String) {
+	CLI.lock()
+		.as_mut()
+		.unwrap()
+		.env_vars
+		.insert(key.to_owned(), value);
+}
+
+pub fn vars() -> HashMap<String, String, RandomState> {
+	CLI.lock().as_ref().unwrap().env_vars.clone()
 }
 
 /// Returns the cmdline argument passed in after "--"
-pub fn args() -> &'static [String] {
-	CLI.get().unwrap().args.as_slice()
+pub fn args() -> Vec<String> {
+	CLI.lock().as_ref().unwrap().args.clone()
 }
 
 /// Returns the configuration of all mmio devices
 #[allow(dead_code)]
-pub fn mmio() -> &'static [String] {
-	CLI.get().unwrap().mmio.as_slice()
+pub fn mmio() -> Vec<String> {
+	CLI.lock().as_ref().unwrap().mmio.clone()
 }