forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid exclusive lock during update_asset_storage (#909)

Browse Source 
avoid exclusive lock during `update_asset_storage`

Co-authored-by: Jay <jay@heinousjay.com>
This commit is contained in:
bg 2020-11-22 12:29:26 -08:00 committed by GitHub
parent c1e499d5fe
commit 01ba7c4425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_asset/src/asset_server.rs
View File

@ -392,7 +392,7 @@ impl AssetServer {
pub(crate) fn update_asset_storage<T: Asset>(&self, assets: &mut Assets<T>) { pub(crate) fn update_asset_storage<T: Asset>(&self, assets: &mut Assets<T>) {
let asset_lifecycles = self.server.asset_lifecycles.read(); let asset_lifecycles = self.server.asset_lifecycles.read();
let asset_lifecycle = asset_lifecycles.get(&T::TYPE_UUID).unwrap(); let asset_lifecycle = asset_lifecycles.get(&T::TYPE_UUID).unwrap();
let mut asset_sources = self.server.asset_sources.write(); let mut asset_sources_guard = None;
let channel = asset_lifecycle let channel = asset_lifecycle
.downcast_ref::<AssetLifecycleChannel<T>>() .downcast_ref::<AssetLifecycleChannel<T>>()
.unwrap(); .unwrap();
@ -402,6 +402,8 @@ impl AssetServer {
Ok(AssetLifecycleEvent::Create(result)) => { Ok(AssetLifecycleEvent::Create(result)) => {
// update SourceInfo if this asset was loaded from an AssetPath // update SourceInfo if this asset was loaded from an AssetPath
if let HandleId::AssetPathId(id) = result.id { if let HandleId::AssetPathId(id) = result.id {
let asset_sources = asset_sources_guard
.get_or_insert_with(|| self.server.asset_sources.write());
if let Some(source_info) = asset_sources.get_mut(&id.source_path_id()) { if let Some(source_info) = asset_sources.get_mut(&id.source_path_id()) {
if source_info.version == result.version { if source_info.version == result.version {
source_info.committed_assets.insert(id.label_id()); source_info.committed_assets.insert(id.label_id());
@ -416,6 +418,8 @@ impl AssetServer {
} }
Ok(AssetLifecycleEvent::Free(handle_id)) => { Ok(AssetLifecycleEvent::Free(handle_id)) => {
if let HandleId::AssetPathId(id) = handle_id { if let HandleId::AssetPathId(id) = handle_id {
let asset_sources = asset_sources_guard
.get_or_insert_with(|| self.server.asset_sources.write());
if let Some(source_info) = asset_sources.get_mut(&id.source_path_id()) { if let Some(source_info) = asset_sources.get_mut(&id.source_path_id()) {
source_info.committed_assets.remove(&id.label_id()); source_info.committed_assets.remove(&id.label_id());
if source_info.is_loaded() { if source_info.is_loaded() {