Update shared_memory crate

The crate now only provides a ptr to the shared memory and no locking primitive of its own, which I think is perfectly fine for this use-case as we're only operating on plain old data.

Tested with wooting-analog-midi.

Author: Sainan

Cargo.lock

@@ -24,9 +24,6 @@ bimap = "0.4"
 wooting-analog-common = { path = "../wooting-analog-common"}
 wooting-analog-plugin-dev = { path = "../wooting-analog-plugin-dev"}
 
-[dev-dependencies]
-shared_memory = "^0.8"
-
 [build-dependencies]
 cmake = "0.1"
 wooting-analog-common = { path = "../wooting-analog-common"}

wooting-analog-sdk/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 wooting-analog-plugin-dev = { path = "../wooting-analog-plugin-dev"}
-shared_memory = "^0.8"
+shared_memory = "^0.12"
 log = "^0.4"
 env_logger = "^0.8"
 

wooting-analog-test-plugin/Cargo.toml

@@ -44,8 +44,6 @@ pub struct SharedState {
     pub analog_values: [u8; 0xFF],
 }
 
-unsafe impl SharedMemCast for SharedState {}
-
 impl WootingAnalogTestPlugin {
     fn new() -> Self {
         if let Err(e) = env_logger::try_init() {
@@ -68,8 +66,8 @@ impl WootingAnalogTestPlugin {
 
         let worker_thread = thread::spawn(move || {
             let link_path = std::env::temp_dir().join("wooting-test-plugin.link");
-            let mut my_shmem = {
-                match SharedMem::open_linked(link_path.as_os_str()) {
+            let my_shmem = {
+                match ShmemConf::new().size(4096).flink(link_path.as_os_str()).open() {
                     Ok(v) => v,
                     Err(e) => {
                         if link_path.exists() {
@@ -79,7 +77,7 @@ impl WootingAnalogTestPlugin {
                                 error!("Could not delete old link file: {}", e);
                             }
                         }
-                        match SharedMem::create_linked(link_path.as_os_str(), LockType::Mutex, 4096)
+                        match ShmemConf::new().size(4096).flink(link_path.as_os_str()).create()
                         {
                             Ok(m) => m,
                             Err(e) => {
@@ -93,16 +91,10 @@ impl WootingAnalogTestPlugin {
                 }
             };
 
-            info!("{:?}", my_shmem.get_link_path());
+            info!("{:?}", my_shmem.get_flink_path());
 
             {
-                let mut shared_state = match my_shmem.wlock::<SharedState>(0) {
-                    Ok(v) => v,
-                    Err(_) => {
-                        error!("Test plugin Failed to acquire write lock! Stopping...");
-                        return;
-                    }
-                };
+                let shared_state = unsafe { &mut *(my_shmem.as_ptr() as *mut u8 as *mut SharedState) };
                 shared_state.vendor_id = 0x03eb;
                 shared_state.product_id = 0xFFFF;
                 shared_state.device_type = DeviceType::Keyboard;
@@ -122,13 +114,7 @@ impl WootingAnalogTestPlugin {
                 }
 
                 {
-                    let mut state = match my_shmem.wlock::<SharedState>(0) {
-                        Ok(v) => v,
-                        Err(_) => {
-                            warn!("failed to get lock");
-                            continue;
-                        }
-                    };
+                    let state = unsafe { &mut *(my_shmem.as_ptr() as *mut u8 as *mut SharedState) };
 
                     if state.dirty_device_info || t_device.lock().unwrap().is_none() {
                         state.dirty_device_info = false;
@@ -166,8 +152,6 @@ impl WootingAnalogTestPlugin {
                     }
 
                     if !state.device_connected {
-                        //make sure we drop the state so we're not holding the lock while the thread is sleeping
-                        drop(state);
                         thread::sleep(Duration::from_millis(500));
                         continue;
                     }

wooting-analog-test-plugin/src/lib.rs

@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 wooting-analog-common = { path = "../wooting-analog-common"}
-shared_memory = "^0.8"
+shared_memory = "^0.12"
 log = "^0.4"
 iced = "^0.4"
 env_logger = "0.8"