controller shared variables no longer under RwLock by default

examples/eapi.rs

@@ -5,7 +5,10 @@ use roboplc::{
     time::interval,
 };
 use serde::Deserialize;
-use std::sync::Arc;
+use std::sync::{
+    atomic::{AtomicBool, Ordering},
+    Arc,
+};
 use tracing::info;
 
 #[derive(Clone, Debug)]
@@ -18,7 +21,7 @@ struct Env {
 
 #[derive(Default)]
 struct Variables {
-    fan: bool,
+    fan: AtomicBool,
 }
 
 #[derive(DataPolicy, Clone)]
@@ -51,8 +54,10 @@ impl Worker<Message, Variables> for Worker1 {
                     pressure: temp as f64 / 3.0,
                 },
             )?;
-            self.eapi
-                .state_push(oid.clone(), u8::from(context.variables().read().fan))?;
+            self.eapi.state_push(
+                oid.clone(),
+                u8::from(context.variables().fan.load(Ordering::Acquire)),
+            )?;
             //self.eapi.dobj_error(dobj_name.clone())?;
             if !context.is_online() {
                 break;
@@ -83,7 +88,7 @@ fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
         .action_handler("unit:tests/fan".parse().unwrap(), |action, context| {
             let params = action.take_unit_params()?;
             let val = u8::deserialize(params.value)?;
-            context.variables().write().fan = val != 0;
+            context.variables().fan.store(val != 0, Ordering::Release);
             Ok(())
         });
     // this creates a connector instance with the name `fieldbus.HOSTNAME.plc`. To use a custom

examples/modbus-master.rs

+use roboplc::locking::Mutex;
 use roboplc::{
     comm::{tcp, Client},
     time::interval,
@@ -11,9 +12,11 @@ const MODBUS_TIMEOUT: Duration = Duration::from_secs(1);
 // Do not make any decision if the sensor is older than this
 const ENV_DATA_TTL: Duration = Duration::from_millis(1);
 
+type Variables = Mutex<VariablesData>;
+
 // A shared traditional PLC context, does not used for logic here but provided as an example
 #[derive(Default)]
-struct Variables {
+struct VariablesData {
     temperature: f32,
 }
 
@@ -66,7 +69,7 @@ impl Worker<Message, Variables> for ModbusPuller1 {
         for _ in interval(Duration::from_millis(500)) {
             match self.sensor_mapping.read::<EnvironmentSensors>() {
                 Ok(v) => {
-                    context.variables().write().temperature = v.temperature;
+                    context.variables().lock().temperature = v.temperature;
                     hub.send(Message::EnvSensorData(TtlCell::new_with_value(
                         ENV_DATA_TTL,
                         v,

examples/modbus-slave.rs

 use roboplc::comm::Protocol;
 use roboplc::io::modbus::prelude::*;
+use roboplc::locking::Mutex;
 use roboplc::{prelude::*, time::interval};
 use tracing::info;
 
@@ -35,10 +36,11 @@ struct Input {
 
 // This example does not use controller's data hub
 type Message = ();
+type Variables = Mutex<VariableData>;
 
 // Controller's shared variables
 #[derive(Default)]
-struct Variables {
+struct VariableData {
     data: Data,
     relays: Relays,
     input: Input,
@@ -58,7 +60,7 @@ struct Worker1 {
 impl Worker<Message, Variables> for Worker1 {
     fn run(&mut self, context: &Context<Message, Variables>) -> WResult {
         for _ in interval(Duration::from_secs(2)) {
-            let mut vars = context.variables().write();
+            let mut vars = context.variables().lock();
             vars.data.counter += 1;
             vars.relays.relay1 = u8::from(vars.data.counter % 2 == 0);
             vars.relays.relay2 = u8::from(vars.data.counter % 2 != 0);

src/controller.rs

@@ -15,7 +15,6 @@ use crate::{
     thread_rt::{Builder, RTParams, Scheduling},
     Error, Result,
 };
-use parking_lot_rt::RwLock;
 pub use roboplc_derive::WorkerOpts;
 use rtsc::data_policy::DataDeliveryPolicy;
 use signal_hook::{
@@ -106,7 +105,7 @@ where
     supervisor: Supervisor<()>,
     hub: Hub<D>,
     state: State,
-    variables: Arc<RwLock<V>>,
+    variables: Arc<V>,
 }
 
 impl<D, V> Controller<D, V>
@@ -132,7 +131,7 @@ where
             supervisor: <_>::default(),
             hub: <_>::default(),
             state: State::new(),
-            variables: Arc::new(RwLock::new(variables)),
+            variables: Arc::new(variables),
         }
     }
     /// Spawns a worker
@@ -280,7 +279,7 @@ where
         &self.supervisor
     }
     /// Controller shared variables
-    pub fn variables(&self) -> &Arc<RwLock<V>> {
+    pub fn variables(&self) -> &Arc<V> {
         &self.variables
     }
 }
@@ -304,7 +303,7 @@ where
 {
     hub: Hub<D>,
     state: State,
-    variables: Arc<RwLock<V>>,
+    variables: Arc<V>,
 }
 
 impl<D, V> Clone for Context<D, V>
@@ -331,7 +330,7 @@ where
         &self.hub
     }
     /// Controller's shared variables (locked)
-    pub fn variables(&self) -> &Arc<RwLock<V>> {
+    pub fn variables(&self) -> &Arc<V> {
         &self.variables
     }
     /// Controller's state