diff options
| author | Connor Brewster <cbrewster@hey.com> | 2023-09-16T18·54-0500 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-20T14·27+0000 |
| commit | 7e737fde34260daa477794d63b0b3344b4a1d81b (patch) | |
| tree | 51f7d4b3c7f18aa78e584b06840fcdd645474895 /tvix/store/src/bin/tvix-store.rs | |
| parent | 6b7c936bc50934b45df132f659292e2c45256dea (diff) | |
refactor(tvix/store/fs): Separate FUSE and filesystem code r/6622
In prepration for adding virtiofs support, I thought it would make sense to split out the filesystem implementation from FUSE itself. The `fs` module holds the tvix-store filesystem implemetation and the `fuse` module holds the code to spawn a FUSE daemon backed by multiple threads. Change-Id: I8c58447b8c3aa016a613068f8e7ec166554e237c Reviewed-on: https://cl.tvl.fyi/c/depot/+/9343 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Autosubmit: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/store/src/bin/tvix-store.rs')
| -rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index f707e3850d4f..1be8b00bd9b8 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -22,7 +22,12 @@ use tvix_store::proto::GRPCPathInfoServiceWrapper; use tvix_store::proto::NamedNode; use tvix_store::proto::NarInfo; use tvix_store::proto::PathInfo; -use tvix_store::{FuseDaemon, FUSE}; + +#[cfg(feature = "fs")] +use tvix_store::fs::TvixStoreFs; + +#[cfg(feature = "fuse")] +use tvix_store::fs::fuse::FuseDaemon; #[cfg(feature = "reflection")] use tvix_store::proto::FILE_DESCRIPTOR_SET; @@ -302,7 +307,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { )?; let mut fuse_daemon = tokio::task::spawn_blocking(move || { - let f = FUSE::new( + let f = TvixStoreFs::new( blob_service, directory_service, path_info_service, |