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

@@ -25,7 +25,7 @@ wooting-analog-common = { path = "../wooting-analog-common"}
 wooting-analog-plugin-dev = { path = "../wooting-analog-plugin-dev"}
 
 [dev-dependencies]
-shared_memory = "^0.8"
+shared_memory = "^0.12"
 
 [build-dependencies]
 cmake = "0.1"

wooting-analog-sdk/Cargo.toml

@@ -353,9 +353,7 @@ pub extern "C" fn wooting_analog_read_full_buffer_device(
 mod tests {
     use super::*;
     use crate::keycode::hid_to_code;
-    use shared_memory::{
-        ReadLockGuard, ReadLockable, SharedMem, SharedMemCast, WriteLockGuard, WriteLockable,
-    };
+    use shared_memory::ShmemConf;
 
     use std::sync::{Arc, MutexGuard};
     use std::time::Duration;
@@ -379,8 +377,6 @@ mod tests {
         pub analog_values: [u8; 0xFF],
     }
 
-    unsafe impl SharedMemCast for SharedState {}
-
     pub fn get_sdk() -> MutexGuard<'static, AnalogSDK> {
         ANALOG_SDK.lock().unwrap()
     }
@@ -409,20 +405,6 @@ mod tests {
         info!("Got {:?} after {} attempts", connected, n);
     }
 
-    fn get_wlock(shmem: &mut SharedMem) -> WriteLockGuard<SharedState> {
-        match shmem.wlock::<SharedState>(0) {
-            Ok(v) => v,
-            Err(_) => panic!("Failed to acquire write lock !"),
-        }
-    }
-
-    fn get_rlock(shmem: &mut SharedMem) -> ReadLockGuard<SharedState> {
-        match shmem.rlock::<SharedState>(0) {
-            Ok(v) => v,
-            Err(_) => panic!("Failed to acquire write lock !"),
-        }
-    }
-
     fn shared_init() {
         env_logger::try_init_from_env(env_logger::Env::from("trace"))
             .map_err(|e| println!("ERROR: Could not initialise env_logger. '{:?}'", e));
@@ -455,11 +437,11 @@ mod tests {
         //Wait a slight bit to ensure that the test-plugin worker thread has initialised the shared mem
         ::std::thread::sleep(Duration::from_millis(500));
 
-        let mut shmem = match SharedMem::open_linked(
+        let mut shmem = match ShmemConf::new().size(4096).flink(
             std::env::temp_dir()
                 .join("wooting-test-plugin.link")
                 .as_os_str(),
-        ) {
+        ).open() {
             Ok(v) => v,
             Err(e) => {
                 println!("Error : {}", e);
@@ -474,7 +456,7 @@ mod tests {
         //Check the connected cb is called
         {
             {
-                let mut shared_state = get_wlock(&mut shmem);
+                let shared_state = unsafe { &mut *(shmem.as_ptr() as *mut u8 as *mut SharedState) };
                 shared_state.device_connected = true;
             }
             wait_for_connected(5, true);
@@ -506,7 +488,7 @@ mod tests {
         //Check the cb is called with disconnected
         {
             {
-                let mut shared_state = get_wlock(&mut shmem);
+                let shared_state = unsafe { &mut *(shmem.as_ptr() as *mut u8 as *mut SharedState) };
                 shared_state.device_connected = false;
             }
             wait_for_connected(5, false);
@@ -529,7 +511,7 @@ mod tests {
         let analog_key = 5;
         //Connect the device again, set a keycode to a val
         let device_id = {
-            let mut shared_state = get_wlock(&mut shmem);
+            let shared_state = unsafe { &mut *(shmem.as_ptr() as *mut u8 as *mut SharedState) };
             shared_state.analog_values[analog_key] = analog_val;
             shared_state.device_connected = true;
             1
@@ -632,7 +614,7 @@ mod tests {
         wooting_analog_set_keycode_mode(mode.clone() as u32);
 
         {
-            let mut shared_state = get_wlock(&mut shmem);
+            let shared_state = unsafe { &mut *(shmem.as_ptr() as *mut u8 as *mut SharedState) };
             shared_state.analog_values[analog_key] = 0;
         }
         ::std::thread::sleep(Duration::from_secs(1));
@@ -668,7 +650,7 @@ mod tests {
             WootingAnalogResult::Ok
         );
         {
-            let mut shared_state = get_wlock(&mut shmem);
+            let shared_state = unsafe { &mut *(shmem.as_ptr() as *mut u8 as *mut SharedState) };
             shared_state.device_connected = false;
         }
         ::std::thread::sleep(Duration::from_secs(1));

wooting-analog-sdk/src/ffi.rs

@@ -15,7 +15,6 @@ extern crate wooting_analog_common;
 extern crate wooting_analog_plugin_dev;
 
 #[cfg(test)]
-#[macro_use]
 extern crate shared_memory;
 
 //library modules