ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: ensure thread safety for _collectionsByLocal; extracted add collection logic; removed duplicate calls

Browse source 
Adding / removing collections do not require framework thread access.
It is only when assigning via AssignTemporaryCollection(), it needs to access `(ObjectManager)objects[actorIndex]` when framework thread is needed.
This commit is contained in:
mayo 2025-11-01 15:03:09 -04:00
parent c4b6e4e00b
commit 101df501c5
No known key found for this signature in database
GPG key ID: 5B138E78344184A6
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Penumbra/Collections/Manager/CollectionStorage.cs
View file

@ -33,8 +33,7 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, ISer
{ {
var newCollection = duplicate?.Duplicate(name, CurrentCollectionId, index) var newCollection = duplicate?.Duplicate(name, CurrentCollectionId, index)
?? ModCollection.CreateEmpty(name, CurrentCollectionId, index, _modStorage.Count); ?? ModCollection.CreateEmpty(name, CurrentCollectionId, index, _modStorage.Count);
_collectionsByLocal[CurrentCollectionId] = newCollection; Add(newCollection);
CurrentCollectionId += 1;
return newCollection; return newCollection;
} }
@ -43,21 +42,29 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, ISer
{ {
var newCollection = ModCollection.CreateFromData(_saveService, _modStorage, var newCollection = ModCollection.CreateFromData(_saveService, _modStorage,
new ModCollectionIdentity(id, CurrentCollectionId, name, Count), version, allSettings, inheritances); new ModCollectionIdentity(id, CurrentCollectionId, name, Count), version, allSettings, inheritances);
_collectionsByLocal[CurrentCollectionId] = newCollection; Add(newCollection);
CurrentCollectionId += 1;
return newCollection; return newCollection;
} }
public ModCollection CreateTemporary(string name, int index, int globalChangeCounter) public ModCollection CreateTemporary(string name, int index, int globalChangeCounter)
{ {
var newCollection = ModCollection.CreateTemporary(name, CurrentCollectionId, index, globalChangeCounter); var newCollection = ModCollection.CreateTemporary(name, CurrentCollectionId, index, globalChangeCounter);
_collectionsByLocal[CurrentCollectionId] = newCollection; Add(newCollection);
CurrentCollectionId += 1;
return newCollection; return newCollection;
} }
/// <remarks> Atomically add to _collectionLocal and increments _currentCollectionIdValue. </remarks>
private void Add(ModCollection newCollection)
{
_collectionsByLocal.AddOrUpdate(CurrentCollectionId,
static (_, newColl) => newColl,
static (_, _, newColl) => newColl,
newCollection);
Interlocked.Increment(ref _currentCollectionIdValue);
}
public void Delete(ModCollection collection) public void Delete(ModCollection collection)
=> _collectionsByLocal.Remove(collection.Identity.LocalId); => _collectionsByLocal.TryRemove(collection.Identity.LocalId, out _);
/// <remarks> The empty collection is always available at Index 0. </remarks> /// <remarks> The empty collection is always available at Index 0. </remarks>
private readonly List<ModCollection> _collections = private readonly List<ModCollection> _collections =
@ -66,7 +73,7 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, ISer
]; ];
/// <remarks> A list of all collections ever created still existing by their local id. </remarks> /// <remarks> A list of all collections ever created still existing by their local id. </remarks>
private readonly Dictionary<LocalCollectionId, ModCollection> private readonly ConcurrentDictionary<LocalCollectionId, ModCollection>
_collectionsByLocal = new() { [LocalCollectionId.Zero] = ModCollection.Empty }; _collectionsByLocal = new() { [LocalCollectionId.Zero] = ModCollection.Empty };
@ -186,7 +193,6 @@ public class CollectionStorage : IReadOnlyList<ModCollection>, IDisposable, ISer
// Update indices. // Update indices.
for (var i = collection.Identity.Index; i < Count; ++i) for (var i = collection.Identity.Index; i < Count; ++i)
_collections[i].Identity.Index = i; _collections[i].Identity.Index = i;
_collectionsByLocal.Remove(collection.Identity.LocalId);
Penumbra.Messager.NotificationMessage($"Deleted collection {collection.Identity.AnonymizedName}.", NotificationType.Success, false); Penumbra.Messager.NotificationMessage($"Deleted collection {collection.Identity.AnonymizedName}.", NotificationType.Success, false);
_communicator.CollectionChange.Invoke(CollectionType.Inactive, collection, null, string.Empty); _communicator.CollectionChange.Invoke(CollectionType.Inactive, collection, null, string.Empty);