initial commit
This commit is contained in:
commit
166e75a5c7
5 changed files with 451 additions and 0 deletions
14
Cargo.toml
Normal file
14
Cargo.toml
Normal file
|
@ -0,0 +1,14 @@
|
|||
|
||||
[package]
|
||||
authors = ["Michael Sippel <m.sippel@hzdr.de>"]
|
||||
edition = "2018"
|
||||
name = "NeStEd"
|
||||
version = "0.1.0"
|
||||
|
||||
[dependencies]
|
||||
cgmath = "*"
|
||||
termion = "*"
|
||||
|
||||
[dependencies.async-std]
|
||||
version = "1.7.0"
|
||||
features = ["unstable", "attributes"]
|
194
src/channel.rs
Normal file
194
src/channel.rs
Normal file
|
@ -0,0 +1,194 @@
|
|||
use {
|
||||
core::{
|
||||
task::{Poll, Context, Waker},
|
||||
pin::Pin
|
||||
},
|
||||
std::{
|
||||
sync::{Arc, Mutex},
|
||||
collections::HashSet,
|
||||
hash::Hash
|
||||
},
|
||||
async_std::{
|
||||
stream::Stream
|
||||
},
|
||||
|
||||
crate::{
|
||||
view::{View, Observer}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Traits
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
pub trait ChannelData : Default + IntoIterator {
|
||||
fn channel_insert(&mut self, x: Self::Item);
|
||||
}
|
||||
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Queue Channel
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
impl<T> ChannelData for Vec<T> {
|
||||
fn channel_insert(&mut self, x: T) {
|
||||
self.push(x);
|
||||
}
|
||||
}
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Set Channel
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
impl<T: Eq + Hash> ChannelData for HashSet<T> {
|
||||
fn channel_insert(&mut self, x: T) {
|
||||
self.insert(x);
|
||||
}
|
||||
}
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Singleton Channel
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
pub struct SingletonChannel<T>(Option<T>);
|
||||
|
||||
impl<T> Default for SingletonChannel<T> {
|
||||
fn default() -> Self {
|
||||
SingletonChannel(None)
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> IntoIterator for SingletonChannel<T> {
|
||||
type Item = T;
|
||||
type IntoIter = std::iter::Once<T>;
|
||||
|
||||
fn into_iter(mut self) -> Self::IntoIter {
|
||||
std::iter::once(self.0.take().unwrap())
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> ChannelData for SingletonChannel<T> {
|
||||
fn channel_insert(&mut self, x: T) {
|
||||
self.0 = Some(x);
|
||||
}
|
||||
}
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Channel
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
struct ChannelState<Data: ChannelData> {
|
||||
send_buf: Option<Data>,
|
||||
recv_iter: Option<Data::IntoIter>,
|
||||
num_senders: usize,
|
||||
waker: Option<Waker>
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
pub struct ChannelSender<Data: ChannelData>(Arc<Mutex<ChannelState<Data>>>);
|
||||
pub struct ChannelReceiver<Data: ChannelData>(Arc<Mutex<ChannelState<Data>>>);
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
impl<Data: ChannelData> Observer for ChannelSender<Data> {
|
||||
type Msg = Data::Item;
|
||||
|
||||
fn notify(&mut self, msg: Data::Item) {
|
||||
let mut state = self.0.lock().unwrap();
|
||||
|
||||
if state.send_buf.is_none() {
|
||||
state.send_buf = Some(Data::default());
|
||||
}
|
||||
|
||||
state.send_buf.as_mut().unwrap().channel_insert(msg);
|
||||
|
||||
if let Some(waker) = state.waker.take() {
|
||||
waker.wake();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<Data: ChannelData> Clone for ChannelSender<Data> {
|
||||
fn clone(&self) -> Self {
|
||||
self.0.lock().unwrap().num_senders += 1;
|
||||
ChannelSender(self.0.clone())
|
||||
}
|
||||
}
|
||||
|
||||
impl<Data: ChannelData> Drop for ChannelSender<Data> {
|
||||
fn drop(&mut self) {
|
||||
let mut state = self.0.lock().unwrap();
|
||||
state.num_senders -= 1;
|
||||
if let Some(waker) = state.waker.take() {
|
||||
waker.wake();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
impl<Data: ChannelData> Stream for ChannelReceiver<Data> {
|
||||
type Item = Data::Item;
|
||||
|
||||
fn poll_next(
|
||||
self: Pin<&mut Self>,
|
||||
cx: &mut Context<'_>
|
||||
) -> Poll<Option<Self::Item>> {
|
||||
let mut state = self.0.lock().unwrap();
|
||||
|
||||
if let Some(recv_iter) = state.recv_iter.as_mut() {
|
||||
if let Some(val) = recv_iter.next() {
|
||||
return Poll::Ready(Some(val))
|
||||
} else {
|
||||
state.recv_iter = None
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(send_buf) = state.send_buf.take() {
|
||||
state.recv_iter = Some(send_buf.into_iter());
|
||||
// recv_iter.next() is guaranteed to be Some(x)
|
||||
Poll::Ready(state.recv_iter.as_mut().unwrap().next())
|
||||
} else if state.num_senders == 0 {
|
||||
Poll::Ready(None)
|
||||
} else {
|
||||
state.waker = Some(cx.waker().clone());
|
||||
Poll::Pending
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Factory Functions
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
pub fn channel<Data: ChannelData>() -> (ChannelSender<Data>, ChannelReceiver<Data>) {
|
||||
let state = Arc::new(Mutex::new(ChannelState{
|
||||
send_buf: None,
|
||||
recv_iter: None,
|
||||
num_senders: 1,
|
||||
waker: None
|
||||
}));
|
||||
|
||||
(ChannelSender(state.clone()), ChannelReceiver(state))
|
||||
}
|
||||
|
||||
pub fn set_channel<T: Eq + Hash>() -> (ChannelSender<HashSet<T>>, ChannelReceiver<HashSet<T>>) {
|
||||
channel::<HashSet<T>>()
|
||||
}
|
||||
|
||||
pub fn queue_channel<T: Eq + Hash>() -> (ChannelSender<Vec<T>>, ChannelReceiver<Vec<T>>) {
|
||||
channel::<Vec<T>>()
|
||||
}
|
||||
|
||||
pub fn singleton_channel<T: Eq + Hash>() -> (ChannelSender<SingletonChannel<T>>, ChannelReceiver<SingletonChannel<T>>) {
|
||||
channel::<SingletonChannel<T>>()
|
||||
}
|
||||
|
42
src/main.rs
Normal file
42
src/main.rs
Normal file
|
@ -0,0 +1,42 @@
|
|||
|
||||
#![feature(trait_alias)]
|
||||
|
||||
pub mod view;
|
||||
pub mod port;
|
||||
pub mod channel;
|
||||
|
||||
use async_std::task;
|
||||
use async_std::prelude::*;
|
||||
use async_std::stream;
|
||||
|
||||
use std::sync::{Arc, RwLock};
|
||||
use cgmath::Vector2;
|
||||
|
||||
use view::{View, Observer};
|
||||
use port::{ViewPortIn, ViewPortOut};
|
||||
|
||||
#[async_std::main]
|
||||
async fn main() {
|
||||
let (view_in, mut view_out) = port::view_port::<usize, char>();
|
||||
|
||||
let mut observer_stream = view_in.stream().map({
|
||||
let view = view_in.clone();
|
||||
move |idx| (idx, view.view(idx).unwrap())
|
||||
});
|
||||
|
||||
let fut = task::spawn(async move {
|
||||
while let Some((idx, val)) = observer_stream.next().await {
|
||||
println!("view[{}] = {}", idx, val);
|
||||
}
|
||||
});
|
||||
|
||||
view_out.set_view_fn(|idx| Some(if idx % 2 == 0 { 'λ' } else { 'y' }) );
|
||||
|
||||
view_out.notify(1);
|
||||
view_out.notify(2);
|
||||
view_out.notify(5);
|
||||
|
||||
fut.await;
|
||||
}
|
||||
|
||||
|
117
src/port.rs
Normal file
117
src/port.rs
Normal file
|
@ -0,0 +1,117 @@
|
|||
|
||||
use std::{
|
||||
sync::{Arc, Weak, RwLock},
|
||||
collections::HashSet,
|
||||
hash::Hash
|
||||
};
|
||||
use crate::{
|
||||
view::{View, Observer, FnView, FnObserver},
|
||||
channel::{ChannelReceiver}
|
||||
};
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
View Port
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
|
||||
pub struct ViewPort<K, V> {
|
||||
view: Option<Arc<dyn View<Key = K, Value = V> + Send + Sync>>,
|
||||
observers: Vec<Arc<RwLock<dyn Observer<Msg = K> + Send + Sync>>>
|
||||
}
|
||||
|
||||
pub fn view_port<K, V>() -> (ViewPortIn<K, V>, ViewPortOut<K, V>) {
|
||||
let state = Arc::new(RwLock::new(ViewPort{ view: None, observers: Vec::new() }));
|
||||
(ViewPortIn(state.clone()), ViewPortOut(state))
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct ViewPortIn<K, V>(Arc<RwLock<ViewPort<K, V>>>);
|
||||
impl<K: Send + Sync + 'static, V> ViewPortIn<K, V> {
|
||||
pub fn add_observer(&self, observer: Arc<RwLock<dyn Observer<Msg = K> + Send + Sync>>) {
|
||||
self.0
|
||||
.write().unwrap()
|
||||
.observers
|
||||
.push(observer);
|
||||
}
|
||||
|
||||
pub fn add_observer_fn(&self, obs_fn: impl FnMut(K) + Send + Sync + 'static) {
|
||||
self.add_observer(Arc::new(RwLock::new(FnObserver::new(obs_fn))));
|
||||
}
|
||||
}
|
||||
|
||||
impl<K: Eq + Hash + Send + Sync + 'static, V> ViewPortIn<K, V> {
|
||||
pub fn stream(&self) -> ChannelReceiver<HashSet<K>> {
|
||||
let (s, r) = crate::channel::set_channel();
|
||||
self.add_observer(Arc::new(RwLock::new(s)));
|
||||
r
|
||||
}
|
||||
}
|
||||
|
||||
impl<K, V> View for ViewPortIn<K, V> {
|
||||
type Key = K;
|
||||
type Value = V;
|
||||
|
||||
fn view(&self, key: K) -> Option<V> {
|
||||
if let Some(view) = self.0.read().unwrap().view.as_ref() {
|
||||
view.view(key)
|
||||
} else {
|
||||
println!("Warning: trying to access InPort with uninitialized View!");
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
pub struct ViewPortOut<K, V>(Arc<RwLock<ViewPort<K, V>>>);
|
||||
impl<K: Send + Sync + 'static, V: Send + Sync + 'static> ViewPortOut<K, V> {
|
||||
pub fn set_view(&self, view: Arc<dyn View<Key = K, Value = V> + Send + Sync>) {
|
||||
self.0.write().unwrap().view = Some(view);
|
||||
}
|
||||
|
||||
pub fn set_view_fn(&self, view_fn: impl Fn(K) -> Option<V> + Send + Sync + 'static) {
|
||||
self.set_view(Arc::new(FnView::new(view_fn)))
|
||||
}
|
||||
}
|
||||
|
||||
impl<K, V> Observer for ViewPortOut<K, V>
|
||||
where K: Clone {
|
||||
type Msg = K;
|
||||
|
||||
fn notify(&mut self, msg: K) {
|
||||
for observer in self.0.read().unwrap().observers.iter() {
|
||||
observer.write().unwrap().notify(msg.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*\
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
Stream Port
|
||||
<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
\*/
|
||||
|
||||
/*
|
||||
pub struct StreamPort<T> {
|
||||
actions: Vec<Arc<Mutex<dyn FnMut(T)>>>
|
||||
}
|
||||
|
||||
impl<T> StreamPort<T> {
|
||||
async fn set_stream(&self, stream: impl Stream<T>) -> impl Future<()> {
|
||||
for msg in stream.next().await.unwrap() {
|
||||
for act in self.actions.iter() {
|
||||
(*act.lock().unwrap())(msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn add_action(&self, action: impl FnMut(T)) {
|
||||
self.actions.push(Arc::new(Mutex::new(action)))
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
84
src/view.rs
Normal file
84
src/view.rs
Normal file
|
@ -0,0 +1,84 @@
|
|||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
pub trait View {
|
||||
type Key;
|
||||
type Value;
|
||||
|
||||
fn view(&self, key: Self::Key) -> Option<Self::Value>;
|
||||
}
|
||||
|
||||
pub trait Observer {
|
||||
type Msg;
|
||||
|
||||
fn notify(&mut self, key: Self::Msg);
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
use cgmath::Vector2;
|
||||
|
||||
pub trait SingletonView = View<Key = ()>;
|
||||
pub trait SingletonObserver = Observer<Msg = ()>;
|
||||
|
||||
pub trait SequenceView = View<Key = usize>;
|
||||
pub trait SequenceObserver = Observer<Msg = usize>;
|
||||
|
||||
pub trait GridView = View<Key = Vector2<i16>>;
|
||||
pub trait GridObserver = Observer<Msg = Vector2<i16>>;
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
pub struct FnView<K, V, F: Fn(K) -> Option<V>> {
|
||||
f: F,
|
||||
_phantom0: std::marker::PhantomData<K>,
|
||||
_phantom1: std::marker::PhantomData<V>
|
||||
}
|
||||
|
||||
impl<K, V, F> FnView<K, V, F>
|
||||
where F: Fn(K) -> Option<V> {
|
||||
pub fn new(f: F) -> Self {
|
||||
FnView {
|
||||
f,
|
||||
_phantom0: std::marker::PhantomData,
|
||||
_phantom1: std::marker::PhantomData
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<K, V, F> View for FnView<K, V, F>
|
||||
where F: Fn(K) -> Option<V> {
|
||||
type Key = K;
|
||||
type Value = V;
|
||||
|
||||
fn view(&self, key: K) -> Option<V> {
|
||||
(self.f)(key)
|
||||
}
|
||||
}
|
||||
|
||||
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
|
||||
|
||||
pub struct FnObserver<T, F: FnMut(T)> {
|
||||
f: F,
|
||||
_phantom: std::marker::PhantomData<T>
|
||||
}
|
||||
|
||||
impl<T, F> FnObserver<T, F>
|
||||
where F: FnMut(T) {
|
||||
pub fn new(f: F) -> Self {
|
||||
FnObserver {
|
||||
f,
|
||||
_phantom: std::marker::PhantomData
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<T, F> Observer for FnObserver<T, F>
|
||||
where F: FnMut(T) {
|
||||
type Msg = T;
|
||||
|
||||
fn notify(&mut self, key: T) {
|
||||
(self.f)(key);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in a new issue