refactor(hydroflow_plus): split up location module and store location…

…s directly in streams (#1523)
hydro-project · Nov 5, 2024 · d9634f2 · d9634f2
1 parent 534fe97
commit d9634f2
Show file tree

Hide file tree

Showing 21 changed files with 1,168 additions and 1,245 deletions.
diff --git a/hydroflow_plus/src/builder/deploy.rs b/hydroflow_plus/src/builder/deploy.rs
@@ -13,10 +13,10 @@ use stageleft::Quoted;
 use super::built::build_inner;
 use crate::deploy::{ExternalSpec, LocalDeploy, Node, RegisterPort};
 use crate::ir::HfPlusLeaf;
-use crate::location::{
-    ExternalBincodeSink, ExternalBincodeStream, ExternalBytesPort, ExternalProcess, Location,
-    LocationId,
+use crate::location::external_process::{
+    ExternalBincodeSink, ExternalBincodeStream, ExternalBytesPort,
 };
+use crate::location::{ExternalProcess, Location, LocationId};
 use crate::{Cluster, ClusterSpec, Deploy, HfCompiled, Process, ProcessSpec};
 
 pub struct DeployFlow<'a, D: LocalDeploy<'a>> {

diff --git a/hydroflow_plus/src/builder/mod.rs b/hydroflow_plus/src/builder/mod.rs
@@ -3,16 +3,11 @@ use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::rc::Rc;
 
-use internal::TokenStream;
-use proc_macro2::Span;
-use quote::quote;
-use runtime_support::FreeVariable;
 use stageleft::*;
 
-use super::staging_util::get_this_crate;
 use crate::ir::HfPlusLeaf;
 use crate::location::{Cluster, ExternalProcess, Process};
-use crate::{ClusterId, RuntimeContext};
+use crate::RuntimeContext;
 
 pub mod built;
 pub mod deploy;
@@ -32,74 +27,6 @@ pub struct FlowStateInner {
 
 pub type FlowState = Rc<RefCell<FlowStateInner>>;
 
-pub struct ClusterIds<'a, C> {
-    pub(crate) id: usize,
-    pub(crate) _phantom: PhantomData<&'a mut &'a C>,
-}
-
-impl<C> Clone for ClusterIds<'_, C> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<C> Copy for ClusterIds<'_, C> {}
-
-impl<'a, C> FreeVariable<&'a Vec<ClusterId<C>>> for ClusterIds<'a, C> {
-    fn to_tokens(self) -> (Option<TokenStream>, Option<TokenStream>)
-    where
-        Self: Sized,
-    {
-        let ident = syn::Ident::new(
-            &format!("__hydroflow_plus_cluster_ids_{}", self.id),
-            Span::call_site(),
-        );
-        let root = get_this_crate();
-        let c_type = quote_type::<C>();
-        (
-            None,
-            Some(
-                quote! { unsafe { ::std::mem::transmute::<_, &::std::vec::Vec<#root::ClusterId<#c_type>>>(#ident) } },
-            ),
-        )
-    }
-}
-
-impl<'a, C> Quoted<'a, &'a Vec<ClusterId<C>>> for ClusterIds<'a, C> {}
-
-pub(crate) struct ClusterSelfId<'a, C> {
-    pub(crate) id: usize,
-    pub(crate) _phantom: PhantomData<&'a mut &'a C>,
-}
-
-impl<C> Clone for ClusterSelfId<'_, C> {
-    fn clone(&self) -> Self {
-        *self
-    }
-}
-
-impl<C> Copy for ClusterSelfId<'_, C> {}
-
-impl<C> FreeVariable<ClusterId<C>> for ClusterSelfId<'_, C> {
-    fn to_tokens(self) -> (Option<TokenStream>, Option<TokenStream>)
-    where
-        Self: Sized,
-    {
-        let ident = syn::Ident::new(
-            &format!("__hydroflow_plus_cluster_self_id_{}", self.id),
-            Span::call_site(),
-        );
-        let root = get_this_crate();
-        let c_type: syn::Type = quote_type::<C>();
-        (
-            None,
-            Some(quote! { #root::ClusterId::<#c_type>::from_raw(#ident) }),
-        )
-    }
-}
-
-impl<'a, C> Quoted<'a, ClusterId<C>> for ClusterSelfId<'a, C> {}
-
 pub struct FlowBuilder<'a> {
     flow_state: FlowState,
     nodes: RefCell<Vec<usize>>,

diff --git a/hydroflow_plus/src/cycle.rs b/hydroflow_plus/src/cycle.rs
@@ -1,7 +1,6 @@
 use std::marker::PhantomData;
 
-use crate::builder::FlowState;
-use crate::location::{Location, LocationId};
+use crate::location::Location;
 
 pub struct TickCycle {}
 
@@ -16,18 +15,13 @@ pub trait CycleComplete<'a, T> {
 pub trait CycleCollection<'a, T>: CycleComplete<'a, T> {
     type Location: Location<'a>;
 
-    fn create_source(ident: syn::Ident, flow_state: FlowState, l: LocationId) -> Self;
+    fn create_source(ident: syn::Ident, location: Self::Location) -> Self;
 }
 
 pub trait CycleCollectionWithInitial<'a, T>: CycleComplete<'a, T> {
     type Location: Location<'a>;
 
-    fn create_source(
-        ident: syn::Ident,
-        flow_state: FlowState,
-        initial: Self,
-        l: LocationId,
-    ) -> Self;
+    fn create_source(ident: syn::Ident, initial: Self, location: Self::Location) -> Self;
 }
 
 /// Represents a forward reference in the graph that will be fulfilled

diff --git a/hydroflow_plus/src/lib.rs b/hydroflow_plus/src/lib.rs
@@ -19,13 +19,13 @@ pub mod runtime_support {
 }
 
 pub mod stream;
-pub use stream::{Bounded, Stream, Tick, Unbounded};
+pub use stream::{Bounded, Stream, Unbounded};
 
 pub mod singleton;
 pub use singleton::{Optional, Singleton};
 
 pub mod location;
-pub use location::{Cluster, ClusterId, Location, Process};
+pub use location::{Cluster, ClusterId, Location, Process, Tick};
 
 pub mod deploy;
 pub use deploy::{ClusterSpec, Deploy, ProcessSpec};