Skip to content

Commit

Permalink
Use async_broadcast instead of async_channel for MaybeAssetLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
cart committed Sep 6, 2023
1 parent 654faa0 commit 44ef6d6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
1 change: 0 additions & 1 deletion crates/bevy_asset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }

anyhow = "1.0"
async-broadcast = "0.5"
async-channel = "1.4.2"
async-fs = "1.5"
async-lock = "2.8"
crossbeam-channel = "0.5"
Expand Down
17 changes: 11 additions & 6 deletions crates/bevy_asset/src/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,11 @@ impl AssetServer {
match maybe_loader {
MaybeAssetLoader::Ready(_) => unreachable!(),
MaybeAssetLoader::Pending { sender, .. } => {
let _ = sender.send_blocking(loader);
IoTaskPool::get()
.spawn(async move {
let _ = sender.broadcast(loader).await;
})
.detach();
}
}
}
Expand Down Expand Up @@ -169,7 +173,7 @@ impl AssetServer {

match loader {
MaybeAssetLoader::Ready(loader) => Ok(loader),
MaybeAssetLoader::Pending { receiver, .. } => Ok(receiver.recv().await.unwrap()),
MaybeAssetLoader::Pending { mut receiver, .. } => Ok(receiver.recv().await.unwrap()),
}
}

Expand All @@ -190,7 +194,7 @@ impl AssetServer {
};
match loader {
MaybeAssetLoader::Ready(loader) => Ok(loader),
MaybeAssetLoader::Pending { receiver, .. } => Ok(receiver.recv().await.unwrap()),
MaybeAssetLoader::Pending { mut receiver, .. } => Ok(receiver.recv().await.unwrap()),
}
}

Expand Down Expand Up @@ -601,7 +605,8 @@ impl AssetServer {
warn!("duplicate preregistration for `{extension}`, any assets loaded with the previous loader will never complete.");
}
}
let (sender, receiver) = async_channel::bounded(1);
let (mut sender, receiver) = async_broadcast::broadcast(1);
sender.set_overflow(true);
loaders
.values
.push(MaybeAssetLoader::Pending { sender, receiver });
Expand Down Expand Up @@ -773,8 +778,8 @@ pub(crate) struct AssetLoaders {
enum MaybeAssetLoader {
Ready(Arc<dyn ErasedAssetLoader>),
Pending {
sender: async_channel::Sender<Arc<dyn ErasedAssetLoader>>,
receiver: async_channel::Receiver<Arc<dyn ErasedAssetLoader>>,
sender: async_broadcast::Sender<Arc<dyn ErasedAssetLoader>>,
receiver: async_broadcast::Receiver<Arc<dyn ErasedAssetLoader>>,
},
}

Expand Down

0 comments on commit 44ef6d6

Please sign in to comment.