rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-25 07:06:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

VFS Improvements (#259)

Browse Source 
This PR refactors all of the methods on `Vfs` from accepting `&mut self` to
accepting `&self` and keeping data wrapped in a mutex. This builds on previous
changes to make reference count file contents and cleans up the last places
where we're returning borrowed data out of the VFS interface.

Once this change lands, there are two possible directions we can go that I see:
* Conservative: Refactor all remaining `&mut Vfs` handles to `&Vfs`
* Interesting: Embrace ref counting by changing `Vfs` methods to accept `self:
  Arc<Self>`, which makes the `VfsEntry` API no longer need an explicit `Vfs`
  argument for its operations.

* Change VfsFetcher to be immutable with internal locking
* Refactor Vfs::would_be_resident
* Refactor Vfs::read_if_not_exists
* Refactor Vfs::raise_file_removed
* Refactor Vfs::raise_file_changed
* Add Vfs::get_internal as bits of Vfs::get
* Switch Vfs to use internal locking
* Migrate all Vfs methods from &mut self to &self
* Make VfsEntry access Vfs immutably
* Remove outer VFS locking (#260)
* Refactor all snapshot middleware to accept &Vfs instead of &mut Vfs
* Remove outer VFS Mutex across the board
This commit is contained in:
Lucien Greathouse
2019-10-16 15:45:23 -07:00
committed by GitHub
parent 5123d21290
commit 82678235ab
21 changed files with 292 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/serve_session.rs
View File

@@ -52,7 +52,7 @@ pub struct ServeSession<F> {
///
/// The main use for accessing it from the session is for debugging issues
/// with Rojo's live-sync protocol.
vfs: Arc<Mutex<Vfs<F>>>,
vfs: Arc<Vfs<F>>,
/// A queue of changes that have been applied to `tree` that affect clients.
///
@@ -71,7 +71,7 @@ pub struct ServeSession<F> {
/// Methods that need thread-safety bounds on VfsFetcher are limited to this
/// block to prevent needing to spread Send + Sync + 'static into everything
/// that handles ServeSession.
impl<F: VfsFetcher + Send + 'static> ServeSession<F> {
impl<F: VfsFetcher + Send + Sync + 'static> ServeSession<F> {
/// Start a new serve session from the given in-memory filesystem and start
/// path.
///
@@ -92,7 +92,7 @@ impl<F: VfsFetcher + Send + 'static> ServeSession<F> {
let tree = Arc::new(Mutex::new(tree));
let message_queue = Arc::new(message_queue);
let vfs = Arc::new(Mutex::new(vfs));
let vfs = Arc::new(vfs);
log::trace!("Starting ChangeProcessor");
let change_processor = ChangeProcessor::start(
@@ -122,8 +122,8 @@ impl<F: VfsFetcher> ServeSession<F> {
self.tree.lock().unwrap()
}
pub fn vfs(&self) -> MutexGuard<'_, Vfs<F>> {
self.vfs.lock().unwrap()
pub fn vfs(&self) -> &Vfs<F> {
&self.vfs
}
pub fn message_queue(&self) -> &MessageQueue<AppliedPatchSet> {
@@ -179,7 +179,7 @@ mod serve_session {
#[test]
fn just_folder() {
let mut vfs = Vfs::new(NoopFetcher);
let vfs = Vfs::new(NoopFetcher);
vfs.debug_load_snapshot("/foo", VfsSnapshot::empty_dir());
@@ -191,7 +191,7 @@ mod serve_session {
#[test]
fn project_with_folder() {
let mut vfs = Vfs::new(NoopFetcher);
let vfs = Vfs::new(NoopFetcher);
vfs.debug_load_snapshot(
"/foo",
@@ -218,7 +218,7 @@ mod serve_session {
#[test]
fn script_with_meta() {
let mut vfs = Vfs::new(NoopFetcher);
let vfs = Vfs::new(NoopFetcher);
vfs.debug_load_snapshot(
"/root",