mirror of
https://gitlab.com/fabinfra/fabaccess/bffh.git
synced 2024-11-11 01:53:23 +01:00
Working statekeeping
This commit is contained in:
parent
c5d733d888
commit
c1c34aa703
@ -20,9 +20,8 @@ use crate::error::Result;
|
|||||||
pub struct Initiator<S: Sensor> {
|
pub struct Initiator<S: Sensor> {
|
||||||
signal: MutableSignalCloned<Option<Machine>>,
|
signal: MutableSignalCloned<Option<Machine>>,
|
||||||
machine: Option<Machine>,
|
machine: Option<Machine>,
|
||||||
future: Option<BoxFuture<'static, (S::State, Option<User>, MachineState)>>,
|
future: Option<BoxFuture<'static, (Option<User>, MachineState)>>,
|
||||||
token: Option<ReturnToken>,
|
token: Option<ReturnToken>,
|
||||||
//state: Option<S::State>,
|
|
||||||
sensor: Box<S>,
|
sensor: Box<S>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,7 +32,6 @@ impl<S: Sensor> Initiator<S> {
|
|||||||
machine: None,
|
machine: None,
|
||||||
future: None,
|
future: None,
|
||||||
token: None,
|
token: None,
|
||||||
//state: None,
|
|
||||||
sensor: sensor,
|
sensor: sensor,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -58,11 +56,10 @@ impl<S: Sensor> Future for Initiator<S> {
|
|||||||
// If there is a future, poll it
|
// If there is a future, poll it
|
||||||
match this.future.as_mut().map(|future| Future::poll(Pin::new(future), cx)) {
|
match this.future.as_mut().map(|future| Future::poll(Pin::new(future), cx)) {
|
||||||
None => {
|
None => {
|
||||||
this.future = Some(this.sensor.run_sensor(None));
|
this.future = Some(this.sensor.run_sensor());
|
||||||
},
|
},
|
||||||
Some(Poll::Ready((fut_state, user, state))) => {
|
Some(Poll::Ready((user, state))) => {
|
||||||
this.future.take();
|
this.future.take();
|
||||||
//this.state.replace(fut_state);
|
|
||||||
this.machine.as_mut().map(|machine| machine.request_state_change(user.as_ref(), state));
|
this.machine.as_mut().map(|machine| machine.request_state_change(user.as_ref(), state));
|
||||||
}
|
}
|
||||||
Some(Poll::Pending) => return Poll::Pending,
|
Some(Poll::Pending) => return Poll::Pending,
|
||||||
@ -75,19 +72,27 @@ pub fn load<S: Sensor>() -> Result<Initiator<S>> {
|
|||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Dummy;
|
pub struct Dummy {
|
||||||
|
step: bool
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Dummy {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self { step: false }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Sensor for Dummy {
|
impl Sensor for Dummy {
|
||||||
type State = bool;
|
fn run_sensor(&mut self)
|
||||||
|
-> BoxFuture<'static, (Option<User>, MachineState)>
|
||||||
fn run_sensor(&mut self, state: Option<bool>)
|
|
||||||
-> BoxFuture<'static, (Self::State, Option<User>, MachineState)>
|
|
||||||
{
|
{
|
||||||
let step = state.map(|b| !b).unwrap_or(false);
|
let step = self.step;
|
||||||
|
self.step != self.step;
|
||||||
|
|
||||||
let f = async move {
|
let f = async move {
|
||||||
Timer::after(std::time::Duration::from_secs(1)).await;
|
Timer::after(std::time::Duration::from_secs(1)).await;
|
||||||
if step {
|
if step {
|
||||||
return (step, None, MachineState::free());
|
return (None, MachineState::free());
|
||||||
} else {
|
} else {
|
||||||
let user = User::new(
|
let user = User::new(
|
||||||
UserId::new("test".to_string(), None, None),
|
UserId::new("test".to_string(), None, None),
|
||||||
@ -95,7 +100,7 @@ impl Sensor for Dummy {
|
|||||||
);
|
);
|
||||||
let p = user.data.priority;
|
let p = user.data.priority;
|
||||||
let id = user.id.clone();
|
let id = user.id.clone();
|
||||||
return (step, Some(user), MachineState::used(id, p));
|
return (Some(user), MachineState::used(id, p));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -5,6 +5,5 @@ use crate::db::user::User;
|
|||||||
use crate::db::machine::MachineState;
|
use crate::db::machine::MachineState;
|
||||||
|
|
||||||
pub trait Sensor {
|
pub trait Sensor {
|
||||||
type State: Sized;
|
fn run_sensor(&mut self) -> BoxFuture<'static, (Option<User>, MachineState)>;
|
||||||
fn run_sensor(&mut self, state: Option<Self::State>) -> BoxFuture<'static, (Self::State, Option<User>, MachineState)>;
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user