From 046483b9da145f8f26cee049e79d524aefcae7b3 Mon Sep 17 00:00:00 2001 From: Eero Date: Mon, 29 Dec 2025 11:18:11 +0800 Subject: [PATCH] Revert "OBT1.1.0 Merge branch 'dev_pte' into dev" This reverts commit 177cf897564637eda24d057747db2f8830296b12, reversing changes made to 42ba733cd45957110eec984983bdc15901b3daae. --- .github/workflows/publish-release.yml | 13 +- .gitignore | 2 - .../Characters/Health/CharacterHealth.cs | 2 +- .../ClientSource/GameSession/CrewManager.cs | 4 +- .../ClientSource/Items/Inventory.cs | 2 +- .../ClientSource/Map/MapEntity.cs | 4 +- .../ClientSource/Sounds/SoundChannel.cs | 152 ++++---- .../ClientSource/Sounds/SoundManager.cs | 58 +-- .../ServerSource/Networking/Client.cs | 2 +- .../Networking/FileTransfer/FileSender.cs | 4 +- .../ServerSource/Networking/GameServer.cs | 14 +- .../ServerSource/Networking/KarmaManager.cs | 2 +- .../ServerSource/Networking/RespawnManager.cs | 2 +- .../SharedSource/AchievementManager.cs | 5 +- .../SharedSource/Characters/AI/AITarget.cs | 56 +-- .../Characters/AI/HumanAIController.cs | 18 +- .../Characters/AI/NPCConversation.cs | 26 +- .../AI/Objectives/AIObjectiveCleanupItem.cs | 2 +- .../AI/Objectives/AIObjectiveCleanupItems.cs | 2 +- .../AI/Objectives/AIObjectiveFindThieves.cs | 4 +- .../SharedSource/Characters/AI/Order.cs | 4 +- .../Characters/Animation/Ragdoll.cs | 50 +-- .../SharedSource/Characters/Character.cs | 80 +--- .../Characters/Health/CharacterHealth.cs | 139 +++---- .../SharedSource/Characters/Limb.cs | 24 +- .../Params/Animation/AnimationParams.cs | 34 +- .../Params/Ragdoll/RagdollParams.cs | 29 +- .../Characters/Talents/CharacterTalent.cs | 6 +- .../ContentFile/NPCConversationsFile.cs | 6 +- .../SharedSource/DebugConsole.cs | 6 +- .../SharedSource/Events/EventManager.cs | 2 +- .../SharedSource/Events/MalfunctionEvent.cs | 2 +- .../Missions/AbandonedOutpostMission.cs | 2 +- .../Events/Missions/EndMission.cs | 2 +- .../Events/Missions/PirateMission.cs | 2 +- .../SharedSource/GameSession/CrewManager.cs | 4 +- .../SharedSource/GameSession/GameSession.cs | 3 +- .../Items/Components/DockingPort.cs | 20 +- .../SharedSource/Items/Components/Door.cs | 39 +- .../Items/Components/ElectricalDischarger.cs | 12 +- .../Items/Components/Holdable/Holdable.cs | 52 +-- .../Components/Holdable/LevelResource.cs | 35 +- .../Items/Components/Holdable/MeleeWeapon.cs | 12 +- .../Items/Components/Holdable/RepairTool.cs | 32 +- .../Items/Components/ItemComponent.cs | 3 +- .../Items/Components/ItemContainer.cs | 9 +- .../SharedSource/Items/Components/Ladder.cs | 10 +- .../Items/Components/Machines/Controller.cs | 11 +- .../Items/Components/Machines/Sonar.cs | 23 +- .../Items/Components/Machines/Steering.cs | 2 +- .../Items/Components/Power/PowerTransfer.cs | 119 +++--- .../Items/Components/Power/Powered.cs | 108 +----- .../Items/Components/Projectile.cs | 6 +- .../Items/Components/Repairable.cs | 9 +- .../Items/Components/Signal/Connection.cs | 43 +-- .../Components/Signal/ConnectionPanel.cs | 20 +- .../Items/Components/Signal/DelayComponent.cs | 30 +- .../Items/Components/Signal/RelayComponent.cs | 6 +- .../Items/Components/Signal/WifiComponent.cs | 15 +- .../Items/Components/Signal/Wire.cs | 7 +- .../Items/Components/TriggerComponent.cs | 38 +- .../SharedSource/Items/Inventory.cs | 3 +- .../SharedSource/Items/Item.cs | 363 ++++-------------- .../Map/Creatures/BallastFloraBehavior.cs | 109 +----- .../SharedSource/Map/Entity.cs | 14 +- .../SharedSource/Map/Explosion.cs | 7 +- .../BarotraumaShared/SharedSource/Map/Gap.cs | 60 +-- .../BarotraumaShared/SharedSource/Map/Hull.cs | 128 +----- .../SharedSource/Map/Levels/Level.cs | 8 +- .../SharedSource/Map/Map/Location.cs | 2 +- .../SharedSource/Map/MapEntity.cs | 228 ++--------- .../SharedSource/Map/Structure.cs | 60 +-- .../SharedSource/Map/Submarine.cs | 157 +++----- .../SharedSource/Map/WayPoint.cs | 62 +-- .../SharedSource/Networking/Client.cs | 8 +- .../SharedSource/Networking/EntitySpawner.cs | 2 +- .../Networking/INetSerializableStruct.cs | 23 +- .../SharedSource/Networking/NetworkMember.cs | 14 +- .../SharedSource/Physics/PhysicsBody.cs | 61 +-- .../SharedSource/Physics/PhysicsBodyQueue.cs | 155 -------- .../SharedSource/Screens/GameScreen.cs | 51 +-- .../StatusEffects/DelayedEffect.cs | 96 ++--- .../StatusEffects/StatusEffect.cs | 176 ++------- .../SharedSource/Utils/ToolBox.cs | 29 +- .../Collision/DynamicTree.cs | 48 +-- README.md | 2 +- 86 files changed, 800 insertions(+), 2496 deletions(-) delete mode 100644 Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBodyQueue.cs diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d4283cdd3..5d63b200d 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -23,16 +23,13 @@ on: env: CI_DIR: 2049ef39-42a2-46d2-b513-ee6d2e3a7b15 RELEASES: | + windows:client:Windows/Client windows:server:Windows/Server + linux:client:Linux/Client linux:server:Linux/Server + mac:client:Mac/Client/Barotrauma.app/Contents/MacOS mac:server:Mac/Server - ARCHIVE_BASE_NAME: luacsforbarotraumaEP - - # windows:client:Windows/Client - # linux:client:Linux/Client - # mac:client:Mac/Client/Barotrauma.app/Contents/MacOS - # we do not currently provide a CL - + ARCHIVE_BASE_NAME: luacsforbarotrauma # XXX: these file names are subject to shell expansion. # Be careful when using special characters. ARCHIVE_FILES_SERVER: | @@ -214,4 +211,4 @@ jobs: files: | ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_{windows,linux,mac}_{client,server}.zip ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_{build,patch}_linux_{client,server}.tar.gz - ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_refs.zip + ${{ env.CI_DIR }}/archives/${{ env.ARCHIVE_BASE_NAME }}_refs.zip \ No newline at end of file diff --git a/.gitignore b/.gitignore index 56e643245..287132dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -60,5 +60,3 @@ Deploy/DeployAll/PrivateKey.* #Rider *.DotSettings.user .vscode/settings.json -.vscode/launch.json -.vscode/tasks.json diff --git a/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs index 0c126392c..9e38c0b43 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Characters/Health/CharacterHealth.cs @@ -2143,7 +2143,7 @@ namespace Barotrauma if (existingAffliction == null) { existingAffliction = afflictionPrefab.Instantiate(strength); - afflictions.TryAdd(existingAffliction, limb); + afflictions.Add(existingAffliction, limb); newAdded = true; } existingAffliction.SetStrength(strength); diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs index 91600e24c..f6bce310a 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GameSession/CrewManager.cs @@ -867,7 +867,7 @@ namespace Barotrauma { foreach (var stackedItem in item.GetStackedItems()) { - Item.MarkForDeconstruction(stackedItem); + Item.DeconstructItems.Add(stackedItem); } HintManager.OnItemMarkedForDeconstruction(order.OrderGiver); } @@ -875,7 +875,7 @@ namespace Barotrauma { foreach (var stackedItem in item.GetStackedItems()) { - Item.UnmarkForDeconstruction(stackedItem); + Item.DeconstructItems.Remove(stackedItem); } } } diff --git a/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs b/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs index 88168faec..21f681e5e 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs @@ -1891,7 +1891,7 @@ namespace Barotrauma } } - else if (Item.IsMarkedForDeconstruction(item) && + else if (Item.DeconstructItems.Contains(item) && OrderPrefab.Prefabs.TryGet(Tags.DeconstructThis, out OrderPrefab deconstructOrder)) { DrawSideIcon(deconstructOrder.SymbolSprite, Direction.Right, TextManager.Get("tooltip.markedfordeconstruction"), GUIStyle.Red, out bool mouseOn); diff --git a/Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs b/Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs index 2d9eea200..65363372a 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs @@ -471,11 +471,11 @@ namespace Barotrauma if (item0 == null && item1 != null) { - item0 = Item.ItemList.FirstOrDefault(it => it.GetComponent()?.DisconnectedWires.Contains(wire) ?? false); + item0 = Item.ItemList.Find(it => it.GetComponent()?.DisconnectedWires.Contains(wire) ?? false); } else if (item0 != null && item1 == null) { - item1 = Item.ItemList.FirstOrDefault(it => it.GetComponent()?.DisconnectedWires.Contains(wire) ?? false); + item1 = Item.ItemList.Find(it => it.GetComponent()?.DisconnectedWires.Contains(wire) ?? false); } if (item0 != null && item1 != null && SelectedList.Contains(item0) && SelectedList.Contains(item1)) { diff --git a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundChannel.cs b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundChannel.cs index ade827da5..df9d68998 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundChannel.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundChannel.cs @@ -503,102 +503,86 @@ namespace Barotrauma.Sounds mutex = new object(); } - // Use the playingChannels lock to protect both channel assignment AND OpenAL operations. - // This prevents race conditions when multiple threads try to play sounds simultaneously - // (e.g., during Parallel.ForEach in MapEntity.UpdateAll). - int poolIndex = (int)sound.SourcePoolIndex; - object channelsLock = sound.Owner.GetPlayingChannelsLock(sound.SourcePoolIndex); - #if !DEBUG try { #endif - lock (channelsLock) + if (mutex != null) { Monitor.Enter(mutex); } + if (sound.Owner.CountPlayingInstances(sound) < sound.MaxSimultaneousInstances) { - if (mutex != null) { Monitor.Enter(mutex); } - try + ALSourceIndex = sound.Owner.AssignFreeSourceToChannel(this); + } + + if (ALSourceIndex >= 0) + { + if (!IsStream) { - if (sound.Owner.CountPlayingInstancesUnsafe(sound, poolIndex) < sound.MaxSimultaneousInstances) + Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, 0); + int alError = Al.GetError(); + if (alError != Al.NoError) { - ALSourceIndex = sound.Owner.AssignFreeSourceToChannelUnsafe(this, poolIndex); + throw new Exception("Failed to reset source buffer: " + debugName + ", " + Al.GetErrorString(alError)); } - if (ALSourceIndex >= 0) + Sound.FillAlBuffers(); + if (Sound.Buffers is not { AlBuffer: not 0, AlMuffledBuffer: not 0 }) { return; } + + uint alBuffer = sound.Owner.GetCategoryMuffle(category) || muffled ? Sound.Buffers.AlMuffledBuffer : Sound.Buffers.AlBuffer; + Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, (int)alBuffer); + alError = Al.GetError(); + if (alError != Al.NoError) { - if (!IsStream) - { - Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, 0); - int alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to reset source buffer: " + debugName + ", " + Al.GetErrorString(alError)); - } + throw new Exception("Failed to bind buffer to source (" + ALSourceIndex.ToString() + ":" + sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex) + "," + alBuffer.ToString() + "): " + debugName + ", " + Al.GetErrorString(alError)); + } - Sound.FillAlBuffers(); - if (Sound.Buffers is not { AlBuffer: not 0, AlMuffledBuffer: not 0 }) { return; } + SetProperties(); - uint alBuffer = sound.Owner.GetCategoryMuffle(category) || muffled ? Sound.Buffers.AlMuffledBuffer : Sound.Buffers.AlBuffer; - Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, (int)alBuffer); - alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to bind buffer to source (" + ALSourceIndex.ToString() + ":" + sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex) + "," + alBuffer.ToString() + "): " + debugName + ", " + Al.GetErrorString(alError)); - } - - SetProperties(); - - Al.SourcePlay(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex)); - alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to play source: " + debugName + ", " + Al.GetErrorString(alError)); - } - } - else - { - uint alBuffer = 0; - Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, (int)alBuffer); - int alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to reset source buffer: " + debugName + ", " + Al.GetErrorString(alError)); - } - - Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Looping, Al.False); - alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to set stream looping state: " + debugName + ", " + Al.GetErrorString(alError)); - } - - streamShortBuffer = new short[STREAM_BUFFER_SIZE]; - - streamBuffers = new uint[4]; - unqueuedBuffers = new uint[4]; - streamBufferAmplitudes = new float[4]; - for (int i = 0; i < 4; i++) - { - Al.GenBuffer(out streamBuffers[i]); - - alError = Al.GetError(); - if (alError != Al.NoError) - { - throw new Exception("Failed to generate stream buffers: " + debugName + ", " + Al.GetErrorString(alError)); - } - - if (!Al.IsBuffer(streamBuffers[i])) - { - throw new Exception("Generated streamBuffer[" + i.ToString() + "] is invalid! " + debugName); - } - } - Sound.Owner.InitUpdateChannelThread(); - SetProperties(); - } + Al.SourcePlay(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex)); + alError = Al.GetError(); + if (alError != Al.NoError) + { + throw new Exception("Failed to play source: " + debugName + ", " + Al.GetErrorString(alError)); } } - finally + else { - if (mutex != null) { Monitor.Exit(mutex); } + uint alBuffer = 0; + Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Buffer, (int)alBuffer); + int alError = Al.GetError(); + if (alError != Al.NoError) + { + throw new Exception("Failed to reset source buffer: " + debugName + ", " + Al.GetErrorString(alError)); + } + + Al.Sourcei(sound.Owner.GetSourceFromIndex(Sound.SourcePoolIndex, ALSourceIndex), Al.Looping, Al.False); + alError = Al.GetError(); + if (alError != Al.NoError) + { + throw new Exception("Failed to set stream looping state: " + debugName + ", " + Al.GetErrorString(alError)); + } + + streamShortBuffer = new short[STREAM_BUFFER_SIZE]; + + streamBuffers = new uint[4]; + unqueuedBuffers = new uint[4]; + streamBufferAmplitudes = new float[4]; + for (int i = 0; i < 4; i++) + { + Al.GenBuffer(out streamBuffers[i]); + + alError = Al.GetError(); + if (alError != Al.NoError) + { + throw new Exception("Failed to generate stream buffers: " + debugName + ", " + Al.GetErrorString(alError)); + } + + if (!Al.IsBuffer(streamBuffers[i])) + { + throw new Exception("Generated streamBuffer[" + i.ToString() + "] is invalid! " + debugName); + } + } + Sound.Owner.InitUpdateChannelThread(); + SetProperties(); } } #if !DEBUG @@ -607,6 +591,12 @@ namespace Barotrauma.Sounds { throw; } + finally + { +#endif + if (mutex != null) { Monitor.Exit(mutex); } +#if !DEBUG + } #endif void SetProperties() diff --git a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundManager.cs b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundManager.cs index e320bf3d9..0826aa2d3 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundManager.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundManager.cs @@ -417,15 +417,6 @@ namespace Barotrauma.Sounds return sourcePools[(int)poolIndex].ALSources[srcInd]; } - /// - /// Gets the lock object for the playing channels array for a specific pool. - /// Used to protect OpenAL operations that need to be atomic with channel assignment. - /// - public object GetPlayingChannelsLock(SourcePoolIndex poolIndex) - { - return playingChannels[(int)poolIndex]; - } - public int AssignFreeSourceToChannel(SoundChannel newChannel) { if (Disabled) { return -1; } @@ -436,25 +427,14 @@ namespace Barotrauma.Sounds lock (playingChannels[poolIndex]) { - return AssignFreeSourceToChannelUnsafe(newChannel, poolIndex); - } - } - - /// - /// Assigns a free source to a channel without locking. - /// Caller MUST hold the playingChannels[poolIndex] lock before calling this method. - /// - public int AssignFreeSourceToChannelUnsafe(SoundChannel newChannel, int poolIndex) - { - if (Disabled) { return -1; } - - for (int i = 0; i < playingChannels[poolIndex].Length; i++) - { - if (playingChannels[poolIndex][i] == null || !playingChannels[poolIndex][i].IsPlaying) + for (int i = 0; i < playingChannels[poolIndex].Length; i++) { - if (playingChannels[poolIndex][i] != null) { playingChannels[poolIndex][i].Dispose(); } - playingChannels[poolIndex][i] = newChannel; - return i; + if (playingChannels[poolIndex][i] == null || !playingChannels[poolIndex][i].IsPlaying) + { + if (playingChannels[poolIndex][i] != null) { playingChannels[poolIndex][i].Dispose(); } + playingChannels[poolIndex][i] = newChannel; + return i; + } } } @@ -496,25 +476,13 @@ namespace Barotrauma.Sounds int count = 0; lock (playingChannels[(int)sound.SourcePoolIndex]) { - count = CountPlayingInstancesUnsafe(sound, (int)sound.SourcePoolIndex); - } - return count; - } - - /// - /// Counts playing instances without locking. - /// Caller MUST hold the playingChannels[poolIndex] lock before calling this method. - /// - public int CountPlayingInstancesUnsafe(Sound sound, int poolIndex) - { - if (Disabled) { return 0; } - int count = 0; - for (int i = 0; i < playingChannels[poolIndex].Length; i++) - { - if (playingChannels[poolIndex][i] != null && - playingChannels[poolIndex][i].Sound.Filename == sound.Filename) + for (int i = 0; i < playingChannels[(int)sound.SourcePoolIndex].Length; i++) { - if (playingChannels[poolIndex][i].IsPlaying) { count++; }; + if (playingChannels[(int)sound.SourcePoolIndex][i] != null && + playingChannels[(int)sound.SourcePoolIndex][i].Sound.Filename == sound.Filename) + { + if (playingChannels[(int)sound.SourcePoolIndex][i].IsPlaying) { count++; }; + } } } return count; diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/Client.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/Client.cs index 6b1a3bd86..a89bd2c3b 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/Client.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/Client.cs @@ -126,7 +126,7 @@ namespace Barotrauma.Networking if (!MathUtils.NearlyEqual(karma, syncedKarma, 10.0f)) { syncedKarma = karma; - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; } } } diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/FileTransfer/FileSender.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/FileTransfer/FileSender.cs index 5632b80e0..6d5fa3619 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/FileTransfer/FileSender.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/FileTransfer/FileSender.cs @@ -174,7 +174,7 @@ namespace Barotrauma.Networking StartTime = DateTime.Now; OnStarted(transfer); - GameMain.Server.IncrementLastClientListUpdateID(); + GameMain.Server.LastClientListUpdateID++; return transfer; } @@ -204,7 +204,7 @@ namespace Barotrauma.Networking if (numRemoved > 0 || endedTransfers.Count > 0) { - GameMain.Server.IncrementLastClientListUpdateID(); + GameMain.Server.LastClientListUpdateID++; } } diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs index ad967ce8f..d4538fe6a 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs @@ -327,7 +327,7 @@ namespace Barotrauma.Networking } } - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; if (newClient.Connection == OwnerConnection && OwnerConnection != null) { @@ -3222,7 +3222,7 @@ namespace Barotrauma.Networking initiatedStartGame = false; GameMain.ResetFrameTime(); - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; roundStartTime = DateTime.Now; @@ -3532,7 +3532,7 @@ namespace Barotrauma.Networking { var coolDownRemaining = Client.NameChangeCoolDown - timeSinceNameChange; SendDirectChatMessage($"ServerMessage.NameChangeFailedCooldownActive~[seconds]={(int)coolDownRemaining.TotalSeconds}", c); - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; //increment the ID to make sure the current server-side name is treated as the "latest", //and the client correctly reverts back to the old name c.NameId++; @@ -3545,7 +3545,7 @@ namespace Barotrauma.Networking if (result != null) { - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; return result.Value; } @@ -3562,14 +3562,14 @@ namespace Barotrauma.Networking c.Name = newName; c.RejectedName = string.Empty; SendChatMessage($"ServerMessage.NameChangeSuccessful~[oldname]={oldName}~[newname]={newName}", ChatMessageType.Server); - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; return true; } else { //update client list even if the name cannot be changed to the one sent by the client, //so the client will be informed what their actual name is - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; return false; } } @@ -4857,7 +4857,7 @@ namespace Barotrauma.Networking private void UpdateClientLobbies() { // Triggers a call to WriteClientList(), which causes clients to call GameClient.ReadClientList() - IncrementLastClientListUpdateID(); + LastClientListUpdateID++; } private List GetPlayingClients() diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/KarmaManager.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/KarmaManager.cs index 9a325a12b..6bab9e4ec 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/KarmaManager.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/KarmaManager.cs @@ -163,7 +163,7 @@ namespace Barotrauma { client.Character.CharacterHealth.ApplyAffliction(null, new Affliction(herpesAffliction, herpesStrength)); GameServer.Log($"{GameServer.ClientLogName(client)} has contracted space herpes due to low karma.", ServerLog.MessageType.Karma); - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; } else if (existingAffliction != null) { diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs index 2b54023dd..b83376d66 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs @@ -279,7 +279,7 @@ namespace Barotrauma.Networking var shuttleGaps = Gap.GapList.FindAll(g => RespawnShuttles.Contains(g.Submarine) && g.ConnectedWall != null); shuttleGaps.ForEach(g => Spawner.AddEntityToRemoveQueue(g)); - var dockingPorts = Item.ItemList.Where(i => RespawnShuttles.Contains(i.Submarine) && i.GetComponent() != null).ToList(); + var dockingPorts = Item.ItemList.FindAll(i => RespawnShuttles.Contains(i.Submarine) && i.GetComponent() != null); dockingPorts.ForEach(d => d.GetComponent().Undock()); if (!IsShuttleInsideLevel || DateTime.Now > teamSpecificState.DespawnTime) diff --git a/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs b/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs index 6e06d8b33..a4feacedd 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs @@ -156,8 +156,7 @@ namespace Barotrauma Reactor reactor = item.GetComponent(); if (reactor != null && reactor.Item.Condition > 0.0f) { roundData.Reactors.Add(reactor); } } - - pathFinder = new PathFinder(WayPoint.WayPointList.ToList(), false); + pathFinder = new PathFinder(WayPoint.WayPointList, false); cachedDistances.Clear(); #if CLIENT @@ -324,7 +323,7 @@ namespace Barotrauma static CachedDistance CalculateNewCachedDistance(Character c) { - pathFinder ??= new PathFinder(WayPoint.WayPointList.ToList(), false); + pathFinder ??= new PathFinder(WayPoint.WayPointList, false); var path = pathFinder.FindPath(ConvertUnits.ToSimUnits(c.WorldPosition), ConvertUnits.ToSimUnits(Submarine.MainSub.WorldPosition)); if (path.Unreachable) { return null; } return new CachedDistance(c.WorldPosition, Submarine.MainSub.WorldPosition, path.TotalLength, Timing.TotalTime + Rand.Range(1.0f, 5.0f)); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AITarget.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AITarget.cs index 8c246a8c5..6501c1333 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AITarget.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/AITarget.cs @@ -1,67 +1,13 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; -using System.Linq; -using System.Threading; using System.Xml.Linq; namespace Barotrauma { - /// - /// Thread-safe wrapper for AITarget list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - class ThreadSafeAITargetList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(AITarget target) - { - lock (_writeLock) - { - var newList = new List(_list) { target }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(AITarget target) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(target); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(AITarget target) => _list.Contains(target); - - public AITarget this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - public List ToList() => new List(_list); - public AITarget FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any(Func predicate) => _list.Any(predicate); - } - partial class AITarget { - public static ThreadSafeAITargetList List = new ThreadSafeAITargetList(); + public static List List = new List(); private Entity entity; public Entity Entity diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs index 4479bdb81..e84df22f7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs @@ -5,7 +5,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; namespace Barotrauma { @@ -1818,9 +1817,7 @@ namespace Barotrauma public static bool HasDivingMask(Character character, float conditionPercentage = 0, bool requireOxygenTank = true) => HasItem(character, Tags.LightDivingGear, out _, requireOxygenTank ? Tags.OxygenSource : Identifier.Empty, conditionPercentage, requireEquipped: true); - // ThreadLocal to ensure thread safety - each thread gets its own list instance - private static readonly ThreadLocal> matchingItemsLocal = new ThreadLocal>(() => new List()); - private static List matchingItems => matchingItemsLocal.Value; + private static List matchingItems = new List(); /// /// Note: uses a single list for matching items. The item is reused each time when the method is called. So if you use the method twice, and then refer to the first items, you'll actually get the second. @@ -1828,16 +1825,15 @@ namespace Barotrauma /// public static bool HasItem(Character character, Identifier tagOrIdentifier, out IEnumerable items, Identifier containedTag = default, float conditionPercentage = 0, bool requireEquipped = false, bool recursive = true, Func predicate = null) { - var localMatchingItems = matchingItems; - localMatchingItems.Clear(); - items = localMatchingItems; + matchingItems.Clear(); + items = matchingItems; if (character?.Inventory == null) { return false; } - character.Inventory.FindAllItems(i => (i.Prefab.Identifier == tagOrIdentifier || i.HasTag(tagOrIdentifier)) && + matchingItems = character.Inventory.FindAllItems(i => (i.Prefab.Identifier == tagOrIdentifier || i.HasTag(tagOrIdentifier)) && i.ConditionPercentage >= conditionPercentage && (!requireEquipped || character.HasEquippedItem(i)) && - (predicate == null || predicate(i)), recursive, localMatchingItems); - items = localMatchingItems; - foreach (var item in localMatchingItems) + (predicate == null || predicate(i)), recursive, matchingItems); + items = matchingItems; + foreach (var item in matchingItems) { if (item == null) { continue; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/NPCConversation.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/NPCConversation.cs index e1f2842fe..d1ca09d38 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/NPCConversation.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/NPCConversation.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using Barotrauma.IO; using System.Linq; @@ -10,8 +9,7 @@ namespace Barotrauma { class NPCConversationCollection : Prefab { - // Thread-safe dictionary for language-based collections - public static readonly ConcurrentDictionary> Collections = new ConcurrentDictionary>(); + public static readonly Dictionary> Collections = new Dictionary>(); public readonly LanguageIdentifier Language; @@ -162,24 +160,7 @@ namespace Barotrauma return currentFlags; } - // Thread-safe previous conversations tracking using copy-on-write pattern - private static volatile List _previousConversations = new List(); - private static readonly object _previousConversationsLock = new object(); - private static List previousConversations => _previousConversations; - - private static void AddToPreviousConversations(NPCConversation conversation) - { - lock (_previousConversationsLock) - { - var newList = new List(_previousConversations); - newList.Insert(0, conversation); - if (newList.Count > MaxPreviousConversations) - { - newList.RemoveAt(MaxPreviousConversations); - } - _previousConversations = newList; - } - } + private static readonly List previousConversations = new List(); public static List<(Character speaker, string line)> CreateRandom(List availableSpeakers) { @@ -300,7 +281,8 @@ namespace Barotrauma if (baseConversation == null) { - AddToPreviousConversations(selectedConversation); + previousConversations.Insert(0, selectedConversation); + if (previousConversations.Count > MaxPreviousConversations) previousConversations.RemoveAt(MaxPreviousConversations); } lineList.Add((speaker, selectedConversation.Line)); CreateConversation(availableSpeakers, assignedSpeakers, selectedConversation, lineList, availableConversations); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItem.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItem.cs index 6b90cd48d..e110e20c1 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItem.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItem.cs @@ -119,7 +119,7 @@ namespace Barotrauma protected override bool CheckObjectiveState() { - if (item.IgnoreByAI(character) || Item.IsMarkedForDeconstruction(item)) + if (item.IgnoreByAI(character) || Item.DeconstructItems.Contains(item)) { Abandon = true; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItems.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItems.cs index 89fea879b..b5304e13c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItems.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCleanupItems.cs @@ -114,7 +114,7 @@ namespace Barotrauma if (!allowUnloading) { return false; } if (requireValidContainer && !IsValidContainer(item.Container, character)) { return false; } } - if (ignoreItemsMarkedForDeconstruction && Item.IsMarkedForDeconstruction(item)) { return false; } + if (ignoreItemsMarkedForDeconstruction && Item.DeconstructItems.Contains(item)) { return false; } if (!item.HasAccess(character)) { return false; } if (character != null && !IsItemInsideValidSubmarine(item, character)) { return false; } if (item.HasBallastFloraInHull) { return false; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindThieves.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindThieves.cs index b764a781e..59601f26e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindThieves.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindThieves.cs @@ -1,6 +1,5 @@ #nullable enable using Microsoft.Xna.Framework; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using Barotrauma.Items.Components; @@ -69,9 +68,8 @@ namespace Barotrauma /// /// When did the character last inspect whether some other character has stolen items on them? - /// Thread-safe dictionary for concurrent access. /// - private static readonly ConcurrentDictionary lastInspectionTimes = new ConcurrentDictionary(); + private static readonly Dictionary lastInspectionTimes = new Dictionary(); private const float NormalInspectionInterval = 120.0f; private const float CriminalInspectionInterval = 30.0f; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Order.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Order.cs index 4a343171a..8ca9bedf5 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Order.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Order.cs @@ -440,7 +440,7 @@ namespace Barotrauma if (Identifier == Tags.DeconstructThis && item.AllowDeconstruct) { - if (item.AllowDeconstruct && !Item.IsMarkedForDeconstruction(item) && + if (item.AllowDeconstruct && !Item.DeconstructItems.Contains(item) && //only allow deconstructing if there are no deconstruction recipes (= deconstructing yields nothing), or deconstruction recipes that (item.Prefab.DeconstructItems.None() || item.Prefab.DeconstructItems.Any(deconstructItem => @@ -454,7 +454,7 @@ namespace Barotrauma } else if (Identifier == Tags.DontDeconstructThis) { - if (Item.IsMarkedForDeconstruction(item)) { return true; } + if (Item.DeconstructItems.Contains(item)) { return true; } } ImmutableArray targetItems = GetTargetItems(option); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs index 74ddd1820..5b7d36724 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs @@ -5,10 +5,8 @@ using FarseerPhysics.Dynamics.Contacts; using FarseerPhysics.Dynamics.Joints; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Xml.Linq; using Barotrauma.Extensions; using LimbParams = Barotrauma.RagdollParams.LimbParams; @@ -27,33 +25,7 @@ namespace Barotrauma /// const float MaxImpactDamage = 0.1f; - // Thread-safe list using copy-on-write pattern (ConcurrentBag doesn't support indexer/Remove) - private static volatile List _list = new List(); - private static readonly object _listLock = new object(); - private static List list => _list; - - private static void ListAdd(Ragdoll ragdoll) - { - lock (_listLock) - { - var newList = new List(_list) { ragdoll }; - Interlocked.Exchange(ref _list, newList); - } - } - - private static bool ListRemove(Ragdoll ragdoll) - { - lock (_listLock) - { - var newList = new List(_list); - bool removed = newList.Remove(ragdoll); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } + private static readonly List list = new List(); struct Impact { @@ -73,8 +45,7 @@ namespace Barotrauma } } - // Thread-safe queue for physics collision callbacks - private readonly ConcurrentQueue impactQueue = new ConcurrentQueue(); + private readonly Queue impactQueue = new Queue(); protected Hull currentHull; @@ -496,7 +467,7 @@ namespace Barotrauma public Ragdoll(Character character, string seed, RagdollParams ragdollParams = null) { - ListAdd(this); + list.Add(this); this.character = character; Recreate(ragdollParams ?? RagdollParams); } @@ -773,7 +744,10 @@ namespace Barotrauma { if (!f2.IsSensor) { - impactQueue.Enqueue(new Impact(f1, f2, contact, velocity)); + lock (impactQueue) + { + impactQueue.Enqueue(new Impact(f1, f2, contact, velocity)); + } } return true; } @@ -845,7 +819,10 @@ namespace Barotrauma } } - impactQueue.Enqueue(new Impact(f1, f2, contact, velocity)); + lock (impactQueue) + { + impactQueue.Enqueue(new Impact(f1, f2, contact, velocity)); + } return true; } @@ -1297,8 +1274,9 @@ namespace Barotrauma { if (!character.Enabled || character.Removed || Frozen || Invalid || Collider == null || Collider.Removed) { return; } - while (impactQueue.TryDequeue(out var impact)) + while (impactQueue.Count > 0) { + var impact = impactQueue.Dequeue(); ApplyImpact(impact.F1, impact.F2, impact.LocalNormal, impact.ImpactPos, impact.Velocity); } @@ -2347,7 +2325,7 @@ namespace Barotrauma LimbJoints = null; } - ListRemove(this); + list.Remove(this); } public static void RemoveAll() diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs index 2ab6d6a68..af94426d0 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs @@ -7,12 +7,10 @@ using FarseerPhysics; using FarseerPhysics.Dynamics; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using System.Threading; using System.Xml.Linq; #if SERVER using System.Text; @@ -30,70 +28,12 @@ namespace Barotrauma public readonly record struct TalentResistanceIdentifier(Identifier ResistanceIdentifier, Identifier TalentIdentifier); - /// - /// Thread-safe wrapper for character list operations. - /// Provides lock-free read operations and synchronized write operations. - /// - class ThreadSafeCharacterList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(Character character) - { - lock (_writeLock) - { - var newList = new List(_list) { character }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(Character character) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(character); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(Character character) => _list.Contains(character); - - public Character this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly snapshot for complex queries - public List ToList() => new List(_list); - - public Character FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public Character Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any(Func predicate) => _list.Any(predicate); - public bool None(Func predicate) => !_list.Any(predicate); - public int CountWhere(Func predicate) => _list.Count(predicate); - } - partial class Character : Entity, IDamageable, ISerializableEntity, IClientSerializable, IServerPositionSync { - public static readonly ThreadSafeCharacterList CharacterList = new ThreadSafeCharacterList(); + public static readonly List CharacterList = new List(); public static int CharacterUpdateInterval = 1; - private static volatile int characterUpdateTick = 1; + private static int characterUpdateTick = 1; public const float MaxHighlightDistance = 150.0f; public const float MaxDragDistance = 200.0f; @@ -2821,11 +2761,10 @@ namespace Barotrauma } int itemsPerFrame = IsOnPlayerTeam ? 100 : 10; int checkedItemCount = 0; - var cachedItems = Item.GetCachedItemList(); - for (int i = 0; i < itemsPerFrame && itemIndex < cachedItems.Count; i++, itemIndex++) + for (int i = 0; i < itemsPerFrame && itemIndex < Item.ItemList.Count; i++, itemIndex++) { checkedItemCount++; - var item = cachedItems[itemIndex]; + var item = Item.ItemList[itemIndex]; if (!item.IsInteractable(this)) { continue; } if (ignoredItems != null && ignoredItems.Contains(item)) { continue; } if (item.Submarine == null) { continue; } @@ -2861,10 +2800,10 @@ namespace Barotrauma } } targetItem = _foundItem; - bool completed = itemIndex >= cachedItems.Count - 1; + bool completed = itemIndex >= Item.ItemList.Count - 1; if (HumanAIController.DebugAI && checkedItemCount > 0 && targetItem != null && StopWatch.ElapsedMilliseconds > 1) { - var msg = $"Went through {checkedItemCount} of total {cachedItems.Count} items. Found item {targetItem.Name} in {StopWatch.ElapsedMilliseconds} ms. Completed: {completed}"; + var msg = $"Went through {checkedItemCount} of total {Item.ItemList.Count} items. Found item {targetItem.Name} in {StopWatch.ElapsedMilliseconds} ms. Completed: {completed}"; if (StopWatch.ElapsedMilliseconds > 5) { DebugConsole.ThrowError(msg); @@ -4880,11 +4819,7 @@ namespace Barotrauma HealthUpdateInterval = 0.0f; } - // Thread-static to avoid concurrent modification in parallel item updates - [ThreadStatic] - private static List t_statusEffectTargets; - private static List StatusEffectTargets => t_statusEffectTargets ??= new List(); - + private readonly List targets = new List(); public void ApplyStatusEffects(ActionType actionType, float deltaTime) { if (actionType == ActionType.OnEating) @@ -4913,7 +4848,6 @@ namespace Barotrauma if (statusEffect.HasTargetType(StatusEffect.TargetType.NearbyItems) || statusEffect.HasTargetType(StatusEffect.TargetType.NearbyCharacters)) { - var targets = StatusEffectTargets; targets.Clear(); statusEffect.AddNearbyTargets(WorldPosition, targets); statusEffect.Apply(actionType, deltaTime, this, targets); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs index 03fecbc34..13f91414a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs @@ -3,13 +3,15 @@ using Barotrauma.Extensions; using Barotrauma.Networking; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Threading; using System.Xml.Linq; +using Barotrauma.Networking; +using Barotrauma.Extensions; +using System.Globalization; using MoonSharp.Interpreter; +using Barotrauma.Abilities; namespace Barotrauma { @@ -130,9 +132,8 @@ namespace Barotrauma private readonly List limbHealths = new List(); - // Thread-safe afflictions dictionary for concurrent access - private readonly ConcurrentDictionary afflictions = new ConcurrentDictionary(); - private readonly ConcurrentDictionary irremovableAfflictions = new ConcurrentDictionary(); + private readonly Dictionary afflictions = new Dictionary(); + private readonly HashSet irremovableAfflictions = new HashSet(); private Affliction bloodlossAffliction; private Affliction oxygenLowAffliction; private Affliction pressureAffliction; @@ -323,13 +324,13 @@ namespace Barotrauma private void InitIrremovableAfflictions() { - irremovableAfflictions.TryAdd(bloodlossAffliction = new Affliction(AfflictionPrefab.Bloodloss, 0.0f), 0); - irremovableAfflictions.TryAdd(stunAffliction = new Affliction(AfflictionPrefab.Stun, 0.0f), 0); - irremovableAfflictions.TryAdd(pressureAffliction = new Affliction(AfflictionPrefab.Pressure, 0.0f), 0); - irremovableAfflictions.TryAdd(oxygenLowAffliction = new Affliction(AfflictionPrefab.OxygenLow, 0.0f), 0); - foreach (Affliction affliction in irremovableAfflictions.Keys) + irremovableAfflictions.Add(bloodlossAffliction = new Affliction(AfflictionPrefab.Bloodloss, 0.0f)); + irremovableAfflictions.Add(stunAffliction = new Affliction(AfflictionPrefab.Stun, 0.0f)); + irremovableAfflictions.Add(pressureAffliction = new Affliction(AfflictionPrefab.Pressure, 0.0f)); + irremovableAfflictions.Add(oxygenLowAffliction = new Affliction(AfflictionPrefab.OxygenLow, 0.0f)); + foreach (Affliction affliction in irremovableAfflictions) { - afflictions.TryAdd(affliction, null); + afflictions.Add(affliction, null); } } @@ -337,7 +338,7 @@ namespace Barotrauma public IReadOnlyCollection GetAllAfflictions() { - return afflictions.Keys.ToList(); + return afflictions.Keys; } public IEnumerable GetAllAfflictions(Func limbHealthFilter) @@ -502,18 +503,19 @@ namespace Barotrauma /// public float GetResistance(AfflictionPrefab afflictionPrefab, LimbType limbType) { - // ConcurrentDictionary is thread-safe, no lock needed - // This is a % resistance (0 to 1.0) - float resistance = 0.0f; - foreach (KeyValuePair kvp in afflictions) - { - var affliction = kvp.Key; - resistance += affliction.GetResistance(afflictionPrefab.Identifier, limbType); + lock (afflictions) { + // This is a % resistance (0 to 1.0) + float resistance = 0.0f; + foreach (KeyValuePair kvp in afflictions) + { + var affliction = kvp.Key; + resistance += affliction.GetResistance(afflictionPrefab.Identifier, limbType); + } + // This is a multiplier, ie. 0.0 = 100% resistance and 1.0 = 0% resistance + float abilityResistanceMultiplier = Character.GetAbilityResistance(afflictionPrefab); + // The returned value is calculated to be a % resistance again + return 1 - ((1 - resistance) * abilityResistanceMultiplier); } - // This is a multiplier, ie. 0.0 = 100% resistance and 1.0 = 0% resistance - float abilityResistanceMultiplier = Character.GetAbilityResistance(afflictionPrefab); - // The returned value is calculated to be a % resistance again - return 1 - ((1 - resistance) * abilityResistanceMultiplier); } public float GetStatValue(StatTypes statType) @@ -537,25 +539,20 @@ namespace Barotrauma return false; } - // Thread-static to avoid concurrent modification in parallel item updates - [ThreadStatic] - private static List t_matchingAfflictions; - private static List MatchingAfflictions => t_matchingAfflictions ??= new List(); + private readonly List matchingAfflictions = new List(); public void ReduceAllAfflictionsOnAllLimbs(float amount, ActionType? treatmentAction = null) { - var matchingAfflictions = MatchingAfflictions; matchingAfflictions.Clear(); matchingAfflictions.AddRange(afflictions.Keys); - ReduceMatchingAfflictions(matchingAfflictions, amount, treatmentAction); + ReduceMatchingAfflictions(amount, treatmentAction); } public void ReduceAfflictionOnAllLimbs(Identifier afflictionIdOrType, float amount, ActionType? treatmentAction = null, Character attacker = null) { if (afflictionIdOrType.IsEmpty) { throw new ArgumentException($"{nameof(afflictionIdOrType)} is empty"); } - var matchingAfflictions = MatchingAfflictions; matchingAfflictions.Clear(); foreach (var affliction in afflictions) { @@ -565,7 +562,7 @@ namespace Barotrauma } } - ReduceMatchingAfflictions(matchingAfflictions, amount, treatmentAction, attacker); + ReduceMatchingAfflictions(amount, treatmentAction, attacker); } private IEnumerable GetAfflictionsForLimb(Limb targetLimb) @@ -575,11 +572,10 @@ namespace Barotrauma { if (targetLimb is null) { throw new ArgumentNullException(nameof(targetLimb)); } - var matchingAfflictions = MatchingAfflictions; matchingAfflictions.Clear(); matchingAfflictions.AddRange(GetAfflictionsForLimb(targetLimb)); - ReduceMatchingAfflictions(matchingAfflictions, amount, treatmentAction); + ReduceMatchingAfflictions(amount, treatmentAction); } public void ReduceAfflictionOnLimb(Limb targetLimb, Identifier afflictionIdOrType, float amount, ActionType? treatmentAction = null, Character attacker = null) @@ -587,7 +583,6 @@ namespace Barotrauma if (afflictionIdOrType.IsEmpty) { throw new ArgumentException($"{nameof(afflictionIdOrType)} is empty"); } if (targetLimb is null) { throw new ArgumentNullException(nameof(targetLimb)); } - var matchingAfflictions = MatchingAfflictions; matchingAfflictions.Clear(); var targetLimbHealth = limbHealths[targetLimb.HealthIndex]; foreach (var affliction in afflictions) @@ -598,10 +593,10 @@ namespace Barotrauma matchingAfflictions.Add(affliction.Key); } } - ReduceMatchingAfflictions(matchingAfflictions, amount, treatmentAction, attacker); + ReduceMatchingAfflictions(amount, treatmentAction, attacker); } - private void ReduceMatchingAfflictions(List matchingAfflictions, float amount, ActionType? treatmentAction, Character attacker = null) + private void ReduceMatchingAfflictions(float amount, ActionType? treatmentAction, Character attacker = null) { if (matchingAfflictions.Count == 0) { return; } @@ -688,19 +683,12 @@ namespace Barotrauma } } - // Thread-static to avoid concurrent modification when multiple characters are updated in parallel - [ThreadStatic] - private static List t_afflictionsToRemove; - [ThreadStatic] - private static List> t_afflictionsToUpdate; - private static List AfflictionsToRemove => t_afflictionsToRemove ??= new List(); - private static List> AfflictionsToUpdate => t_afflictionsToUpdate ??= new List>(); - + private readonly static List afflictionsToRemove = new List(); + private readonly static List> afflictionsToUpdate = new List>(); public void SetAllDamage(float damageAmount, float bleedingDamageAmount, float burnDamageAmount) { if (Unkillable || Character.GodMode) { return; } - var afflictionsToRemove = AfflictionsToRemove; afflictionsToRemove.Clear(); afflictionsToRemove.AddRange(afflictions.Keys.Where(a => a.Prefab.AfflictionType == AfflictionPrefab.InternalDamage.AfflictionType || @@ -708,14 +696,14 @@ namespace Barotrauma a.Prefab.AfflictionType == AfflictionPrefab.Bleeding.AfflictionType)); foreach (var affliction in afflictionsToRemove) { - afflictions.TryRemove(affliction, out _); + afflictions.Remove(affliction); } foreach (LimbHealth limbHealth in limbHealths) { - if (damageAmount > 0.0f) { afflictions.TryAdd(AfflictionPrefab.InternalDamage.Instantiate(damageAmount), limbHealth); } - if (bleedingDamageAmount > 0.0f && DoesBleed) { afflictions.TryAdd(AfflictionPrefab.Bleeding.Instantiate(bleedingDamageAmount), limbHealth); } - if (burnDamageAmount > 0.0f) { afflictions.TryAdd(AfflictionPrefab.Burn.Instantiate(burnDamageAmount), limbHealth); } + if (damageAmount > 0.0f) { afflictions.Add(AfflictionPrefab.InternalDamage.Instantiate(damageAmount), limbHealth); } + if (bleedingDamageAmount > 0.0f && DoesBleed) { afflictions.Add(AfflictionPrefab.Bleeding.Instantiate(bleedingDamageAmount), limbHealth); } + if (burnDamageAmount > 0.0f) { afflictions.Add(AfflictionPrefab.Burn.Instantiate(burnDamageAmount), limbHealth); } } RecalculateVitality(); @@ -751,28 +739,26 @@ namespace Barotrauma public void RemoveAfflictions(Func predicate) { - var afflictionsToRemove = AfflictionsToRemove; afflictionsToRemove.Clear(); afflictionsToRemove.AddRange(afflictions.Keys.Where(affliction => predicate(affliction))); foreach (var affliction in afflictionsToRemove) { - afflictions.TryRemove(affliction, out _); + afflictions.Remove(affliction); } CalculateVitality(); } public void RemoveAllAfflictions() { - var afflictionsToRemove = AfflictionsToRemove; afflictionsToRemove.Clear(); - afflictionsToRemove.AddRange(afflictions.Keys.Where(a => !irremovableAfflictions.ContainsKey(a))); + afflictionsToRemove.AddRange(afflictions.Keys.Where(a => !irremovableAfflictions.Contains(a))); foreach (var affliction in afflictionsToRemove) { //set strength to 0 in case the affliction needs to react to becoming inactive affliction.Strength = 0.0f; - afflictions.TryRemove(affliction, out _); + afflictions.Remove(affliction); } - foreach (Affliction affliction in irremovableAfflictions.Keys) + foreach (Affliction affliction in irremovableAfflictions) { affliction.Strength = 0.0f; } @@ -781,18 +767,17 @@ namespace Barotrauma public void RemoveNegativeAfflictions() { - var afflictionsToRemove = AfflictionsToRemove; afflictionsToRemove.Clear(); afflictionsToRemove.AddRange(afflictions.Keys.Where(a => - !irremovableAfflictions.ContainsKey(a) && + !irremovableAfflictions.Contains(a) && !a.Prefab.IsBuff && a.Prefab.AfflictionType != "geneticmaterialbuff" && a.Prefab.AfflictionType != "geneticmaterialdebuff")); foreach (var affliction in afflictionsToRemove) { - afflictions.TryRemove(affliction, out _); + afflictions.Remove(affliction); } - foreach (Affliction affliction in irremovableAfflictions.Keys) + foreach (Affliction affliction in irremovableAfflictions) { affliction.Strength = 0.0f; } @@ -884,7 +869,7 @@ namespace Barotrauma var copyAffliction = newAffliction.Prefab.Instantiate( Math.Min(newAffliction.Prefab.MaxStrength, newAffliction.Strength * (100.0f / MaxVitality) * (1f - GetResistance(newAffliction.Prefab, limbType))), newAffliction.Source); - afflictions.TryAdd(copyAffliction, limbHealth); + afflictions.Add(copyAffliction, limbHealth); AchievementManager.OnAfflictionReceived(copyAffliction, Character); MedicalClinic.OnAfflictionCountChanged(Character); @@ -921,8 +906,6 @@ namespace Barotrauma if (!Character.GodMode) { - var afflictionsToRemove = AfflictionsToRemove; - var afflictionsToUpdate = AfflictionsToUpdate; afflictionsToRemove.Clear(); afflictionsToUpdate.Clear(); foreach (KeyValuePair kvp in afflictions) @@ -931,7 +914,7 @@ namespace Barotrauma if (affliction.Strength <= 0.0f) { AchievementManager.OnAfflictionRemoved(affliction, Character); - if (!irremovableAfflictions.ContainsKey(affliction)) { afflictionsToRemove.Add(affliction); } + if (!irremovableAfflictions.Contains(affliction)) { afflictionsToRemove.Add(affliction); } continue; } if (affliction.Prefab.Duration > 0.0f) @@ -969,7 +952,7 @@ namespace Barotrauma foreach (var affliction in afflictionsToRemove) { - afflictions.TryRemove(affliction, out _); + afflictions.Remove(affliction); } if (afflictionsToRemove.Count is not 0) @@ -1217,14 +1200,9 @@ namespace Barotrauma return (causeOfDeath, strongestAffliction); } - // Thread-static to avoid concurrent modification in parallel item updates - [ThreadStatic] - private static List t_allAfflictions; - private static List AllAfflictionsList => t_allAfflictions ??= new List(); - + private readonly List allAfflictions = new List(); private IEnumerable GetAllAfflictions(bool mergeSameAfflictions, Func predicate = null) { - var allAfflictions = AllAfflictionsList; allAfflictions.Clear(); if (!mergeSameAfflictions) { @@ -1407,17 +1385,10 @@ namespace Barotrauma return MathHelper.Clamp(strength, 0.0f, affliction.Prefab.MaxStrength); } - // Thread-static to avoid concurrent modification in parallel updates - [ThreadStatic] - private static List t_activeAfflictions; - [ThreadStatic] - private static List<(LimbHealth limbHealth, Affliction affliction)> t_limbAfflictions; - private static List ActiveAfflictionsList => t_activeAfflictions ??= new List(); - private static List<(LimbHealth limbHealth, Affliction affliction)> LimbAfflictionsList => t_limbAfflictions ??= new List<(LimbHealth limbHealth, Affliction affliction)>(); - + private readonly List activeAfflictions = new List(); + private readonly List<(LimbHealth limbHealth, Affliction affliction)> limbAfflictions = new List<(LimbHealth limbHealth, Affliction affliction)>(); public void ServerWrite(IWriteMessage msg) { - var activeAfflictions = ActiveAfflictionsList; activeAfflictions.Clear(); foreach (KeyValuePair kvp in afflictions) { @@ -1443,7 +1414,6 @@ namespace Barotrauma } } - var limbAfflictions = LimbAfflictionsList; limbAfflictions.Clear(); foreach (KeyValuePair kvp in afflictions) { @@ -1473,9 +1443,8 @@ namespace Barotrauma public void Remove() { RemoveProjSpecific(); - // Clear thread-static lists to help with garbage collection - AfflictionsToRemove.Clear(); - AfflictionsToUpdate.Clear(); + afflictionsToRemove.Clear(); + afflictionsToUpdate.Clear(); } partial void RemoveProjSpecific(); @@ -1550,14 +1519,14 @@ namespace Barotrauma } if (afflictionPredicate != null && !afflictionPredicate.Invoke(afflictionPrefab)) { return; } float strength = afflictionElement.GetAttributeFloat("strength", 0.0f); - var irremovableAffliction = irremovableAfflictions.Keys.FirstOrDefault(a => a.Prefab == afflictionPrefab); + var irremovableAffliction = irremovableAfflictions.FirstOrDefault(a => a.Prefab == afflictionPrefab); if (irremovableAffliction != null) { irremovableAffliction.Strength = strength; } else { - afflictions.TryAdd(afflictionPrefab.Instantiate(strength), limbHealth); + afflictions.Add(afflictionPrefab.Instantiate(strength), limbHealth); } } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs index 79c09a34c..d9226ce75 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs @@ -797,14 +797,16 @@ namespace Barotrauma return AddDamage(simPosition, afflictions, playSound); } - // Thread-safe: using local variables instead of instance fields to avoid concurrent modification + private readonly List appliedDamageModifiers = new List(); + private readonly List tempModifiers = new List(); + private readonly List afflictionsCopy = new List(); public AttackResult AddDamage(Vector2 simPosition, IEnumerable afflictions, bool playSound, float damageMultiplier = 1, float penetration = 0f, Character attacker = null) { - var appliedDamageModifiers = new List(); - var afflictionsCopy = new List(); + appliedDamageModifiers.Clear(); + afflictionsCopy.Clear(); foreach (var affliction in afflictions) { - var tempModifiers = new List(); + tempModifiers.Clear(); var newAffliction = affliction; float random = Rand.Value(Rand.RandSync.Unsynced); bool foundMatchingModifier = false; @@ -1020,18 +1022,13 @@ namespace Barotrauma partial void UpdateProjSpecific(float deltaTime); - // Thread-static to avoid concurrent modification in parallel item updates - [ThreadStatic] - private static List t_contactBodies; - private static List ContactBodies => t_contactBodies ??= new List(); - + private readonly List contactBodies = new List(); /// /// Returns true if the attack successfully hit something. If the distance is not given, it will be calculated. /// public bool UpdateAttack(float deltaTime, Vector2 attackSimPos, IDamageable damageTarget, out AttackResult attackResult, float distance = -1, Limb targetLimb = null) { attackResult = default; - var contactBodies = ContactBodies; Vector2 simPos = ragdoll.SimplePhysicsEnabled ? character.SimPosition : SimPosition; float dist = distance > -1 ? distance : ConvertUnits.ToDisplayUnits(Vector2.Distance(simPos, attackSimPos)); bool wasRunning = attack.IsRunning; @@ -1290,11 +1287,7 @@ namespace Barotrauma } } - // Thread-static to avoid concurrent modification in parallel item updates - [ThreadStatic] - private static List t_statusEffectTargets; - private static List StatusEffectTargets => t_statusEffectTargets ??= new List(); - + private readonly List targets = new List(); public void ApplyStatusEffects(ActionType actionType, float deltaTime) { if (!statusEffects.TryGetValue(actionType, out var statusEffectList)) { return; } @@ -1317,7 +1310,6 @@ namespace Barotrauma if (statusEffect.HasTargetType(StatusEffect.TargetType.NearbyItems) || statusEffect.HasTargetType(StatusEffect.TargetType.NearbyCharacters)) { - var targets = StatusEffectTargets; targets.Clear(); statusEffect.AddNearbyTargets(WorldPosition, targets); statusEffect.Apply(actionType, deltaTime, character, targets); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs index e6ec490d4..9954efb09 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Animation/AnimationParams.cs @@ -1,12 +1,10 @@ using Microsoft.Xna.Framework; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; using Barotrauma.IO; using System; using System.Diagnostics; using System.Linq; -using System.Threading; using System.Xml.Linq; using Barotrauma.Extensions; @@ -119,9 +117,8 @@ namespace Barotrauma public virtual AnimationType AnimationType { get; protected set; } /// /// The cached animations of all the characters that have been loaded. - /// Thread-safe cache using ConcurrentDictionary. /// - private static readonly ConcurrentDictionary> allAnimations = new ConcurrentDictionary>(); + private static readonly Dictionary> allAnimations = new Dictionary>(); [Header("Movement")] [Serialize(1.0f, IsPropertySaveable.Yes), Editable(DecimalCount = 2, MinValueFloat = 0, MaxValueFloat = Ragdoll.MAX_SPEED, ValueStep = 0.1f)] @@ -247,9 +244,7 @@ namespace Barotrauma return GetAnimParams(speciesName, animSpecies, fallbackSpecies: character.Prefab.GetBaseCharacterSpeciesName(speciesName), animType, file, throwErrors); } - // ThreadLocal for thread-safe error message collection during animation loading - private static readonly ThreadLocal> errorMessagesLocal = new ThreadLocal>(() => new List()); - private static List errorMessages => errorMessagesLocal.Value; + private static readonly List errorMessages = new List(); private static T GetAnimParams(Identifier speciesName, Identifier animSpecies, Identifier fallbackSpecies, AnimationType animType, Either file, bool throwErrors = true) where T : AnimationParams, new() { @@ -267,7 +262,11 @@ namespace Barotrauma } ContentPackage contentPackage = contentPath?.ContentPackage ?? CharacterPrefab.FindBySpeciesName(speciesName)?.ContentPackage; Debug.Assert(contentPackage != null); - var animations = allAnimations.GetOrAdd(speciesName, _ => new ConcurrentDictionary()); + if (!allAnimations.TryGetValue(speciesName, out Dictionary animations)) + { + animations = new Dictionary(); + allAnimations.Add(speciesName, animations); + } string key = fileName ?? contentPath?.Value ?? GetDefaultFileName(animSpecies, animType); if (animations.TryGetValue(key, out AnimationParams anim) && anim.AnimationType == animType) { @@ -419,12 +418,16 @@ namespace Barotrauma { throw new Exception("Cannot create an animation file of type " + animationType); } - var anims = allAnimations.GetOrAdd(speciesName, _ => new ConcurrentDictionary()); + if (!allAnimations.TryGetValue(speciesName, out Dictionary anims)) + { + anims = new Dictionary(); + allAnimations.Add(speciesName, anims); + } string fileName = IO.Path.GetFileNameWithoutExtension(fullPath); if (anims.ContainsKey(fileName)) { DebugConsole.NewMessage($"[AnimationParams] Removing the old animation of type {animationType}.", Color.Red); - anims.TryRemove(fileName, out _); + anims.Remove(fileName); } var instance = new T(); XElement animationElement = new XElement(GetDefaultFileName(speciesName, animationType), new XAttribute("animationtype", animationType.ToString())); @@ -436,7 +439,7 @@ namespace Barotrauma instance.IsLoaded = instance.Deserialize(animationElement); instance.Save(); instance.Load(contentPath, speciesName); - anims.TryAdd(fileName, instance); + anims.Add(fileName, instance); DebugConsole.NewMessage($"[AnimationParams] New animation file of type {animationType} created.", Color.GhostWhite); return instance; } @@ -464,14 +467,17 @@ namespace Barotrauma { // Update the key by removing and re-adding the animation. string fileName = FileNameWithoutExtension; - if (allAnimations.TryGetValue(SpeciesName, out ConcurrentDictionary animations)) + if (allAnimations.TryGetValue(SpeciesName, out Dictionary animations)) { - animations.TryRemove(fileName, out _); + animations.Remove(fileName); } base.UpdatePath(newPath); if (animations != null) { - animations.TryAdd(fileName, this); + if (!animations.ContainsKey(fileName)) + { + animations.Add(fileName, this); + } } } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs index f2ef4cc32..f6094f8e0 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Params/Ragdoll/RagdollParams.cs @@ -1,6 +1,5 @@ using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.Xml.Linq; @@ -125,9 +124,8 @@ namespace Barotrauma /// key1: Species name /// key2: File path /// value: Ragdoll parameters - /// Thread-safe cache using ConcurrentDictionary. /// - private static readonly ConcurrentDictionary> allRagdolls = new ConcurrentDictionary>(); + private static readonly Dictionary> allRagdolls = new Dictionary>(); public List Colliders { get; private set; } = new List(); public List Limbs { get; private set; } = new List(); @@ -224,7 +222,11 @@ namespace Barotrauma Debug.Assert(!fileName.IsNullOrWhiteSpace() || !contentPath.IsNullOrWhiteSpace()); } Debug.Assert(contentPackage != null); - var ragdolls = allRagdolls.GetOrAdd(speciesName, _ => new ConcurrentDictionary()); + if (!allRagdolls.TryGetValue(speciesName, out Dictionary ragdolls)) + { + ragdolls = new Dictionary(); + allRagdolls.Add(speciesName, ragdolls); + } string key = fileName ?? contentPath?.Value ?? GetDefaultFileName(ragdollSpecies); if (ragdolls.TryGetValue(key, out RagdollParams ragdoll)) { @@ -329,10 +331,10 @@ namespace Barotrauma if (allRagdolls.ContainsKey(speciesName)) { DebugConsole.NewMessage($"[RagdollParams] Removing the old ragdolls from {speciesName}.", Color.Red); - allRagdolls.TryRemove(speciesName, out _); + allRagdolls.Remove(speciesName); } - var ragdolls = new ConcurrentDictionary(); - allRagdolls.TryAdd(speciesName, ragdolls); + var ragdolls = new Dictionary(); + allRagdolls.Add(speciesName, ragdolls); var instance = new T { doc = new XDocument(mainElement) @@ -343,7 +345,7 @@ namespace Barotrauma instance.IsLoaded = instance.Deserialize(mainElement); instance.Save(); instance.Load(contentPath, speciesName); - ragdolls.TryAdd(instance.FileNameWithoutExtension, instance); + ragdolls.Add(instance.FileNameWithoutExtension, instance); DebugConsole.NewMessage("[RagdollParams] New default ragdoll params successfully created at " + fullPath, Color.NavajoWhite); return instance; } @@ -360,14 +362,17 @@ namespace Barotrauma { // Update the key by removing and re-adding the ragdoll. string fileName = FileNameWithoutExtension; - if (allRagdolls.TryGetValue(SpeciesName, out ConcurrentDictionary ragdolls)) + if (allRagdolls.TryGetValue(SpeciesName, out Dictionary ragdolls)) { - ragdolls.TryRemove(fileName, out _); + ragdolls.Remove(fileName); } base.UpdatePath(fullPath); if (ragdolls != null) { - ragdolls.TryAdd(fileName, this); + if (!ragdolls.ContainsKey(fileName)) + { + ragdolls.Add(fileName, this); + } } } } @@ -1479,4 +1484,4 @@ namespace Barotrauma } #endregion } -} +} \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/CharacterTalent.cs b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/CharacterTalent.cs index d16a6fc60..ae7f18849 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/CharacterTalent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Characters/Talents/CharacterTalent.cs @@ -1,8 +1,6 @@ using Barotrauma.Abilities; using System; -using System.Collections.Concurrent; using System.Collections.Generic; -using System.Threading; namespace Barotrauma { @@ -74,9 +72,7 @@ namespace Barotrauma } } - // ThreadLocal for thread-safe talent checking - private static readonly ThreadLocal> checkedNonStackableTalentsLocal = new ThreadLocal>(() => new HashSet()); - private static HashSet checkedNonStackableTalents => checkedNonStackableTalentsLocal.Value; + private static readonly HashSet checkedNonStackableTalents = new(); /// /// Checks talents for a given AbilityObject taking into account non-stackable talents. diff --git a/Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/NPCConversationsFile.cs b/Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/NPCConversationsFile.cs index 570b89364..95ee2d5c5 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/NPCConversationsFile.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/NPCConversationsFile.cs @@ -1,4 +1,4 @@ -using System.Xml.Linq; +using System.Xml.Linq; namespace Barotrauma { @@ -21,7 +21,7 @@ namespace Barotrauma var npcConversationCollection = new NPCConversationCollection(this, mainElement); if (!NPCConversationCollection.Collections.ContainsKey(npcConversationCollection.Language)) { - NPCConversationCollection.Collections.TryAdd(npcConversationCollection.Language, new PrefabCollection()); + NPCConversationCollection.Collections.Add(npcConversationCollection.Language, new PrefabCollection()); } NPCConversationCollection.Collections[npcConversationCollection.Language].Add(npcConversationCollection, allowOverriding); } @@ -42,4 +42,4 @@ namespace Barotrauma } } } -} +} \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs b/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs index fb2cacc66..05444468b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs @@ -1478,7 +1478,7 @@ namespace Barotrauma newItemName = args[2]; } - var oldItem = Item.ItemList.Where(it => it.Name == args[0]).ElementAtOrDefault(itemIndex); + var oldItem = Item.ItemList.FindAll(it => it.Name == args[0]).ElementAtOrDefault(itemIndex); if (oldItem == null) { ThrowError($"Could not find an item with the name {args[0]} (index {itemIndex})."); @@ -1852,7 +1852,7 @@ namespace Barotrauma commands.Add(new Command("power", "power: Immediately powers up the submarine's nuclear reactor.", (string[] args) => { - Item reactorItem = Item.ItemList.FirstOrDefault(i => i.GetComponent() != null); + Item reactorItem = Item.ItemList.Find(i => i.GetComponent() != null); if (reactorItem == null) { return; } var reactor = reactorItem.GetComponent(); @@ -3225,7 +3225,7 @@ namespace Barotrauma if (args.Length > spawnLocationIndex + 1) { if (!int.TryParse(args[spawnLocationIndex + 1], NumberStyles.Any, CultureInfo.InvariantCulture, out amount)) { amount = 1; } - amount = Math.Min(amount, 100000); + amount = Math.Min(amount, 100); } if (args.Length > spawnLocationIndex + 2) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs index 351d92b75..01009f1db 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs @@ -160,7 +160,7 @@ namespace Barotrauma MissionAction.ResetMissionsUnlockedThisRound(); UnlockPathAction.ResetPathsUnlockedThisRound(); #endif - pathFinder = new PathFinder(WayPoint.WayPointList.ToList(), false); + pathFinder = new PathFinder(WayPoint.WayPointList, false); totalPathLength = 0.0f; if (level != null) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/MalfunctionEvent.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/MalfunctionEvent.cs index ab50f481b..306a0f8a2 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/MalfunctionEvent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/MalfunctionEvent.cs @@ -41,7 +41,7 @@ namespace Barotrauma protected override void InitEventSpecific(EventSet parentSet) { - var matchingItems = Item.ItemList.Where(i => i.Condition > 0.0f && targetItemIdentifiers.Contains(i.Prefab.Identifier)).ToList(); + var matchingItems = Item.ItemList.FindAll(i => i.Condition > 0.0f && targetItemIdentifiers.Contains(i.Prefab.Identifier)); int itemAmount = Rand.Range(minItemAmount, maxItemAmount, Rand.RandSync.ServerAndClient); for (int i = 0; i < itemAmount; i++) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs index 730d77e44..09703cf05 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs @@ -111,7 +111,7 @@ namespace Barotrauma { if (!itemTag.IsEmpty) { - var itemsToDestroy = Item.ItemList.Where(it => it.Submarine?.Info.Type != SubmarineType.Player && it.HasTag(itemTag)).ToList(); + var itemsToDestroy = Item.ItemList.FindAll(it => it.Submarine?.Info.Type != SubmarineType.Player && it.HasTag(itemTag)); if (!itemsToDestroy.Any()) { DebugConsole.ThrowError($"Error in mission \"{Prefab.Identifier}\". Could not find an item with the tag \"{itemTag}\".", diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EndMission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EndMission.cs index 513cdd8c5..1ffc09b93 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EndMission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/EndMission.cs @@ -181,7 +181,7 @@ namespace Barotrauma return; } destructibleItems.Clear(); - destructibleItems.AddRange(Item.ItemList.Where(it => it.HasTag(destructibleItemTag))); + destructibleItems.AddRange(Item.ItemList.FindAll(it => it.HasTag(destructibleItemTag))); if (destructibleItems.None()) { DebugConsole.ThrowError($"Error in end mission \"{Prefab.Identifier}\". Could not find any destructible items with the tag \"{spawnPointTag}\".", diff --git a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs index 5a31acbdf..6331311af 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs @@ -283,7 +283,7 @@ namespace Barotrauma if (!IsClient) { - PathFinder pathFinder = new PathFinder(WayPoint.WayPointList.ToList(), false); + PathFinder pathFinder = new PathFinder(WayPoint.WayPointList, false); var path = pathFinder.FindPath(ConvertUnits.ToSimUnits(patrolPos), ConvertUnits.ToSimUnits(preferredSpawnPos)); if (!path.Unreachable) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/GameSession/CrewManager.cs b/Barotrauma/BarotraumaShared/SharedSource/GameSession/CrewManager.cs index b6d62e81f..cf243e4cc 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/GameSession/CrewManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/GameSession/CrewManager.cs @@ -128,7 +128,7 @@ namespace Barotrauma { foreach (var stackedItem in item.GetStackedItems()) { - Item.MarkForDeconstruction(stackedItem); + Item.DeconstructItems.Add(stackedItem); } #if CLIENT HintManager.OnItemMarkedForDeconstruction(order.OrderGiver); @@ -138,7 +138,7 @@ namespace Barotrauma { foreach (var stackedItem in item.GetStackedItems()) { - Item.UnmarkForDeconstruction(stackedItem); + Item.DeconstructItems.Remove(stackedItem); } } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs index c23a81644..f3782f134 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs @@ -1094,7 +1094,7 @@ namespace Barotrauma #endif //Clear the grids to allow for garbage collection Powered.Grids.Clear(); - Powered.ClearChangedConnections(); + Powered.ChangedConnections.Clear(); try { @@ -1153,7 +1153,6 @@ namespace Barotrauma EventManager?.EndRound(); StatusEffect.StopAll(); AfflictionPrefab.ClearAllEffects(); - PhysicsBodyQueue.Clear(); IsRunning = false; #if CLIENT diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs index 0046999ff..be801e1eb 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/DockingPort.cs @@ -5,7 +5,6 @@ using FarseerPhysics.Dynamics; using FarseerPhysics.Dynamics.Joints; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; #if CLIENT @@ -25,8 +24,11 @@ namespace Barotrauma.Items.Components Right } - private static readonly ConcurrentDictionary _dockingPortDict = new ConcurrentDictionary(); - public static IEnumerable List => _dockingPortDict.Keys; + private static readonly List list = new List(); + public static IEnumerable List + { + get { return list; } + } private Sprite overlaySprite; private float dockingState; @@ -166,7 +168,7 @@ namespace Barotrauma.Items.Components IsActive = true; - _dockingPortDict.TryAdd(this, 0); + list.Add(this); } public override void FlipX(bool relativeToSub) @@ -198,7 +200,7 @@ namespace Barotrauma.Items.Components { float closestDist = float.MaxValue; DockingPort closestPort = null; - foreach (DockingPort port in List) + foreach (DockingPort port in list) { if (port == this || port.item.Submarine == item.Submarine || port.IsHorizontal != IsHorizontal) { continue; } float xDist = Math.Abs(port.item.WorldPosition.X - item.WorldPosition.X); @@ -530,8 +532,8 @@ namespace Barotrauma.Items.Components wire.TryConnect(recipient, addNode: false); //Flag connections to be updated - Powered.MarkConnectionChanged(powerConnection); - Powered.MarkConnectionChanged(recipient); + Powered.ChangedConnections.Add(powerConnection); + Powered.ChangedConnections.Add(recipient); } private void CreateDoorBody() @@ -1005,7 +1007,7 @@ namespace Barotrauma.Items.Components Connection powerConnection = Item.Connections.Find(c => c.IsPower); if (powerConnection != null) { - Powered.MarkConnectionChanged(powerConnection); + Powered.ChangedConnections.Add(powerConnection); } if (doorBody != null) @@ -1149,7 +1151,7 @@ namespace Barotrauma.Items.Components protected override void RemoveComponentSpecific() { base.RemoveComponentSpecific(); - _dockingPortDict.TryRemove(this, out _); + list.Remove(this); hulls[0]?.Remove(); hulls[0] = null; hulls[1]?.Remove(); hulls[1] = null; gap?.Remove(); gap = null; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs index b3de4b02b..65b00c67c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs @@ -2,7 +2,6 @@ using FarseerPhysics; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using FarseerPhysics.Dynamics; @@ -15,9 +14,9 @@ namespace Barotrauma.Items.Components { partial class Door : Pickable, IDrawableComponent, IServerSerializable { - private static readonly ConcurrentDictionary _doorDict = new ConcurrentDictionary(); + private static readonly HashSet doorList = new HashSet(); - public static ICollection DoorList => _doorDict.Keys; + public static IReadOnlyCollection DoorList { get { return doorList; } } private Gap linkedGap; private bool isOpen; @@ -278,7 +277,7 @@ namespace Barotrauma.Items.Components } IsActive = true; - _doorDict.TryAdd(this, 0); + doorList.Add(this); } public override void OnItemLoaded() @@ -314,21 +313,13 @@ namespace Barotrauma.Items.Components public override void Move(Vector2 amount, bool ignoreContacts = false) { - // Defer physics operation if in parallel context (Farseer is not thread-safe) - if (Body != null) + if (ignoreContacts) { - var capturedBody = Body; - var capturedNewPos = Body.SimPosition + ConvertUnits.ToSimUnits(amount); - if (ignoreContacts) - { - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedBody.SetTransformIgnoreContacts(capturedNewPos, 0.0f)); - } - else - { - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedBody.SetTransform(capturedNewPos, 0.0f)); - } + Body?.SetTransformIgnoreContacts(Body.SimPosition + ConvertUnits.ToSimUnits(amount), 0.0f); + } + else + { + Body?.SetTransform(Body.SimPosition + ConvertUnits.ToSimUnits(amount), 0.0f); } #if CLIENT UpdateConvexHulls(); @@ -678,7 +669,7 @@ namespace Barotrauma.Items.Components convexHull2?.Remove(); #endif - _doorDict.TryRemove(this, out _); + doorList.Remove(this); } private bool CheckSubmarinesInDoorWay() @@ -794,19 +785,13 @@ namespace Barotrauma.Items.Components //immediately teleport it to the correct side if (Math.Sign(diff) != dir) { - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedBody = body; if (IsHorizontal) { - Vector2 newPos = new Vector2(body.SimPosition.X, item.SimPosition.Y + dir * doorRectSimSize.Y * 2.0f); - float rotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => capturedBody.SetTransformIgnoreContacts(newPos, rotation)); + body.SetTransformIgnoreContacts(new Vector2(body.SimPosition.X, item.SimPosition.Y + dir * doorRectSimSize.Y * 2.0f), body.Rotation); } else { - Vector2 newPos = new Vector2(item.SimPosition.X + dir * doorRectSimSize.X * 1.2f, body.SimPosition.Y); - float rotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => capturedBody.SetTransformIgnoreContacts(newPos, rotation)); + body.SetTransformIgnoreContacts(new Vector2(item.SimPosition.X + dir * doorRectSimSize.X * 1.2f, body.SimPosition.Y), body.Rotation); } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs index e78319bf1..4bdbe2d0f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ElectricalDischarger.cs @@ -3,7 +3,6 @@ using Barotrauma.Networking; using FarseerPhysics; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; @@ -11,8 +10,11 @@ namespace Barotrauma.Items.Components { partial class ElectricalDischarger : Powered, IServerSerializable { - private static readonly ConcurrentDictionary _dischargerDict = new ConcurrentDictionary(); - public static IEnumerable List => _dischargerDict.Keys; + private static readonly List list = new List(); + public static IEnumerable List + { + get { return list; } + } const int MaxNodes = 100; const float MaxNodeDistance = 150.0f; @@ -113,7 +115,7 @@ namespace Barotrauma.Items.Components public ElectricalDischarger(Item item, ContentXElement element) : base(item, element) { - _dischargerDict.TryAdd(this, 0); + list.Add(this); foreach (var subElement in element.Elements()) { @@ -602,7 +604,7 @@ namespace Barotrauma.Items.Components protected override void RemoveComponentSpecific() { base.RemoveComponentSpecific(); - _dischargerDict.TryRemove(this, out _); + list.Remove(this); } public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs index 405b0c9b8..dacf4103a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs @@ -9,7 +9,6 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Threading; using System.Xml.Linq; namespace Barotrauma.Items.Components @@ -486,10 +485,7 @@ namespace Barotrauma.Items.Components } else { - // Calculate target position - Vector2 targetPos; - Submarine forceSubmarine = picker.Submarine; - + item.body.ResetDynamics(); Limb heldHand, arm; if (picker.Inventory.IsInLimbSlot(item, InvSlotType.LeftHand)) { @@ -507,42 +503,17 @@ namespace Barotrauma.Items.Components Vector2 diff = new Vector2( (heldHand.SimPosition.X - arm.SimPosition.X) / 2f, (heldHand.SimPosition.Y - arm.SimPosition.Y) / 2.5f); - targetPos = heldHand.SimPosition + diff; - } - else - { - targetPos = picker.SimPosition; - } - // Defer physics operations if in parallel context - if (PhysicsBodyQueue.IsInParallelContext) - { - var capturedBody = item.body; - var capturedItem = item; - var capturedTargetPos = targetPos; - var capturedForceSubmarine = forceSubmarine; - - PhysicsBodyQueue.Enqueue(() => - { - if (capturedBody.Removed || capturedItem.Removed) { return; } - capturedBody.ResetDynamics(); - //we have forced the item to be in the same sub as the dropper above, - //and are placing it to the position of the hands in "local" coordinates - //which may be outside the sub if the character is e.g. standing half-way through the airlock - // -> let's use the forceSubmarine argument ensure the item is still considered to be in the sub's coordinate space, - // or it will end up in a weird state and seemingly disappear - capturedItem.SetTransform(capturedTargetPos, 0.0f, forceSubmarine: capturedForceSubmarine); - }); - } - else - { - item.body.ResetDynamics(); //we have forced the item to be in the same sub as the dropper above, //and are placing it to the position of the hands in "local" coordinates //which may be outside the sub if the character is e.g. standing half-way through the airlock // -> let's use the forceSubmarine argument ensure the item is still considered to be in the sub's coordinate space, // or it will end up in a weird state and seemingly disappear - item.SetTransform(targetPos, 0.0f, forceSubmarine: forceSubmarine); + item.SetTransform(heldHand.SimPosition + diff, 0.0f, forceSubmarine: picker.Submarine); + } + else + { + item.SetTransform(picker.SimPosition, 0.0f, forceSubmarine: picker.Submarine); } } } @@ -645,13 +616,12 @@ namespace Barotrauma.Items.Components return CanBeAttached(user, out _); } - private static readonly ThreadLocal> tempOverlappingItems = new ThreadLocal>(() => new List()); + private static List tempOverlappingItems = new List(); private bool CanBeAttached(Character user, out IEnumerable overlappingItems) { - var overlapping = tempOverlappingItems.Value; - overlapping.Clear(); - overlappingItems = overlapping; + tempOverlappingItems.Clear(); + overlappingItems = tempOverlappingItems; if (!attachable || !Reattachable) { return false; } //can be attached anywhere in sub editor @@ -694,9 +664,9 @@ namespace Barotrauma.Items.Components } if (attachPos.X + size.X < worldRect.X || attachPos.X - size.X > worldRect.Right) { continue; } if (attachPos.Y - size.Y > worldRect.Y || attachPos.Y + size.Y < worldRect.Y - worldRect.Height) { continue; } - overlapping.Add(otherItem); + tempOverlappingItems.Add(otherItem); } - if (overlapping.Any()) { return false; } + if (tempOverlappingItems.Any()) { return false; } } //can be attached anywhere inside hulls diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs index 5c672cda5..5f03a6163 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs @@ -13,12 +13,6 @@ namespace Barotrauma.Items.Components private Holdable holdable; private float deattachTimer; - - /// - /// Flag to prevent multiple queued creation requests. - /// Uses volatile to ensure visibility across threads. - /// - private volatile bool triggerBodyCreationQueued; [Serialize(1.0f, IsPropertySaveable.No, description: "How long it takes to deattach the item from the level walls (in seconds).")] public float DeattachDuration @@ -92,16 +86,13 @@ namespace Barotrauma.Items.Components { if (trigger != null && amount.LengthSquared() > 0.00001f) { - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedTrigger = trigger; - var capturedPos = item.SimPosition; if (ignoreContacts) { - PhysicsBodyQueue.ExecuteOrDefer(() => capturedTrigger.SetTransformIgnoreContacts(capturedPos, 0.0f)); + trigger.SetTransformIgnoreContacts(item.SimPosition, 0.0f); } else { - PhysicsBodyQueue.ExecuteOrDefer(() => capturedTrigger.SetTransform(capturedPos, 0.0f)); + trigger.SetTransform(item.SimPosition, 0.0f); } } } @@ -118,29 +109,13 @@ namespace Barotrauma.Items.Components } else { - if (trigger == null && !triggerBodyCreationQueued) + if (trigger == null) { - // Queue the physics body creation to be processed on the main thread. - // This is necessary because physics body creation is not thread-safe - // and Update() may be called from a parallel loop. - triggerBodyCreationQueued = true; - PhysicsBodyQueue.EnqueueCreation(() => - { - // Double-check that trigger hasn't been created yet - // (in case this was called multiple times before queue processing) - if (trigger == null && !item.Removed) - { - CreateTriggerBody(); - } - triggerBodyCreationQueued = false; - }); + CreateTriggerBody(); } if (trigger != null && Vector2.DistanceSquared(item.SimPosition, trigger.SimPosition) > 0.01f) { - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedTrigger = trigger; - var capturedPos = item.SimPosition; - PhysicsBodyQueue.ExecuteOrDefer(() => capturedTrigger.SetTransform(capturedPos, 0.0f)); + trigger.SetTransform(item.SimPosition, 0.0f); } IsActive = false; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs index 15fe42183..d4d45f120 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/MeleeWeapon.cs @@ -3,7 +3,6 @@ using FarseerPhysics.Dynamics; using FarseerPhysics.Dynamics.Contacts; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; @@ -25,7 +24,7 @@ namespace Barotrauma.Items.Components private readonly HashSet hitTargets = new HashSet(); - private readonly ConcurrentQueue impactQueue = new ConcurrentQueue(); + private readonly Queue impactQueue = new Queue(); public Character User { get; private set; } @@ -191,16 +190,17 @@ namespace Barotrauma.Items.Components { if (!item.body.Enabled) { - while (impactQueue.TryDequeue(out _)) { } // Clear queue + impactQueue.Clear(); return; } if (picker == null || !picker.HeldItems.Contains(item)) { - while (impactQueue.TryDequeue(out _)) { } // Clear queue + impactQueue.Clear(); IsActive = false; } - while (impactQueue.TryDequeue(out var impact)) + while (impactQueue.Count > 0) { + var impact = impactQueue.Dequeue(); HandleImpact(impact); } //in case handling the impact does something to the picker @@ -300,7 +300,7 @@ namespace Barotrauma.Items.Components private void RestoreCollision() { - while (impactQueue.TryDequeue(out _)) { } // Clear queue + impactQueue.Clear(); item.body.FarseerBody.OnCollision -= OnCollision; item.body.CollisionCategories = Physics.CollisionItem; item.body.CollidesWith = Physics.DefaultItemCollidesWith; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs index 63aaf6726..f5c73ab42 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RepairTool.cs @@ -4,7 +4,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using Barotrauma.Extensions; using Barotrauma.MapCreatures.Behavior; @@ -316,7 +315,7 @@ namespace Barotrauma.Items.Components partial void UseProjSpecific(float deltaTime, Vector2 raystart); - private static readonly ThreadLocal> hitBodies = new ThreadLocal>(() => new List()); + private static readonly List hitBodies = new List(); private readonly HashSet hitCharacters = new HashSet(); private readonly List fireSourcesInRange = new List(); private void Repair(Vector2 rayStart, Vector2 rayEnd, float deltaTime, Character user, float degreeOfSuccess, List ignoredBodies) @@ -374,13 +373,13 @@ namespace Barotrauma.Items.Components }, allowInsideFixture: true); - hitBodies.Value.Clear(); - hitBodies.Value.AddRange(bodies.Distinct()); + hitBodies.Clear(); + hitBodies.AddRange(bodies.Distinct()); lastPickedFraction = Submarine.LastPickedFraction; Type lastHitType = null; hitCharacters.Clear(); - foreach (Body body in hitBodies.Value) + foreach (Body body in hitBodies) { Type bodyType = body.UserData?.GetType(); if (!RepairThroughWalls && bodyType != null && bodyType != lastHitType) @@ -898,49 +897,48 @@ namespace Barotrauma.Items.Components } } - private static readonly ThreadLocal> currentTargets = new ThreadLocal>(() => new List()); + private static List currentTargets = new List(); private void ApplyStatusEffectsOnTarget(Character user, float deltaTime, ActionType actionType, Item targetItem = null, Character character = null, Limb limb = null, Structure structure = null) { if (statusEffectLists == null) { return; } if (!statusEffectLists.TryGetValue(actionType, out List statusEffects)) { return; } - var targets = currentTargets.Value; foreach (StatusEffect effect in statusEffects) { - targets.Clear(); + currentTargets.Clear(); effect.SetUser(user); if (effect.HasTargetType(StatusEffect.TargetType.UseTarget)) { if (targetItem != null) { - targets.AddRange(targetItem.AllPropertyObjects); + currentTargets.AddRange(targetItem.AllPropertyObjects); } if (structure != null) { - targets.Add(structure); + currentTargets.Add(structure); } if (character != null) { - targets.Add(character); + currentTargets.Add(character); } - effect.Apply(actionType, deltaTime, item, targets); + effect.Apply(actionType, deltaTime, item, currentTargets); } else if (effect.HasTargetType(StatusEffect.TargetType.Character)) { - targets.Add(user); - effect.Apply(actionType, deltaTime, item, targets); + currentTargets.Add(user); + effect.Apply(actionType, deltaTime, item, currentTargets); } else if (effect.HasTargetType(StatusEffect.TargetType.Limb)) { - targets.Add(limb); - effect.Apply(actionType, deltaTime, item, targets); + currentTargets.Add(limb); + effect.Apply(actionType, deltaTime, item, currentTargets); } #if CLIENT if (user == null) { return; } // Hard-coded progress bars for welding doors stuck. // A general purpose system could be better, but it would most likely require changes in the way we define the status effects in xml. - foreach (ISerializableEntity target in targets) + foreach (ISerializableEntity target in currentTargets) { if (target is not Door door) { continue; } if (!door.CanBeWelded || !door.Item.IsInteractable(user)) { continue; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs index 0ae99cd9e..8e156bb54 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs @@ -949,8 +949,7 @@ namespace Barotrauma.Items.Components //if any of the effects reduce the item's condition, set the user for OnBroken effects as well if (reducesCondition && user != null && type != ActionType.OnBroken) { - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in item.Components.ToArray()) + foreach (ItemComponent ic in item.Components) { if (ic.statusEffectLists == null || !ic.statusEffectLists.TryGetValue(ActionType.OnBroken, out List brokenEffects)) { continue; } foreach (var brokenEffect in brokenEffects) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs index 992b4bfc6..ae7016391 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs @@ -884,8 +884,7 @@ namespace Barotrauma.Items.Components RelatedItem containableItem = FindContainableItem(containedItem); if (containableItem != null && containableItem.SetActive) { - // Use ToArray() snapshot for thread-safe iteration - foreach (var ic in containedItem.Components.ToArray()) + foreach (var ic in containedItem.Components) { ic.IsActive = active; } @@ -1011,11 +1010,7 @@ namespace Barotrauma.Items.Components if (flippedX ^ flippedY) { rotation = -rotation; } rotation += -item.RotationRad; } - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedBody = contained.Item.body.FarseerBody; - var capturedSimPos = simPos; - var capturedRotation = rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => capturedBody.SetTransformIgnoreContacts(ref capturedSimPos, capturedRotation)); + contained.Item.body.FarseerBody.SetTransformIgnoreContacts(ref simPos, rotation); contained.Item.body.UpdateDrawPosition(interpolate: false); } catch (Exception e) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Ladder.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Ladder.cs index 584089e75..73674fbf8 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Ladder.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Ladder.cs @@ -1,19 +1,17 @@ -using System.Collections.Concurrent; -using System.Collections.Generic; +using System.Collections.Generic; using System.Xml.Linq; namespace Barotrauma.Items.Components { partial class Ladder : ItemComponent { - private static readonly ConcurrentDictionary _ladderDict = new ConcurrentDictionary(); - public static IEnumerable List => _ladderDict.Keys; + public static List List { get; } = new List(); public Ladder(Item item, ContentXElement element) : base(item, element) { InitProjSpecific(element); - _ladderDict.TryAdd(this, 0); + List.Add(this); } partial void InitProjSpecific(ContentXElement element); @@ -30,7 +28,7 @@ namespace Barotrauma.Items.Components { base.RemoveComponentSpecific(); RemoveProjSpecific(); - _ladderDict.TryRemove(this, out _); + List.Remove(this); } partial void RemoveProjSpecific(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs index 9d032f85d..899258e4f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Controller.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Xml.Linq; -using System.Linq; namespace Barotrauma.Items.Components { @@ -498,14 +497,12 @@ namespace Barotrauma.Items.Components item.SendSignal(new Signal(MathHelper.ToDegrees(targetRotation).ToString("G", CultureInfo.InvariantCulture), sender: user), positionOut); - // Use ToList() snapshot for thread-safe iteration - var signalRecipients = item.LastSentSignalRecipients.ToList(); - for (int i = signalRecipients.Count - 1; i >= 0; i--) + for (int i = item.LastSentSignalRecipients.Count - 1; i >= 0; i--) { - if (signalRecipients[i].Item.Condition <= 0.0f || signalRecipients[i].IsPower) { continue; } - if (signalRecipients[i].Item.Prefab.FocusOnSelected) + if (item.LastSentSignalRecipients[i].Item.Condition <= 0.0f || item.LastSentSignalRecipients[i].IsPower) { continue; } + if (item.LastSentSignalRecipients[i].Item.Prefab.FocusOnSelected) { - return signalRecipients[i].Item; + return item.LastSentSignalRecipients[i].Item; } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Sonar.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Sonar.cs index 44cdf4398..bfd4aaafe 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Sonar.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Sonar.cs @@ -1,17 +1,14 @@ using Barotrauma.Networking; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; namespace Barotrauma.Items.Components { partial class Sonar : Powered, IServerSerializable, IClientSerializable { - private static readonly ConcurrentDictionary _sonarDict = new ConcurrentDictionary(); - public static IEnumerable SonarList => _sonarDict.Keys; + public static List SonarList = new List(); public enum Mode { @@ -172,7 +169,7 @@ namespace Barotrauma.Items.Components IsActive = true; InitProjSpecific(element); CurrentMode = Mode.Passive; - _sonarDict.TryAdd(this, 0); + SonarList.Add(this); } partial void InitProjSpecific(ContentXElement element); @@ -294,15 +291,13 @@ namespace Barotrauma.Items.Components return currentPingIndex != -1 && (character == null || characterUsable); } - private static readonly ThreadLocal>> targetGroups = - new ThreadLocal>>(() => new Dictionary>()); + private static readonly Dictionary> targetGroups = new Dictionary>(); public override bool CrewAIOperate(float deltaTime, Character character, AIObjectiveOperateItem objective) { if (currentMode == Mode.Passive || !aiPingCheckPending) { return false; } - var groups = targetGroups.Value; - foreach (List targetGroup in groups.Values) + foreach (List targetGroup in targetGroups.Values) { targetGroup.Clear(); } @@ -315,14 +310,14 @@ namespace Barotrauma.Items.Components #warning This is not the best key for a dictionary. string directionName = GetDirectionName(c.WorldPosition - item.WorldPosition).Value; - if (!groups.ContainsKey(directionName)) + if (!targetGroups.ContainsKey(directionName)) { - groups.Add(directionName, new List()); + targetGroups.Add(directionName, new List()); } - groups[directionName].Add(c); + targetGroups[directionName].Add(c); } - foreach (KeyValuePair> targetGroup in groups) + foreach (KeyValuePair> targetGroup in targetGroups) { if (!targetGroup.Value.Any()) { continue; } string dialogTag = "DialogSonarTarget"; @@ -406,7 +401,7 @@ namespace Barotrauma.Items.Components MineralClusters = null; #endif - _sonarDict.TryRemove(this, out _); + SonarList.Remove(this); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs index 9c1f83b30..d7130f534 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Steering.cs @@ -637,7 +637,7 @@ namespace Barotrauma.Items.Components if (pathFinder == null) { - pathFinder = new PathFinder(WayPoint.WayPointList.ToList(), false) + pathFinder = new PathFinder(WayPoint.WayPointList, false) { GetNodePenalty = GetNodePenalty }; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerTransfer.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerTransfer.cs index f2a44513c..c110e8b9e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerTransfer.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/PowerTransfer.cs @@ -1,7 +1,6 @@ using Barotrauma.Extensions; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; @@ -14,12 +13,10 @@ namespace Barotrauma.Items.Components private readonly HashSet signalConnections = new HashSet(); - private readonly ConcurrentDictionary connectionDirty = new ConcurrentDictionary(); + private readonly Dictionary connectionDirty = new Dictionary(); //a list of connections a given connection is connected to, either directly or via other power transfer components - //Uses ConcurrentDictionary as a thread-safe HashSet replacement - private readonly ConcurrentDictionary> connectedRecipients = - new ConcurrentDictionary>(); + private readonly Dictionary> connectedRecipients = new Dictionary>(); private float overloadCooldownTimer; private const float OverloadCooldown = 5.0f; @@ -135,7 +132,7 @@ namespace Barotrauma.Items.Components partial void InitProjectSpecific(XElement element); - private static readonly System.Collections.Concurrent.ConcurrentDictionary _recipientsToRefresh = new System.Collections.Concurrent.ConcurrentDictionary(); + private static readonly HashSet recipientsToRefresh = new HashSet(); public override void UpdateBroken(float deltaTime, Camera cam) { base.UpdateBroken(deltaTime, cam); @@ -147,21 +144,20 @@ namespace Barotrauma.Items.Components powerLoad = 0.0f; currPowerConsumption = 0.0f; SetAllConnectionsDirty(); - _recipientsToRefresh.Clear(); - // Take snapshot for thread-safe iteration (no locks needed with ConcurrentDictionary) - foreach (var recipientDict in connectedRecipients.Values) + recipientsToRefresh.Clear(); + foreach (HashSet recipientList in connectedRecipients.Values) { - foreach (Connection c in recipientDict.Keys) + foreach (Connection c in recipientList) { if (c.Item == item) { continue; } var recipientPowerTransfer = c.Item.GetComponent(); if (recipientPowerTransfer != null) { - _recipientsToRefresh.TryAdd(recipientPowerTransfer, 0); + recipientsToRefresh.Add(recipientPowerTransfer); } } } - foreach (PowerTransfer recipientPowerTransfer in _recipientsToRefresh.Keys) + foreach (PowerTransfer recipientPowerTransfer in recipientsToRefresh) { recipientPowerTransfer.SetAllConnectionsDirty(); recipientPowerTransfer.RefreshConnections(); @@ -308,56 +304,58 @@ namespace Barotrauma.Items.Components protected void RefreshConnections() { var connections = item.Connections; - if (connections == null) { return; } - - // Take a snapshot of connections for thread-safe iteration - var connectionSnapshot = connections.ToList(); - foreach (Connection c in connectionSnapshot) + foreach (Connection c in connections) { - if (!connectionDirty.TryGetValue(c, out bool isDirty)) + if (!connectionDirty.ContainsKey(c)) { connectionDirty[c] = true; - isDirty = true; } - - if (!isDirty) + else if (!connectionDirty[c]) { continue; } //find all connections that are connected to this one (directly or via another PowerTransfer) - var tempConnected = connectedRecipients.GetOrAdd(c, _ => new ConcurrentDictionary()); - - // Get previous recipients and clear - var previousRecipients = tempConnected.Keys.ToList(); - tempConnected.Clear(); - - //mark all previous recipients as dirty - foreach (Connection recipient in previousRecipients) + HashSet tempConnected; + if (!connectedRecipients.ContainsKey(c)) { - var pt = recipient.Item.GetComponent(); - if (pt != null) { pt.connectionDirty[recipient] = true; } + tempConnected = new HashSet(); + connectedRecipients.Add(c, tempConnected); + } + else + { + tempConnected = connectedRecipients[c]; + tempConnected.Clear(); + //mark all previous recipients as dirty + foreach (Connection recipient in tempConnected) + { + var pt = recipient.Item.GetComponent(); + if (pt != null) { pt.connectionDirty[recipient] = true; } + } } - tempConnected.TryAdd(c, 0); + tempConnected.Add(c); if (item.Condition > 0.0f) { GetConnected(c, tempConnected); //go through all the PowerTransfers that we're connected to and set their connections to match the ones we just calculated //(no need to go through the recursive GetConnected method again) - // Take snapshot for thread-safe iteration (no locks needed) - var tempConnectedSnapshot = tempConnected.Keys.ToList(); - foreach (Connection recipient in tempConnectedSnapshot) + foreach (Connection recipient in tempConnected) { if (recipient == c) { continue; } var recipientPowerTransfer = recipient.Item.GetComponent(); if (recipientPowerTransfer == null) { continue; } - - var recipientSet = recipientPowerTransfer.connectedRecipients.GetOrAdd(recipient, _ => new ConcurrentDictionary()); - recipientSet.Clear(); - foreach (var connection in tempConnectedSnapshot) + if (!recipientPowerTransfer.connectedRecipients.ContainsKey(recipient)) { - recipientSet.TryAdd(connection, 0); + recipientPowerTransfer.connectedRecipients.Add(recipient, new HashSet()); + } + else + { + recipientPowerTransfer.connectedRecipients[recipient].Clear(); + } + foreach (var connection in tempConnected) + { + recipientPowerTransfer.connectedRecipients[recipient].Add(connection); } recipientPowerTransfer.connectionDirty[recipient] = false; } @@ -366,20 +364,19 @@ namespace Barotrauma.Items.Components } } - //Finds all the connections that can receive a signal sent into the given connection and stores them in the concurrent dictionary. - private void GetConnected(Connection c, ConcurrentDictionary connected) + //Finds all the connections that can receive a signal sent into the given connection and stores them in the hashset. + private void GetConnected(Connection c, HashSet connected) { - // Take snapshot for thread-safe iteration - var recipients = c.Recipients.ToList(); + var recipients = c.Recipients; foreach (Connection recipient in recipients) { - if (recipient == null || connected.ContainsKey(recipient)) { continue; } + if (recipient == null || connected.Contains(recipient)) { continue; } Item it = recipient.Item; if (it == null || it.Condition <= 0.0f) { continue; } - connected.TryAdd(recipient, 0); + connected.Add(recipient); var powerTransfer = it.GetComponent(); if (powerTransfer != null && powerTransfer.CanTransfer && powerTransfer.IsActive) @@ -397,14 +394,10 @@ namespace Barotrauma.Items.Components connectionDirty[c] = true; if (c.IsPower) { - MarkConnectionChanged(c); + ChangedConnections.Add(c); if (connectedRecipients.TryGetValue(c, out var recipients)) { - // No lock needed - ConcurrentDictionary.Keys is thread-safe - foreach (var conn in recipients.Keys.Where(conn => conn.IsPower)) - { - MarkConnectionChanged(conn); - } + recipients.Where(c => c.IsPower).ForEach(c => ChangedConnections.Add(c)); } } } @@ -417,14 +410,10 @@ namespace Barotrauma.Items.Components connectionDirty[connection] = true; if (connection.IsPower) { - MarkConnectionChanged(connection); + ChangedConnections.Add(connection); if (connectedRecipients.TryGetValue(connection, out var recipients)) { - // No lock needed - ConcurrentDictionary.Keys is thread-safe - foreach (var conn in recipients.Keys.Where(conn => conn.IsPower)) - { - MarkConnectionChanged(conn); - } + recipients.Where(c => c.IsPower).ForEach(c => ChangedConnections.Add(c)); } } } @@ -463,19 +452,16 @@ namespace Barotrauma.Items.Components public override void ReceiveSignal(Signal signal, Connection connection) { if (item.Condition <= 0.0f || connection.IsPower) { return; } - if (!connectedRecipients.TryGetValue(connection, out var recipients)) { return; } + if (!connectedRecipients.ContainsKey(connection)) { return; } if (!signalConnections.Contains(connection)) { return; } - // No lock needed - ConcurrentDictionary.Keys is thread-safe - // Use ToList() snapshot for thread-safe iteration - foreach (Connection recipient in recipients.Keys.ToList()) + foreach (Connection recipient in connectedRecipients[connection]) { if (recipient.Item == item || recipient.Item == signal.source) { continue; } signal.source?.LastSentSignalRecipients.Add(recipient); - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in recipient.Item.Components.ToArray()) + foreach (ItemComponent ic in recipient.Item.Components) { //other junction boxes don't need to receive the signal in the pass-through signal connections //because we relay it straight to the connected items without going through the whole chain of junction boxes @@ -485,8 +471,7 @@ namespace Barotrauma.Items.Components if (recipient.Effects != null && signal.value != "0" && !string.IsNullOrEmpty(signal.value)) { - // Use ToArray() snapshot for thread-safe iteration - foreach (StatusEffect effect in recipient.Effects.ToArray()) + foreach (StatusEffect effect in recipient.Effects) { recipient.Item.ApplyStatusEffect(effect, ActionType.OnUse, 1.0f); } @@ -499,7 +484,7 @@ namespace Barotrauma.Items.Components base.RemoveComponentSpecific(); connectedRecipients?.Clear(); connectionDirty?.Clear(); - _recipientsToRefresh.Clear(); + recipientsToRefresh.Clear(); } } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs index 8d14850c0..962b6a132 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs @@ -1,6 +1,4 @@ using System; -using System.Collections.Concurrent; -using System.Threading; using Microsoft.Xna.Framework; using System.Collections.Generic; using System.Linq; @@ -64,77 +62,17 @@ namespace Barotrauma.Items.Components protected const float UpdateInterval = (float)Timing.Step; /// - /// List of all powered ItemComponents (thread-safe) + /// List of all powered ItemComponents /// - private static readonly ConcurrentDictionary _poweredDict = new ConcurrentDictionary(); - - /// - /// Cached list for iteration - updated when collection changes - /// - private static volatile List _cachedPoweredList; - private static int _poweredListVersion; - + private static readonly List poweredList = new List(); public static IEnumerable PoweredList { - get - { - var cached = _cachedPoweredList; - if (cached != null) return cached; - return GetCachedPoweredList(); - } - } - - private static List GetCachedPoweredList() - { - var newList = _poweredDict.Keys.ToList(); - _cachedPoweredList = newList; - return newList; - } - - private static void InvalidatePoweredListCache() - { - _cachedPoweredList = null; - Interlocked.Increment(ref _poweredListVersion); + get { return poweredList; } } - /// - /// Thread-safe set of changed connections - /// - private static readonly ConcurrentDictionary _changedConnections = new ConcurrentDictionary(); - - /// - /// Gets all changed connections (snapshot) - /// - public static ICollection ChangedConnections => _changedConnections.Keys; - - /// - /// Add a connection to the changed set - /// - public static void MarkConnectionChanged(Connection c) - { - _changedConnections.TryAdd(c, 0); - } - - /// - /// Clear all changed connections - /// - public static void ClearChangedConnections() - { - _changedConnections.Clear(); - } - - /// - /// Remove a connection from the changed set - /// - public static void UnmarkConnectionChanged(Connection c) - { - _changedConnections.TryRemove(c, out _); - } + public static readonly HashSet ChangedConnections = new HashSet(); - /// - /// Thread-safe grid dictionary - /// - public readonly static ConcurrentDictionary Grids = new ConcurrentDictionary(); + public readonly static Dictionary Grids = new Dictionary(); /// /// The amount of power currently consumed by the item. Negative values mean that the item is providing power to connected items @@ -271,8 +209,7 @@ namespace Barotrauma.Items.Components public Powered(Item item, ContentXElement element) : base(item, element) { - _poweredDict.TryAdd(this, 0); - InvalidatePoweredListCache(); + poweredList.Add(this); InitProjectSpecific(element); } @@ -385,20 +322,17 @@ namespace Barotrauma.Items.Components //don't use cache if there are no existing grids if (Grids.Count > 0 && useCache) { - // Take a snapshot of changed connections for iteration - var changedSnapshot = ChangedConnections.ToList(); - //delete all grids that were affected - foreach (Connection c in changedSnapshot) + foreach (Connection c in ChangedConnections) { if (c.Grid != null) { - Grids.TryRemove(c.Grid.ID, out _); + Grids.Remove(c.Grid.ID); c.Grid = null; } } - foreach (Connection c in changedSnapshot) + foreach (Connection c in ChangedConnections) { //Make sure the connection grid hasn't been resolved by another connection update //Ensure the connection has other connections @@ -412,7 +346,7 @@ namespace Barotrauma.Items.Components else { //Clear all grid IDs from connections - foreach (Powered powered in PoweredList) + foreach (Powered powered in poweredList) { //Only check devices with connectors if (powered.powerIn != null) @@ -427,7 +361,7 @@ namespace Barotrauma.Items.Components Grids.Clear(); - foreach (Powered powered in PoweredList) + foreach (Powered powered in poweredList) { if (powered.Item.Condition <= 0f) { continue; } @@ -458,7 +392,7 @@ namespace Barotrauma.Items.Components } //Clear changed connections after each update - ClearChangedConnections(); + ChangedConnections.Clear(); } private static GridInfo PropagateGrid(Connection conn) @@ -488,8 +422,8 @@ namespace Barotrauma.Items.Components c.Grid = grid; grid.AddConnection(c); - //Add on recipients - use ToList() snapshot for thread-safe iteration - foreach (Connection otherC in c.Recipients.ToList()) + //Add on recipients + foreach (Connection otherC in c.Recipients) { //Only add valid connections if (otherC.Grid != grid && (otherC.Grid == null || !Grids.ContainsKey(otherC.Grid.ID)) && ValidPowerConnection(c, otherC)) @@ -560,7 +494,7 @@ namespace Barotrauma.Items.Components } //Determine if devices are adding a load or providing power, also resolve solo nodes - foreach (Powered powered in PoweredList) + foreach (Powered powered in poweredList) { //Make voltage decay to ensure the device powers down. //This only effects devices with no power input (whose voltage is set by other means, e.g. status effects from a contained battery) @@ -796,8 +730,7 @@ namespace Barotrauma.Items.Components { if (item.Connections != null && powerIn != null) { - // Use ToList() snapshot for thread-safe iteration - foreach (Connection recipient in powerIn.Recipients.ToList()) + foreach (Connection recipient in powerIn.Recipients) { if (!recipient.IsPower || !recipient.IsOutput) { continue; } if (recipient.Item?.GetComponent() is PowerContainer battery) @@ -817,14 +750,13 @@ namespace Barotrauma.Items.Components { if (c.IsPower && c.Grid != null) { - MarkConnectionChanged(c); + ChangedConnections.Add(c); } } } base.RemoveComponentSpecific(); - _poweredDict.TryRemove(this, out _); - InvalidatePoweredListCache(); + poweredList.Remove(this); } } @@ -848,9 +780,9 @@ namespace Barotrauma.Items.Components Connections.Remove(c); //Remove the grid if it has no devices - if (Connections.Count == 0) + if (Connections.Count == 0 && Powered.Grids.ContainsKey(ID)) { - Powered.Grids.TryRemove(ID, out _); + Powered.Grids.Remove(ID); } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs index 9c2423f0b..52df29696 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs @@ -5,7 +5,6 @@ using FarseerPhysics.Dynamics.Contacts; using FarseerPhysics.Dynamics.Joints; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; @@ -73,7 +72,7 @@ namespace Barotrauma.Items.Components public const float WaterDragCoefficient = 0.1f; - private readonly ConcurrentQueue impactQueue = new ConcurrentQueue(); + private readonly Queue impactQueue = new Queue(); private bool removePending; @@ -841,8 +840,9 @@ namespace Barotrauma.Items.Components DisableProjectileCollisions(); } } - while (impactQueue.TryDequeue(out var impact)) + while (impactQueue.Count > 0) { + var impact = impactQueue.Dequeue(); HandleProjectileCollision(impact.Fixture, impact.Normal, impact.LinearVelocity); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs index d2c7d4525..1aebf8187 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Repairable.cs @@ -456,8 +456,7 @@ namespace Barotrauma.Items.Components item.SendSignal(conditionSignal, "condition_out"); - // Use ToArray() snapshot for thread-safe iteration - foreach (var component in item.Components.ToArray()) + foreach (var component in item.Components) { if (component is IDeteriorateUnderStress deteriorateUnderStress) { @@ -714,8 +713,7 @@ namespace Barotrauma.Items.Components #endif if (LastActiveTime > Timing.TotalTime) { return true; } - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in item.Components.ToArray()) + foreach (ItemComponent ic in item.Components) { if (ic is Fabricator || ic is Deconstructor) { @@ -763,8 +761,7 @@ namespace Barotrauma.Items.Components private float GetDeteriorationDelayMultiplier() { - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in item.Components.ToArray()) + foreach (ItemComponent ic in item.Components) { if (ic is Engine engine) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Connection.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Connection.cs index d55150237..e14929804 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Connection.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Connection.cs @@ -222,14 +222,13 @@ namespace Barotrauma.Items.Components public void SetRecipientsDirty() { recipientsDirty = true; - if (IsPower) { Powered.MarkConnectionChanged(this); } + if (IsPower) { Powered.ChangedConnections.Add(this); } } private void RefreshRecipients() { recipients.Clear(); - // Use ToArray() snapshot for thread-safe iteration - foreach (var wire in wires.ToArray()) + foreach (var wire in wires) { Connection recipient = wire.OtherConnection(this); if (recipient != null) { recipients.Add(recipient); } @@ -268,8 +267,8 @@ namespace Barotrauma.Items.Components //Check if both connections belong to a larger grid if (prevOtherConnection.recipients.Count > 1 && recipients.Count > 1) { - Powered.MarkConnectionChanged(prevOtherConnection); - Powered.MarkConnectionChanged(this); + Powered.ChangedConnections.Add(prevOtherConnection); + Powered.ChangedConnections.Add(this); } else if (recipients.Count > 1) { @@ -285,7 +284,7 @@ namespace Barotrauma.Items.Components else if (Grid.Connections.Count == 2) { //Delete the grid as these were the only 2 devices - Powered.Grids.TryRemove(Grid.ID, out _); + Powered.Grids.Remove(Grid.ID); Grid = null; prevOtherConnection.Grid = null; } @@ -326,8 +325,8 @@ namespace Barotrauma.Items.Components else { //Flag change so that proper grids can be formed - Powered.MarkConnectionChanged(this); - Powered.MarkConnectionChanged(otherConnection); + Powered.ChangedConnections.Add(this); + Powered.ChangedConnections.Add(otherConnection); } } @@ -340,8 +339,7 @@ namespace Barotrauma.Items.Components { LastSentSignal = signal; enumeratingWires = true; - // Use ToArray() snapshot for thread-safe iteration - foreach (var wire in wires.ToArray()) + foreach (var wire in wires) { Connection recipient = wire.OtherConnection(this); if (recipient == null) { continue; } @@ -356,14 +354,14 @@ namespace Barotrauma.Items.Components GameMain.LuaCs.Hook.Call("signalReceived." + recipient.item.Prefab.Identifier, signal, recipient); } - foreach (CircuitBoxConnection connection in CircuitBoxConnections.ToArray()) + foreach (CircuitBoxConnection connection in CircuitBoxConnections) { connection.ReceiveSignal(signal); GameMain.LuaCs.Hook.Call("signalReceived", signal, connection.Connection); GameMain.LuaCs.Hook.Call("signalReceived." + connection.Connection.Item.Prefab.Identifier, signal, connection); } enumeratingWires = false; - foreach (var removedWire in removedWires.ToArray()) + foreach (var removedWire in removedWires) { wires.Remove(removedWire); } @@ -374,16 +372,14 @@ namespace Barotrauma.Items.Components { conn.LastReceivedSignal = signal; - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in conn.item.Components.ToArray()) + foreach (ItemComponent ic in conn.item.Components) { ic.ReceiveSignal(signal, conn); } if (conn.Effects == null || signal.value == "0") { return; } - // Use ToArray() snapshot for thread-safe iteration - foreach (StatusEffect effect in conn.Effects.ToArray()) + foreach (StatusEffect effect in conn.Effects) { conn.Item.ApplyStatusEffect(effect, ActionType.OnUse, (float)Timing.Step); } @@ -393,15 +389,13 @@ namespace Barotrauma.Items.Components { if (IsPower && Grid != null) { - Powered.MarkConnectionChanged(this); - // Use ToArray() snapshot for thread-safe iteration - foreach (Connection c in recipients.ToArray()) + Powered.ChangedConnections.Add(this); + foreach (Connection c in recipients) { - Powered.MarkConnectionChanged(c); + Powered.ChangedConnections.Add(c); } } - // Use ToArray() snapshot for thread-safe iteration - foreach (var wire in wires.ToArray()) + foreach (var wire in wires) { wire.RemoveConnection(this); recipientsDirty = true; @@ -409,7 +403,7 @@ namespace Barotrauma.Items.Components if (enumeratingWires) { - foreach (var wire in wires.ToArray()) + foreach (var wire in wires) { removedWires.Add(wire); } @@ -452,8 +446,7 @@ namespace Barotrauma.Items.Components { XElement newElement = new XElement(IsOutput ? "output" : "input", new XAttribute("name", Name)); - // Use ToArray() snapshot before OrderBy for thread-safe iteration - foreach (var wire in wires.ToArray().OrderBy(w => w.Item.ID)) + foreach (var wire in wires.OrderBy(w => w.Item.ID)) { newElement.Add(new XElement("link", new XAttribute("w", wire.Item.ID.ToString()), diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/ConnectionPanel.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/ConnectionPanel.cs index e25edc896..5fddc96c6 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/ConnectionPanel.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/ConnectionPanel.cs @@ -148,16 +148,14 @@ namespace Barotrauma.Items.Components Vector2 wireNodeOffset = item.Submarine == null ? Vector2.Zero : item.Submarine.HiddenSubPosition + amount; foreach (Connection c in Connections) { - // Use ToArray() snapshot for thread-safe iteration - foreach (Wire wire in c.Wires.ToArray()) + foreach (Wire wire in c.Wires) { if (wire == null) { continue; } TryMoveWire(wire); } } - // Use ToList() snapshot for thread-safe iteration - foreach (var wire in DisconnectedWires.ToList()) + foreach (var wire in DisconnectedWires) { TryMoveWire(wire); } @@ -389,7 +387,7 @@ namespace Barotrauma.Items.Components } foreach (var connection in Connections) { - Powered.UnmarkConnectionChanged(connection); + Powered.ChangedConnections.Remove(connection); connection.Recipients.Clear(); } Connections.Clear(); @@ -414,19 +412,15 @@ namespace Barotrauma.Items.Components msg.WriteByte((byte)Connections.Count); foreach (Connection connection in Connections) { - // Use ToArray() snapshot for thread-safe iteration - var wiresSnapshot = connection.Wires.ToArray(); - msg.WriteVariableUInt32((uint)wiresSnapshot.Length); - foreach (Wire wire in wiresSnapshot) + msg.WriteVariableUInt32((uint)connection.Wires.Count); + foreach (Wire wire in connection.Wires) { msg.WriteUInt16(wire?.Item == null ? (ushort)0 : wire.Item.ID); } } - // Use ToList() snapshot for thread-safe iteration - var disconnectedSnapshot = DisconnectedWires.ToList(); - msg.WriteUInt16((ushort)disconnectedSnapshot.Count); - foreach (Wire disconnectedWire in disconnectedSnapshot) + msg.WriteUInt16((ushort)DisconnectedWires.Count); + foreach (Wire disconnectedWire in DisconnectedWires) { msg.WriteUInt16(disconnectedWire.Item.ID); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/DelayComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/DelayComponent.cs index 3c9e4e7f8..20ec92857 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/DelayComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/DelayComponent.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Xml.Linq; using Microsoft.Xna.Framework; namespace Barotrauma.Items.Components @@ -27,8 +25,7 @@ namespace Barotrauma.Items.Components private int signalQueueSize; private int delayTicks; - // Thread-safe queue for concurrent access - private readonly ConcurrentQueue signalQueue = new ConcurrentQueue(); + private readonly Queue signalQueue = new Queue(); private DelayedSignal prevQueuedSignal; @@ -43,8 +40,7 @@ namespace Barotrauma.Items.Components delay = value; delayTicks = (int)(delay / Timing.Step); signalQueueSize = Math.Max(delayTicks, 1) * 2; - // ConcurrentQueue doesn't have Clear(), drain it instead - while (signalQueue.TryDequeue(out _)) { } + signalQueue.Clear(); } } @@ -70,19 +66,19 @@ namespace Barotrauma.Items.Components public override void Update(float deltaTime, Camera cam) { - if (signalQueue.IsEmpty) + if (signalQueue.Count == 0) { IsActive = false; return; } - // Use ToArray() snapshot for thread-safe iteration - foreach (var val in signalQueue.ToArray()) + foreach (var val in signalQueue) { val.SendTimer -= 1; } - while (signalQueue.TryPeek(out var signalOut) && signalOut.SendTimer <= 0) + while (signalQueue.Count > 0 && signalQueue.Peek().SendTimer <= 0) { + var signalOut = signalQueue.Peek(); signalOut.SendDuration -= 1; item.SendSignal(new Signal(signalOut.Signal.value, sender: signalOut.Signal.sender, strength: signalOut.Signal.strength), "signal_out"); if (signalOut.SendDuration <= 0) @@ -104,15 +100,11 @@ namespace Barotrauma.Items.Components { case "signal_in": if (signalQueue.Count >= signalQueueSize) { return; } - if (ResetWhenSignalReceived) - { - prevQueuedSignal = null; - while (signalQueue.TryDequeue(out _)) { } - } - if (ResetWhenDifferentSignalReceived && signalQueue.TryPeek(out var peekSignal) && peekSignal.Signal.value != signal.value) + if (ResetWhenSignalReceived) { prevQueuedSignal = null; signalQueue.Clear(); } + if (ResetWhenDifferentSignalReceived && signalQueue.Count > 0 && signalQueue.Peek().Signal.value != signal.value) { prevQueuedSignal = null; - while (signalQueue.TryDequeue(out _)) { } + signalQueue.Clear(); } if (prevQueuedSignal != null && @@ -135,10 +127,10 @@ namespace Barotrauma.Items.Components if (float.TryParse(signal.value, NumberStyles.Any, CultureInfo.InvariantCulture, out float newDelay)) { newDelay = MathHelper.Clamp(newDelay, 0, 60); - if (!signalQueue.IsEmpty && newDelay != Delay) + if (signalQueue.Count > 0 && newDelay != Delay) { prevQueuedSignal = null; - while (signalQueue.TryDequeue(out _)) { } + signalQueue.Clear(); } Delay = newDelay; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RelayComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RelayComponent.cs index adb51a1ff..ea7c81e90 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RelayComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/RelayComponent.cs @@ -2,7 +2,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; using System.Xml.Linq; @@ -32,8 +31,7 @@ namespace Barotrauma.Items.Components private float thirdInverseMax = 0, loadEqnConstant = 0; - // Thread-safe immutable dictionary for connection pairs (read-only after initialization) - private static readonly ImmutableDictionary connectionPairs = new Dictionary + private static readonly Dictionary connectionPairs = new Dictionary { { "power_in", "power_out"}, { "signal_in", "signal_out" }, @@ -42,7 +40,7 @@ namespace Barotrauma.Items.Components { "signal_in3", "signal_out3" }, { "signal_in4", "signal_out4" }, { "signal_in5", "signal_out5" } - }.ToImmutableDictionary(); + }; protected override PowerPriority Priority { get { return PowerPriority.Relay; } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WifiComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WifiComponent.cs index 68a978626..e59ab6599 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WifiComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/WifiComponent.cs @@ -1,7 +1,6 @@ using Barotrauma.Networking; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -11,8 +10,7 @@ namespace Barotrauma.Items.Components { partial class WifiComponent : ItemComponent, IServerSerializable, IClientSerializable { - private static readonly ConcurrentDictionary _wifiDict = new ConcurrentDictionary(); - private static IEnumerable AllWifiComponents => _wifiDict.Keys; + private static readonly List list = new List(); const int ChannelMemorySize = 10; @@ -113,7 +111,7 @@ namespace Barotrauma.Items.Components public WifiComponent(Item item, ContentXElement element) : base (item, element) { - _wifiDict.TryAdd(this, 0); + list.Add(this); IsActive = true; } @@ -158,7 +156,7 @@ namespace Barotrauma.Items.Components /// public IEnumerable GetReceiversInRange() { - return AllWifiComponents.Where(w => w != this && w.CanReceive(this)); + return list.Where(w => w != this && w.CanReceive(this)); } public bool CanReceive(WifiComponent sender) @@ -187,7 +185,7 @@ namespace Barotrauma.Items.Components /// public IEnumerable GetTransmittersInRange() { - return AllWifiComponents.Where(w => w != this && w.CanTransmit(this)); + return list.Where(w => w != this && w.CanTransmit(this)); } public bool CanTransmit(WifiComponent sender) @@ -277,8 +275,7 @@ namespace Barotrauma.Items.Components if (signal.source != null) { - // Use ToList() snapshot for thread-safe iteration - foreach (Connection receiver in wifiComp.item.LastSentSignalRecipients.ToList()) + foreach (Connection receiver in wifiComp.item.LastSentSignalRecipients) { if (!signal.source.LastSentSignalRecipients.Contains(receiver)) { @@ -369,7 +366,7 @@ namespace Barotrauma.Items.Components protected override void RemoveComponentSpecific() { base.RemoveComponentSpecific(); - _wifiDict.TryRemove(this, out _); + list.Remove(this); } public override XElement Save(XElement parentElement) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Wire.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Wire.cs index 2db146e99..2dd1fbd7f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Wire.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/Wire.cs @@ -250,8 +250,7 @@ namespace Barotrauma.Items.Components { if (connections[0] != null && connections[1] != null) { - // Use ToArray() snapshot for thread-safe iteration - foreach (ItemComponent ic in item.Components.ToArray()) + foreach (ItemComponent ic in item.Components) { if (ic == this) { continue; } @@ -724,11 +723,11 @@ namespace Barotrauma.Items.Components if (item0 == null && item1 != null) { - item0 = Item.ItemList.FirstOrDefault(it => it.GetComponent()?.DisconnectedWires.Contains(this) ?? false); + item0 = Item.ItemList.Find(it => it.GetComponent()?.DisconnectedWires.Contains(this) ?? false); } else if (item0 != null && item1 == null) { - item1 = Item.ItemList.FirstOrDefault(it => it.GetComponent()?.DisconnectedWires.Contains(this) ?? false); + item1 = Item.ItemList.Find(it => it.GetComponent()?.DisconnectedWires.Contains(this) ?? false); } if (item0 == null || item1 == null || nodes.Count == 0) { return; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs index 228df8dc9..b2ff80ee6 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/TriggerComponent.cs @@ -73,11 +73,6 @@ namespace Barotrauma.Items.Components public PhysicsBody PhysicsBody { get; private set; } - /// - /// Flag to prevent multiple queued refresh requests. - /// - private volatile bool physicsBodyRefreshQueued; - private float radius; [Editable, Serialize(0.0f, IsPropertySaveable.Yes)] public float Radius @@ -88,7 +83,7 @@ namespace Barotrauma.Items.Components { if (radius == value) { return; } radius = value; - if (PhysicsBody != null) { QueuePhysicsBodyRefresh(); } + if (PhysicsBody != null) { RefreshPhysicsBodySize(); } } } @@ -102,7 +97,7 @@ namespace Barotrauma.Items.Components { if (width == value) { return; } width = value; - if (PhysicsBody != null) { QueuePhysicsBodyRefresh(); } + if (PhysicsBody != null) { RefreshPhysicsBodySize(); } } } @@ -116,28 +111,10 @@ namespace Barotrauma.Items.Components { if (height == value) { return; } height = value; - if (PhysicsBody != null) { QueuePhysicsBodyRefresh(); } + if (PhysicsBody != null) { RefreshPhysicsBodySize(); } } } - /// - /// Queue the physics body refresh to be executed on the main thread. - /// This is necessary because physics body operations are not thread-safe. - /// - private void QueuePhysicsBodyRefresh() - { - if (physicsBodyRefreshQueued) { return; } - physicsBodyRefreshQueued = true; - PhysicsBodyQueue.EnqueueCreation(() => - { - if (!item.Removed) - { - RefreshPhysicsBodySize(); - } - physicsBodyRefreshQueued = false; - }); - } - private float currentRadius, currentWidth, currentHeight; private Vector2 bodyOffset; @@ -312,18 +289,13 @@ namespace Barotrauma.Items.Components Matrix transform = Matrix.CreateRotationZ(-item.RotationRad); offset = Vector2.Transform(offset, transform); } - - // Defer physics operations if in parallel context (Farseer is not thread-safe) - var capturedBody = PhysicsBody; - var capturedPos = item.SimPosition + offset; - var capturedRot = -item.RotationRad; if (ignoreContacts) { - PhysicsBodyQueue.ExecuteOrDefer(() => capturedBody.SetTransformIgnoreContacts(capturedPos, capturedRot)); + PhysicsBody.SetTransformIgnoreContacts(item.SimPosition + offset, -item.RotationRad); } else { - PhysicsBodyQueue.ExecuteOrDefer(() => capturedBody.SetTransform(capturedPos, capturedRot)); + PhysicsBody.SetTransform(item.SimPosition + offset, -item.RotationRad); } PhysicsBody.UpdateDrawPosition(); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs index 68c35aab3..d1be5145e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs @@ -381,8 +381,7 @@ namespace Barotrauma if (Owner is not Item it) { return; } - // Use ToArray() snapshot for thread-safe iteration - foreach (var c in it.Components.ToArray()) + foreach (var c in it.Components) { c.OnInventoryChanged(); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs index 8ad7bfea1..83b869ba4 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs @@ -14,9 +14,7 @@ using Barotrauma.Extensions; using Barotrauma.MapCreatures.Behavior; using MoonSharp.Interpreter; using System.Collections.Immutable; -using System.Threading; using Barotrauma.Abilities; -using HarmonyLib; #if CLIENT using Microsoft.Xna.Framework.Graphics; @@ -29,172 +27,57 @@ namespace Barotrauma #region Lists /// - /// Thread-safe dictionary of all items by ID. + /// A list of every item that exists somewhere in the world. Note that there can be a huge number of items in the list, + /// and you probably shouldn't be enumerating it to find some that match some specific criteria (unless that's done very, very sparsely or during initialization). /// - private static readonly ConcurrentDictionary _itemDictionary = new ConcurrentDictionary(); + public static readonly List ItemList = new List(); - /// - /// Provides thread-safe enumeration over all items. - /// - public static ICollection ItemList => _itemDictionary.Values; - - /// - /// Thread-safe item lookup by ID. - /// - public static Item GetItemById(ushort id) - { - _itemDictionary.TryGetValue(id, out var item); - return item; - } - - // Thread-safe optimized item collections using Immutable + atomic swap pattern - private static volatile ImmutableHashSet _dangerousItems = ImmutableHashSet.Empty; - private static volatile ImmutableHashSet _repairableItems = ImmutableHashSet.Empty; - private static volatile ImmutableHashSet _cleanableItems = ImmutableHashSet.Empty; - private static volatile ImmutableHashSet _sonarVisibleItems = ImmutableHashSet.Empty; - private static volatile ImmutableHashSet _turretTargetItems = ImmutableHashSet.Empty; - private static volatile ImmutableHashSet _chairItems = ImmutableHashSet.Empty; - - // DeconstructItems uses ConcurrentDictionary to simulate a thread-safe HashSet - private static readonly ConcurrentDictionary _deconstructItems = new ConcurrentDictionary(); + private static readonly HashSet _dangerousItems = new HashSet(); public static IReadOnlyCollection DangerousItems => _dangerousItems; + private static readonly List _repairableItems = new List(); + /// /// Items that have one more more Repairable component /// public static IReadOnlyCollection RepairableItems => _repairableItems; + private static readonly List _cleanableItems = new List(); + /// /// Items that may potentially need to be cleaned up (pickable, not attached to a wall, and not inside a valid container) /// public static IReadOnlyCollection CleanableItems => _cleanableItems; + private static readonly HashSet _deconstructItems = new HashSet(); + /// - /// Items that have been marked for deconstruction. Thread-safe collection. + /// Items that have been marked for deconstruction /// - public static ICollection DeconstructItems => _deconstructItems.Keys; + public static HashSet DeconstructItems => _deconstructItems; + + private static readonly List _sonarVisibleItems = new List(); /// /// Items whose is larger than 0 /// public static IReadOnlyCollection SonarVisibleItems => _sonarVisibleItems; + private static readonly List _turretTargetItems = new List(); + /// /// Items whose is true. /// public static IReadOnlyCollection TurretTargetItems => _turretTargetItems; + private static readonly List _chairItems = new List(); + /// /// Items that have the tag . Which is an oddly specific thing, but useful as an optimization for NPC AI. /// public static IReadOnlyCollection ChairItems => _chairItems; - #region Thread-safe collection helpers - - /// - /// Atomically adds an item to an immutable set using compare-and-swap. - /// - private static void AddToImmutableSet(ref ImmutableHashSet location, Item item) - { - ImmutableHashSet original, updated; - do - { - original = location; - updated = original.Add(item); - if (ReferenceEquals(original, updated)) return; // Already exists - } - while (Interlocked.CompareExchange(ref location, updated, original) != original); - } - - /// - /// Atomically removes an item from an immutable set using compare-and-swap. - /// - private static void RemoveFromImmutableSet(ref ImmutableHashSet location, Item item) - { - ImmutableHashSet original, updated; - do - { - original = location; - updated = original.Remove(item); - if (ReferenceEquals(original, updated)) return; // Doesn't exist - } - while (Interlocked.CompareExchange(ref location, updated, original) != original); - } - - /// - /// Marks an item for deconstruction (thread-safe). - /// - public static void MarkForDeconstruction(Item item) - { - _deconstructItems.TryAdd(item, 0); - } - - /// - /// Unmarks an item for deconstruction (thread-safe). - /// - public static void UnmarkForDeconstruction(Item item) - { - _deconstructItems.TryRemove(item, out _); - } - - /// - /// Checks if an item is marked for deconstruction (thread-safe). - /// - public static bool IsMarkedForDeconstruction(Item item) - { - return _deconstructItems.ContainsKey(item); - } - - /// - /// Clears all item collections (thread-safe). Used during unloading. - /// - public static void ClearAllItemCollections() - { - _itemDictionary.Clear(); - _dangerousItems = ImmutableHashSet.Empty; - _repairableItems = ImmutableHashSet.Empty; - _cleanableItems = ImmutableHashSet.Empty; - _sonarVisibleItems = ImmutableHashSet.Empty; - _turretTargetItems = ImmutableHashSet.Empty; - _chairItems = ImmutableHashSet.Empty; - _deconstructItems.Clear(); - while (_pendingConditionUpdates.TryDequeue(out _)) { } - _cachedItemList = null; - _cachedItemListVersion = -1; - } - - // Cached item list for indexed access (used by AI systems) - private static volatile List _cachedItemList; - private static volatile int _cachedItemListVersion = -1; - private static volatile int _itemListVersion; - - /// - /// Gets a cached list snapshot of all items for indexed access. - /// The list is refreshed when items are added or removed. - /// Thread-safe but may return slightly stale data. - /// - public static List GetCachedItemList() - { - int currentVersion = _itemListVersion; - if (_cachedItemList == null || _cachedItemListVersion != currentVersion) - { - _cachedItemList = _itemDictionary.Values.ToList(); - _cachedItemListVersion = currentVersion; - } - return _cachedItemList; - } - - /// - /// Called when items are added or removed to invalidate the cached list. - /// - private static void InvalidateCachedItemList() - { - Interlocked.Increment(ref _itemListVersion); - } - - #endregion - #endregion public new ItemPrefab Prefab => base.Prefab as ItemPrefab; @@ -296,12 +179,7 @@ namespace Barotrauma private bool transformDirty = true; - private static readonly ConcurrentQueue _pendingConditionUpdates = new ConcurrentQueue(); - - /// - /// Flag to avoid duplicate enqueue for pending condition updates. - /// - private volatile bool _hasPendingConditionUpdate; + private static readonly List itemsWithPendingConditionUpdates = new List(); private float lastSentCondition; private float sendConditionUpdateTimer; @@ -967,11 +845,11 @@ namespace Barotrauma isDangerous = value; if (!value) { - RemoveFromImmutableSet(ref _dangerousItems, this); + _dangerousItems.Remove(this); } else { - AddToImmutableSet(ref _dangerousItems, this); + _dangerousItems.Add(this); } } } @@ -1520,13 +1398,12 @@ namespace Barotrauma } InsertToList(); - _itemDictionary.TryAdd(ID, this); - InvalidateCachedItemList(); - if (Prefab.IsDangerous) { AddToImmutableSet(ref _dangerousItems, this); } - if (Repairables.Any()) { AddToImmutableSet(ref _repairableItems, this); } - if (Prefab.SonarSize > 0.0f) { AddToImmutableSet(ref _sonarVisibleItems, this); } - if (Prefab.IsAITurretTarget) { AddToImmutableSet(ref _turretTargetItems, this); } - if (Prefab.Tags.Contains(Barotrauma.Tags.ChairItem)) { AddToImmutableSet(ref _chairItems, this); } + ItemList.Add(this); + if (Prefab.IsDangerous) { _dangerousItems.Add(this); } + if (Repairables.Any()) { _repairableItems.Add(this); } + if (Prefab.SonarSize > 0.0f) { _sonarVisibleItems.Add(this); } + if (Prefab.IsAITurretTarget) { _turretTargetItems.Add(this); } + if (Prefab.Tags.Contains(Barotrauma.Tags.ChairItem)) { _chairItems.Add(this); } CheckCleanable(); DebugConsole.Log("Created " + Name + " (" + ID + ")"); @@ -1822,13 +1699,7 @@ namespace Barotrauma try { #endif - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedBody = body; - var capturedSimPos = simPosition; - var capturedRotation = rotation; - var capturedSetPrevTransform = setPrevTransform; - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedBody.SetTransformIgnoreContacts(capturedSimPos, capturedRotation, capturedSetPrevTransform)); + body.SetTransformIgnoreContacts(simPosition, rotation, setPrevTransform); #if DEBUG } catch (Exception e) @@ -1885,11 +1756,14 @@ namespace Barotrauma Prefab.PreferredContainers.Any() && (container == null || container.HasTag(Barotrauma.Tags.AllowCleanup))) { - AddToImmutableSet(ref _cleanableItems, this); + if (!_cleanableItems.Contains(this)) + { + _cleanableItems.Add(this); + } } else { - RemoveFromImmutableSet(ref _cleanableItems, this); + _cleanableItems.Remove(this); } } @@ -1905,19 +1779,13 @@ namespace Barotrauma if (ItemList != null && body != null) { - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedBody = body; - var capturedNewPos = body.SimPosition + ConvertUnits.ToSimUnits(amount); - var capturedRotation = body.Rotation; if (ignoreContacts) { - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedBody.SetTransformIgnoreContacts(capturedNewPos, capturedRotation)); + body.SetTransformIgnoreContacts(body.SimPosition + ConvertUnits.ToSimUnits(amount), body.Rotation); } else { - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedBody.SetTransform(capturedNewPos, capturedRotation)); + body.SetTransform(body.SimPosition + ConvertUnits.ToSimUnits(amount), body.Rotation); } } foreach (ItemComponent ic in components) @@ -2426,10 +2294,9 @@ namespace Barotrauma { needsConditionUpdate = true; } - if (needsConditionUpdate && !_hasPendingConditionUpdate) + if (needsConditionUpdate && !itemsWithPendingConditionUpdates.Contains(this)) { - _hasPendingConditionUpdate = true; - _pendingConditionUpdates.Enqueue(this); + itemsWithPendingConditionUpdates.Add(this); } } @@ -2453,11 +2320,10 @@ namespace Barotrauma { if (c.IsPower) { - Powered.MarkConnectionChanged(c); - // Use ToList() snapshot for thread-safe iteration - foreach (Connection conn in c.Recipients.ToList()) + Powered.ChangedConnections.Add(c); + foreach (Connection conn in c.Recipients) { - Powered.MarkConnectionChanged(conn); + Powered.ChangedConnections.Add(conn); } } } @@ -2486,9 +2352,9 @@ namespace Barotrauma public void SendPendingNetworkUpdates() { if (!(GameMain.NetworkMember is { IsServer: true })) { return; } - if (!_hasPendingConditionUpdate) { return; } + if (!itemsWithPendingConditionUpdates.Contains(this)) { return; } SendPendingNetworkUpdatesInternal(); - _hasPendingConditionUpdate = false; + itemsWithPendingConditionUpdates.Remove(this); } private void SendPendingNetworkUpdatesInternal() @@ -2517,35 +2383,21 @@ namespace Barotrauma public static void UpdatePendingConditionUpdates(float deltaTime) { if (GameMain.NetworkMember is not { IsServer: true }) { return; } - - int count = _pendingConditionUpdates.Count; - for (int i = 0; i < count; i++) + for (int i = 0; i < itemsWithPendingConditionUpdates.Count; i++) { - if (!_pendingConditionUpdates.TryDequeue(out var item)) { break; } - + var item = itemsWithPendingConditionUpdates[i]; if (item == null || item.Removed) { - item._hasPendingConditionUpdate = false; - continue; - } - - if (item.Submarine is { Loading: true }) - { - // Re-enqueue, still loading - _pendingConditionUpdates.Enqueue(item); + itemsWithPendingConditionUpdates.RemoveAt(i--); continue; } + if (item.Submarine is { Loading: true }) { continue; } item.sendConditionUpdateTimer -= deltaTime; if (item.sendConditionUpdateTimer <= 0.0f) { item.SendPendingNetworkUpdatesInternal(); - item._hasPendingConditionUpdate = false; - } - else - { - // Not ready yet, re-enqueue - _pendingConditionUpdates.Enqueue(item); + itemsWithPendingConditionUpdates.RemoveAt(i--); } } } @@ -2575,12 +2427,7 @@ namespace Barotrauma if (item != this) { item.body.Enabled = false; - // Defer physics operation if in parallel context (Farseer is not thread-safe) - var capturedItemBody = item.body; - var capturedSimPos = this.SimPosition; - var capturedRotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => - capturedItemBody.SetTransformIgnoreContacts(capturedSimPos, capturedRotation)); + item.body.SetTransformIgnoreContacts(this.SimPosition, body.Rotation); } } } @@ -2772,25 +2619,17 @@ namespace Barotrauma FindHull(); } - // Defer physics transform operations if in parallel context. - // Farseer's DynamicTree is not thread-safe. if (Submarine == null && prevSub != null) { - Vector2 newPos = body.SimPosition + prevSub.SimPosition; - float rotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => body.SetTransformIgnoreContacts(newPos, rotation)); + body.SetTransformIgnoreContacts(body.SimPosition + prevSub.SimPosition, body.Rotation); } else if (Submarine != null && prevSub == null) { - Vector2 newPos = body.SimPosition - Submarine.SimPosition; - float rotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => body.SetTransformIgnoreContacts(newPos, rotation)); + body.SetTransformIgnoreContacts(body.SimPosition - Submarine.SimPosition, body.Rotation); } else if (Submarine != null && prevSub != null && Submarine != prevSub) { - Vector2 newPos = body.SimPosition + prevSub.SimPosition - Submarine.SimPosition; - float rotation = body.Rotation; - PhysicsBodyQueue.ExecuteOrDefer(() => body.SetTransformIgnoreContacts(newPos, rotation)); + body.SetTransformIgnoreContacts(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation); } if (Submarine != prevSub) @@ -3006,8 +2845,7 @@ namespace Barotrauma foreach (Connection c in connectionPanel.Connections) { if (connectionFilter != null && !connectionFilter(c)) { continue; } - // Use ToList() snapshot for thread-safe iteration - foreach (Connection recipient in c.Recipients.ToList()) + foreach (Connection recipient in c.Recipients) { var component = recipient.Item.GetComponent(); if (component != null) @@ -3040,8 +2878,7 @@ namespace Barotrauma foreach (Connection c in connectionPanel.Connections) { if (connectionFilter != null && !connectionFilter(c)) { continue; } - // Use ToList() snapshot for thread-safe iteration - foreach (Connection recipient in c.Recipients.ToList()) + foreach (Connection recipient in c.Recipients) { var component = recipient.Item.GetComponent(); if (component != null && !connectedComponents.Contains(component)) @@ -3095,13 +2932,12 @@ namespace Barotrauma alreadySearched.Add(c); static IEnumerable GetRecipients(Connection c) { - // Use ToList() snapshot for thread-safe iteration - foreach (Connection recipient in c.Recipients.ToList()) + foreach (Connection recipient in c.Recipients) { yield return recipient; } //check circuit box inputs/outputs this connection is connected to - foreach (var circuitBoxConnection in c.CircuitBoxConnections.ToArray()) + foreach (var circuitBoxConnection in c.CircuitBoxConnections) { yield return circuitBoxConnection.Connection; } @@ -3241,8 +3077,7 @@ namespace Barotrauma if (signal.stepsTaken > 5 && signal.source != null) { int duplicateRecipients = 0; - // Use ToList() snapshot for thread-safe iteration - foreach (var recipient in signal.source.LastSentSignalRecipients.ToList()) + foreach (var recipient in signal.source.LastSentSignalRecipients) { if (recipient == connection) { @@ -3694,45 +3529,20 @@ namespace Barotrauma if (body != null) { IsActive = true; - - // Physics body operations must be deferred if we're in a parallel update context, - // because Farseer Physics is not thread-safe. - if (PhysicsBodyQueue.IsInParallelContext) + body.Enabled = true; + body.PhysEnabled = true; + body.ResetDynamics(); + if (dropper != null) { - // Capture the values we need for the deferred operation - var capturedBody = body; - var capturedDropperSimPos = dropper?.SimPosition ?? Microsoft.Xna.Framework.Vector2.Zero; - var capturedSetTransform = setTransform && dropper != null; - - PhysicsBodyQueue.Enqueue(() => + if (body.Removed) { - if (capturedBody.Removed || Removed) { return; } - capturedBody.Enabled = true; - capturedBody.PhysEnabled = true; - capturedBody.ResetDynamics(); - if (capturedSetTransform) - { - capturedBody.SetTransformIgnoreContacts(capturedDropperSimPos, 0.0f); - } - }); - } - else - { - body.Enabled = true; - body.PhysEnabled = true; - body.ResetDynamics(); - if (dropper != null) + DebugConsole.ThrowError( + "Failed to drop the item \"" + Name + "\" (body has been removed" + + (Removed ? ", item has been removed)" : ")")); + } + else if (setTransform) { - if (body.Removed) - { - DebugConsole.ThrowError( - "Failed to drop the item \"" + Name + "\" (body has been removed" - + (Removed ? ", item has been removed)" : ")")); - } - else if (setTransform) - { - body.SetTransformIgnoreContacts(dropper.SimPosition, 0.0f); - } + body.SetTransformIgnoreContacts(dropper.SimPosition, 0.0f); } } } @@ -3743,22 +3553,7 @@ namespace Barotrauma { if (setTransform) { - // Defer SetTransform if in parallel context - if (PhysicsBodyQueue.IsInParallelContext) - { - var capturedContainerSimPos = Container.SimPosition; - PhysicsBodyQueue.Enqueue(() => - { - if (!Removed) - { - SetTransform(capturedContainerSimPos, 0.0f); - } - }); - } - else - { - SetTransform(Container.SimPosition, 0.0f); - } + SetTransform(Container.SimPosition, 0.0f); } Container.RemoveContained(this); Container = null; @@ -4422,7 +4217,7 @@ namespace Barotrauma } } - if (element.GetAttributeBool("markedfordeconstruction", false)) { _deconstructItems.TryAdd(item, 0); } + if (element.GetAttributeBool("markedfordeconstruction", false)) { _deconstructItems.Add(item); } float prevRotation = item.Rotation; if (element.GetAttributeBool("flippedx", false)) { item.FlipX(relativeToSub: false, force: true); } @@ -4715,7 +4510,7 @@ namespace Barotrauma new XAttribute("name", Prefab.OriginalName), new XAttribute("identifier", Prefab.Identifier), new XAttribute("ID", ID), - new XAttribute("markedfordeconstruction", _deconstructItems.ContainsKey(this))); + new XAttribute("markedfordeconstruction", _deconstructItems.Contains(this))); if (PendingItemSwap != null) { @@ -4918,16 +4713,14 @@ namespace Barotrauma private void RemoveFromLists() { - _itemDictionary.TryRemove(ID, out _); - InvalidateCachedItemList(); - RemoveFromImmutableSet(ref _dangerousItems, this); - RemoveFromImmutableSet(ref _repairableItems, this); - RemoveFromImmutableSet(ref _sonarVisibleItems, this); - RemoveFromImmutableSet(ref _cleanableItems, this); - _deconstructItems.TryRemove(this, out _); - RemoveFromImmutableSet(ref _turretTargetItems, this); - RemoveFromImmutableSet(ref _chairItems, this); - _hasPendingConditionUpdate = false; + ItemList.Remove(this); + _dangerousItems.Remove(this); + _repairableItems.Remove(this); + _sonarVisibleItems.Remove(this); + _cleanableItems.Remove(this); + _deconstructItems.Remove(this); + _turretTargetItems.Remove(this); + _chairItems.Remove(this); RemoveFromDroppedStack(allowClientExecute: true); } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Creatures/BallastFloraBehavior.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Creatures/BallastFloraBehavior.cs index d6356c63d..a06585116 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Creatures/BallastFloraBehavior.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Creatures/BallastFloraBehavior.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Linq; -using System.Threading; using System.Xml.Linq; using Barotrauma.Extensions; using Barotrauma.Items.Components; @@ -15,55 +14,6 @@ using Microsoft.Xna.Framework; namespace Barotrauma.MapCreatures.Behavior { - /// - /// Thread-safe wrapper for BallastFloraBehavior list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeBallastFloraList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(BallastFloraBehavior entity) - { - lock (_writeLock) - { - var newList = new List(_list) { entity }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(BallastFloraBehavior entity) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(entity); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - } - class BallastFloraBranch : VineTile { public readonly BallastFloraBehavior? ParentBallastFlora; @@ -182,7 +132,7 @@ namespace Barotrauma.MapCreatures.Behavior public List> debugSearchLines = new List>(); #endif - private readonly static ThreadSafeBallastFloraList _entityList = new ThreadSafeBallastFloraList(); + private readonly static List _entityList = new List(); public static IEnumerable EntityList => _entityList; public enum NetworkHeader @@ -357,12 +307,6 @@ namespace Barotrauma.MapCreatures.Behavior public readonly List Branches = new List(); private BallastFloraBranch? root; private readonly List bodies = new List(); - - /// - /// Branches that need physics bodies created on the main thread. - /// - private readonly List pendingBodyCreations = new List(); - private readonly object pendingBodyCreationsLock = new object(); private bool isDead; @@ -403,8 +347,7 @@ namespace Barotrauma.MapCreatures.Behavior } } UpdateConnections(branch); - // OnMapLoaded runs on the main thread, so we can create bodies immediately - CreateBody(branch, immediate: true); + CreateBody(branch); } } @@ -1055,52 +998,10 @@ namespace Barotrauma.MapCreatures.Behavior } /// - /// Queue a physics body creation for a branch. - /// The actual body will be created on the main thread to ensure thread safety. + /// Create a body for a branch which works as the hitbox for flamer /// - /// The branch to create a body for - /// If true, create the body immediately (only safe when called from main thread) - private void CreateBody(BallastFloraBranch branch, bool immediate = false) - { - if (immediate) - { - CreateBodyImmediate(branch); - return; - } - - lock (pendingBodyCreationsLock) - { - pendingBodyCreations.Add(branch); - } - PhysicsBodyQueue.EnqueueCreation(() => ProcessPendingBodyCreations()); - } - - /// - /// Process all pending body creations on the main thread. - /// This ensures Farseer Physics operations are thread-safe. - /// - private void ProcessPendingBodyCreations() - { - List branchesToProcess; - lock (pendingBodyCreationsLock) - { - if (pendingBodyCreations.Count == 0) { return; } - branchesToProcess = new List(pendingBodyCreations); - pendingBodyCreations.Clear(); - } - - foreach (var branch in branchesToProcess) - { - if (branch.Removed) { continue; } - CreateBodyImmediate(branch); - } - } - - /// - /// Actually create the physics body for a branch. - /// Must be called on the main thread. - /// - private void CreateBodyImmediate(BallastFloraBranch branch) + /// + private void CreateBody(BallastFloraBranch branch) { Rectangle rect = branch.Rect; Vector2 pos = Parent.Position + Offset + branch.Position; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs index 85d5d8cef..3798ce08b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Entity.cs @@ -1,6 +1,5 @@ using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using Barotrauma.IO; @@ -21,10 +20,10 @@ namespace Barotrauma public const ushort MaxEntityCount = ushort.MaxValue - 4; //ushort.MaxValue - 4 because the 4 values above are reserved values - private static readonly ConcurrentDictionary dictionary = new ConcurrentDictionary(); + private static readonly Dictionary dictionary = new Dictionary(); public static IReadOnlyCollection GetEntities() { - return (IReadOnlyCollection)dictionary.Values; + return dictionary.Values; } public static int EntityCount => dictionary.Count; @@ -123,11 +122,13 @@ namespace Barotrauma //give a unique ID ID = DetermineID(id, submarine); - if (!dictionary.TryAdd(ID, this)) + if (dictionary.ContainsKey(ID)) { throw new Exception($"ID {ID} is taken by {dictionary[ID]}"); } + dictionary.Add(ID, this); + CreationStackTrace = ""; #if DEBUG var st = new StackTrace(skipFrames: 2, fNeedFileInfo: true); @@ -146,6 +147,7 @@ namespace Barotrauma CreationStackTrace += $"{fileName}@{fileLineNumber}; "; } #endif + #warning TODO: consider removing this mutex, entity creation probably shouldn't be multithreaded lock (creationCounterMutex) { CreationIndex = creationCounter; @@ -259,7 +261,7 @@ namespace Barotrauma DebugConsole.ThrowError($"Error while removing item \"{item}\"", exception); } } - Item.ClearAllItemCollections(); + Item.ItemList.Clear(); } if (Character.CharacterList.Count > 0) { @@ -323,7 +325,7 @@ namespace Barotrauma } else { - dictionary.TryRemove(ID, out _); + dictionary.Remove(ID); } IdFreed = true; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs index f5c63b773..5c11eebb7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs @@ -7,7 +7,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; namespace Barotrauma { @@ -649,11 +648,7 @@ namespace Barotrauma } } - // ThreadLocal for thread-safe structure damage tracking - private static readonly ThreadLocal> damagedStructuresLocal = - new ThreadLocal>(() => new Dictionary()); - private static Dictionary damagedStructures => damagedStructuresLocal.Value; - + private static readonly Dictionary damagedStructures = new Dictionary(); /// /// Returns a dictionary where the keys are the structures that took damage and the values are the amount of damage taken /// diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs index 3bb1cc2c7..5132d1418 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs @@ -8,71 +8,13 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Xml.Linq; namespace Barotrauma { - /// - /// Thread-safe wrapper for Gap list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeGapList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(Gap gap) - { - lock (_writeLock) - { - var newList = new List(_list) { gap }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(Gap gap) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(gap); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(Gap gap) => _list.Contains(gap); - - public Gap this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public Gap FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public Gap Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public IOrderedEnumerable OrderBy(Func keySelector) => _list.OrderBy(keySelector); - } - partial class Gap : MapEntity, ISerializableEntity { - public static ThreadSafeGapList GapList = new ThreadSafeGapList(); + public static List GapList = new List(); const float MaxFlowForce = 500.0f; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs index 50a1b3b39..1c193d983 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Hull.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Threading; using System.Xml.Linq; using Barotrauma.MapCreatures.Behavior; using Barotrauma.Items.Components; @@ -14,116 +13,6 @@ using Barotrauma.Extensions; namespace Barotrauma { - /// - /// Thread-safe wrapper for Hull list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeHullList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(Hull hull) - { - lock (_writeLock) - { - var newList = new List(_list) { hull }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(Hull hull) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(hull); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(Hull hull) => _list.Contains(hull); - - public Hull this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public Hull FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public Hull Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public bool Exists(Predicate predicate) => _list.Exists(predicate); - public void ForEach(Action action) => _list.ForEach(action); - } - - /// - /// Thread-safe wrapper for EntityGrid list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeEntityGridList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(EntityGrid grid) - { - lock (_writeLock) - { - var newList = new List(_list) { grid }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(EntityGrid grid) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(grid); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public EntityGrid this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public EntityGrid FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public EntityGrid Find(Predicate predicate) => _list.Find(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - } - partial class BackgroundSection { public Rectangle Rect; @@ -224,8 +113,8 @@ namespace Barotrauma partial class Hull : MapEntity, ISerializableEntity, IServerSerializable { - public readonly static ThreadSafeHullList HullList = new ThreadSafeHullList(); - public readonly static ThreadSafeEntityGridList EntityGrids = new ThreadSafeEntityGridList(); + public readonly static List HullList = new List(); + public readonly static List EntityGrids = new List(); public static bool ShowHulls = true; @@ -1244,18 +1133,13 @@ namespace Barotrauma } /// - /// Used in - ThreadLocal for thread safety + /// Used in /// - private static readonly ThreadLocal> cachedDistancesLocal = - new ThreadLocal>(() => new Dictionary()); + private static readonly Dictionary cachedDistances = []; /// - /// Used in - ThreadLocal for thread safety + /// Used in /// - private static readonly ThreadLocal> priorityQueueLocal = - new ThreadLocal>(() => new PriorityQueue<(Hull hull, Vector2 pos), float>()); - - private static Dictionary cachedDistances => cachedDistancesLocal.Value; - private static PriorityQueue<(Hull hull, Vector2 pos), float> priorityQueue => priorityQueueLocal.Value; + private static readonly PriorityQueue<(Hull hull, Vector2 pos), float> priorityQueue = new PriorityQueue<(Hull hull, Vector2 pos), float>(); /// /// Approximate distance from this hull to the target hull, moving through open gaps without passing through walls. diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs index c2e123bd1..c5f0d161f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs @@ -4775,7 +4775,7 @@ namespace Barotrauma // BeaconStation.FlipX(); // } - Item sonarItem = Item.ItemList.FirstOrDefault(it => it.Submarine == BeaconStation && it.GetComponent() != null); + Item sonarItem = Item.ItemList.Find(it => it.Submarine == BeaconStation && it.GetComponent() != null); if (sonarItem == null) { DebugConsole.ThrowError($"No sonar found in the beacon station \"{beaconStationName}\"!"); @@ -4794,7 +4794,7 @@ namespace Barotrauma throw new InvalidOperationException("Failed to prepare beacon station (no beacon station in the level)."); } - List beaconItems = Item.ItemList.Where(it => it.Submarine == BeaconStation).ToList(); + List beaconItems = Item.ItemList.FindAll(it => it.Submarine == BeaconStation); Item reactorItem = beaconItems.Find(it => it.GetComponent() != null); Reactor reactorComponent = null; @@ -4840,7 +4840,7 @@ namespace Barotrauma if (BeaconStation?.Info?.BeaconStationInfo is { AllowDisconnectedWires: false }) { return; } if (disconnectWireProbability <= 0.0f) { return; } - List beaconItems = Item.ItemList.Where(it => it.Submarine == BeaconStation).ToList(); + List beaconItems = Item.ItemList.FindAll(it => it.Submarine == BeaconStation); foreach (Item item in beaconItems.Where(it => it.GetComponent() != null).ToList()) { if (item.NonInteractable || item.InvulnerableToDamage) { continue; } @@ -4878,7 +4878,7 @@ namespace Barotrauma if (breakDeviceProbability <= 0.0f) { return; } //break powered items - List beaconItems = Item.ItemList.Where(it => it.Submarine == BeaconStation).ToList(); + List beaconItems = Item.ItemList.FindAll(it => it.Submarine == BeaconStation); foreach (Item item in beaconItems.Where(it => it.Components.Any(c => c is Powered) && it.Components.Any(c => c is Repairable))) { if (item.NonInteractable || item.InvulnerableToDamage) { continue; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs index 1c45364fd..637d5d2a8 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs @@ -1371,7 +1371,7 @@ namespace Barotrauma { foreach (TakenItem takenItem in takenItems) { - Item item = Item.ItemList.FirstOrDefault(it => takenItem.Matches(it)); + Item item = Item.ItemList.Find(it => takenItem.Matches(it)); item?.Remove(); } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs index 16023180d..7ef1b529e 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs @@ -6,111 +6,14 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection; -using System.Threading; using System.Threading.Tasks; using System.Xml.Linq; namespace Barotrauma { - /// - /// Thread-safe wrapper for MapEntity list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeMapEntityList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(MapEntity entity) - { - lock (_writeLock) - { - var newList = new List(_list) { entity }; - Interlocked.Exchange(ref _list, newList); - } - } - - public void Insert(int index, MapEntity entity) - { - lock (_writeLock) - { - var newList = new List(_list); - newList.Insert(index, entity); - Interlocked.Exchange(ref _list, newList); - } - } - - /// - /// Atomically inserts an entity at a position determined by the insertAction. - /// The insertAction is executed within the lock to ensure thread-safety. - /// - public void InsertWithAction(MapEntity entity, Action, MapEntity> insertAction) - { - lock (_writeLock) - { - var newList = new List(_list); - insertAction(newList, entity); - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(MapEntity entity) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(entity); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public int RemoveAll(Predicate match) - { - lock (_writeLock) - { - var newList = new List(_list); - int count = newList.RemoveAll(match); - if (count > 0) - { - Interlocked.Exchange(ref _list, newList); - } - return count; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(MapEntity entity) => _list.Contains(entity); - - public MapEntity this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods that work on a snapshot - public List ToList() => new List(_list); - public MapEntity FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public MapEntity Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any(Func predicate) => _list.Any(predicate); - public bool Exists(Predicate predicate) => _list.Exists(predicate); - public IOrderedEnumerable OrderBy(Func keySelector) => _list.OrderBy(keySelector); - public void ForEach(Action action) => _list.ForEach(action); - } - abstract partial class MapEntity : Entity, ISpatialEntity { - public readonly static ThreadSafeMapEntityList MapEntityList = new ThreadSafeMapEntityList(); + public readonly static List MapEntityList = new List(); public readonly MapEntityPrefab Prefab; @@ -656,51 +559,45 @@ namespace Barotrauma return; } - // Use atomic insertion to ensure thread-safety - MapEntityList.InsertWithAction(this, (list, entity) => + //sort damageable walls by sprite depth: + //necessary because rendering the damage effect starts a new sprite batch and breaks the order otherwise + int i = 0; + if (this is Structure { DrawDamageEffect: true } structure) { - int i = 0; - - //sort damageable walls by sprite depth: - //necessary because rendering the damage effect starts a new sprite batch and breaks the order otherwise - if (entity is Structure { DrawDamageEffect: true } structure) + //insertion sort according to draw depth + float drawDepth = structure.SpriteDepth; + while (i < MapEntityList.Count) { - //insertion sort according to draw depth - float drawDepth = structure.SpriteDepth; - while (i < list.Count) - { - float otherDrawDepth = (list[i] as Structure)?.SpriteDepth ?? 1.0f; - if (otherDrawDepth < drawDepth) { break; } - i++; - } - list.Insert(i, entity); + float otherDrawDepth = (MapEntityList[i] as Structure)?.SpriteDepth ?? 1.0f; + if (otherDrawDepth < drawDepth) { break; } + i++; + } + MapEntityList.Insert(i, this); + return; + } + + i = 0; + while (i < MapEntityList.Count) + { + i++; + if (MapEntityList[i - 1]?.Prefab == Prefab) + { + MapEntityList.Insert(i, this); return; } - - i = 0; - var mapEntity = (MapEntity)entity; - while (i < list.Count) - { - i++; - if (list[i - 1]?.Prefab == mapEntity.Prefab) - { - list.Insert(i, entity); - return; - } - } + } #if CLIENT - i = 0; - while (i < list.Count) - { - i++; - Sprite existingSprite = list[i - 1].Sprite; - if (existingSprite == null) { continue; } - if (existingSprite.Texture == mapEntity.Sprite?.Texture) { break; } - } + i = 0; + while (i < MapEntityList.Count) + { + i++; + Sprite existingSprite = MapEntityList[i - 1].Sprite; + if (existingSprite == null) { continue; } + if (existingSprite.Texture == this.Sprite.Texture) { break; } + } #endif - list.Insert(i, entity); - }); + MapEntityList.Insert(i, this); } /// @@ -763,31 +660,15 @@ namespace Barotrauma // basically nothing here is thread-safe so foreach(var hull in hullList) { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - hull.Update(deltaTime, cam); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } - }); + hull.Update(deltaTime, cam); + } }, // Structure parallel update () => { Parallel.ForEach(structureList, parallelOptions, structure => { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - structure.Update(deltaTime, cam); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } + structure.Update(deltaTime, cam); }); }, // Gap reset (must be done before update) @@ -805,10 +686,6 @@ namespace Barotrauma } ); - // Process any physics operations queued during Hull/Structure updates. - // BallastFlora growth (from Hull.Update) may queue physics body creations/transforms. - PhysicsBodyQueue.ProcessPendingOperations(); - #if CLIENT // Hull Cheats need to be executed after Hull update Hull.UpdateCheats(deltaTime, cam); @@ -818,19 +695,8 @@ namespace Barotrauma var shuffledGaps = gapList.OrderBy(g => Rand.Int(int.MaxValue)).ToList(); Parallel.ForEach(gapList, parallelOptions, gap => { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - gap.Update(deltaTime, cam); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } + gap.Update(deltaTime, cam); }); - - // Process any physics operations queued during Gap updates. - PhysicsBodyQueue.ProcessPendingOperations(); #if CLIENT sw.Stop(); @@ -846,19 +712,11 @@ namespace Barotrauma try { - Parallel.ForEach(itemList, parallelOptions, item => + foreach (Item item in itemList) { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - lastUpdatedItem = item; - item.Update(scaledDeltaTime, cam); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } - }); + lastUpdatedItem = item; + item.Update(scaledDeltaTime, cam); + } } catch (InvalidOperationException e) { @@ -869,10 +727,6 @@ namespace Barotrauma throw new InvalidOperationException($"Error while updating item {lastUpdatedItem?.Name ?? "null"}", innerException: e); } - // Process any physics operations that were queued during the parallel update. - // This must be done on the main thread because Farseer Physics is not thread-safe. - PhysicsBodyQueue.ProcessPendingOperations(); - UpdateAllProjSpecific(scaledDeltaTime); Spawner?.Update(); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs index 9874a3dcb..8339e6c65 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Structure.cs @@ -7,7 +7,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Xml.Linq; using System.Collections.Immutable; using Barotrauma.Abilities; @@ -19,63 +18,6 @@ using Barotrauma.Lights; namespace Barotrauma { - /// - /// Thread-safe wrapper for Structure list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeStructureList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(Structure structure) - { - lock (_writeLock) - { - var newList = new List(_list) { structure }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(Structure structure) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(structure); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(Structure structure) => _list.Contains(structure); - - public Structure this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public Structure FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public Structure Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public void ForEach(Action action) => _list.ForEach(action); - } - partial class WallSection : IIgnorable { public Rectangle rect; @@ -106,7 +48,7 @@ namespace Barotrauma partial class Structure : MapEntity, IDamageable, IServerSerializable, ISerializableEntity { public const int WallSectionSize = 96; - public static ThreadSafeStructureList WallList = new ThreadSafeStructureList(); + public static List WallList = new List(); const float LeakThreshold = 0.1f; const float BigGapThreshold = 0.7f; diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs index 2bba31f2e..f9e7a706d 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs @@ -12,70 +12,11 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using System.Threading; using System.Xml.Linq; using Voronoi2; namespace Barotrauma { - /// - /// Thread-safe wrapper for Submarine list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeSubmarineList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(Submarine submarine) - { - lock (_writeLock) - { - var newList = new List(_list) { submarine }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(Submarine submarine) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(submarine); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(Submarine submarine) => _list.Contains(submarine); - - public Submarine this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public Submarine FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public Submarine Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public float Sum(Func selector) => _list.Sum(selector); - public IEnumerable Select(Func selector) => _list.Select(selector); - } - public enum Direction : byte { None = 0, Left = 1, Right = 2 @@ -131,7 +72,7 @@ namespace Barotrauma get { return MainSubs[0]; } set { MainSubs[0] = value; } } - private static readonly ThreadSafeSubmarineList loaded = new ThreadSafeSubmarineList(); + private static readonly List loaded = new List(); private readonly Identifier upgradeEventIdentifier; @@ -156,11 +97,10 @@ namespace Barotrauma } } - // ThreadLocal for thread-safe ray casting results - private static readonly ThreadLocal lastPickedPositionLocal = new ThreadLocal(); - private static readonly ThreadLocal lastPickedFractionLocal = new ThreadLocal(); - private static readonly ThreadLocal lastPickedFixtureLocal = new ThreadLocal(); - private static readonly ThreadLocal lastPickedNormalLocal = new ThreadLocal(); + private static Vector2 lastPickedPosition; + private static float lastPickedFraction; + private static Fixture lastPickedFixture; + private static Vector2 lastPickedNormal; private Vector2 prevPosition; @@ -174,22 +114,22 @@ namespace Barotrauma public static Vector2 LastPickedPosition { - get { return lastPickedPositionLocal.Value; } + get { return lastPickedPosition; } } public static float LastPickedFraction { - get { return lastPickedFractionLocal.Value; } + get { return lastPickedFraction; } } public static Fixture LastPickedFixture { - get { return lastPickedFixtureLocal.Value; } + get { return lastPickedFixture; } } public static Vector2 LastPickedNormal { - get { return lastPickedNormalLocal.Value; } + get { return lastPickedNormal; } } public bool Loading @@ -206,7 +146,7 @@ namespace Barotrauma public List ForcedOutpostModuleWayPoints = new List(); - public static ThreadSafeSubmarineList Loaded + public static List Loaded { get { return loaded; } } @@ -914,10 +854,10 @@ namespace Barotrauma }, ref aabb); if (closestFraction <= 0.0f) { - lastPickedPositionLocal.Value = rayStart; - lastPickedFractionLocal.Value = closestFraction; - lastPickedFixtureLocal.Value = closestFixture; - lastPickedNormalLocal.Value = closestNormal; + lastPickedPosition = rayStart; + lastPickedFraction = closestFraction; + lastPickedFixture = closestFixture; + lastPickedNormal = closestNormal; return closestBody; } } @@ -936,22 +876,16 @@ namespace Barotrauma return fraction; }, rayStart, rayEnd, collisionCategory ?? Category.All); - lastPickedPositionLocal.Value = rayStart + (rayEnd - rayStart) * closestFraction; - lastPickedFractionLocal.Value = closestFraction; - lastPickedFixtureLocal.Value = closestFixture; - lastPickedNormalLocal.Value = closestNormal; + lastPickedPosition = rayStart + (rayEnd - rayStart) * closestFraction; + lastPickedFraction = closestFraction; + lastPickedFixture = closestFixture; + lastPickedNormal = closestNormal; return closestBody; } - // ThreadLocal for thread-safe body picking - private static readonly ThreadLocal> bodyDistLocal = - new ThreadLocal>(() => new Dictionary()); - private static readonly ThreadLocal> bodiesLocal = - new ThreadLocal>(() => new List()); - - private static Dictionary bodyDist => bodyDistLocal.Value; - private static List bodies => bodiesLocal.Value; + private static readonly Dictionary bodyDist = new Dictionary(); + private static readonly List bodies = new List(); public static float LastPickedBodyDist(Body body) { @@ -985,10 +919,10 @@ namespace Barotrauma } if (fraction < closestFraction) { - lastPickedPositionLocal.Value = rayStart + (rayEnd - rayStart) * fraction; - lastPickedFractionLocal.Value = fraction; - lastPickedNormalLocal.Value = normal; - lastPickedFixtureLocal.Value = fixture; + lastPickedPosition = rayStart + (rayEnd - rayStart) * fraction; + lastPickedFraction = fraction; + lastPickedNormal = normal; + lastPickedFixture = fixture; } //continue return -1; @@ -1006,10 +940,10 @@ namespace Barotrauma if (!fixture.Shape.TestPoint(ref transform, ref rayStart)) { return true; } closestFraction = 0.0f; - lastPickedPositionLocal.Value = rayStart; - lastPickedFractionLocal.Value = 0.0f; - lastPickedNormalLocal.Value = Vector2.Normalize(rayEnd - rayStart); - lastPickedFixtureLocal.Value = fixture; + lastPickedPosition = rayStart; + lastPickedFraction = 0.0f; + lastPickedNormal = Vector2.Normalize(rayEnd - rayStart); + lastPickedFixture = fixture; bodies.Add(fixture.Body); bodyDist[fixture.Body] = 0.0f; return false; @@ -1077,7 +1011,7 @@ namespace Barotrauma if (Vector2.DistanceSquared(rayStart, rayEnd) < 0.01f) { - lastPickedPositionLocal.Value = rayEnd; + lastPickedPosition = rayEnd; return null; } @@ -1119,10 +1053,10 @@ namespace Barotrauma , rayStart, rayEnd); - lastPickedPositionLocal.Value = rayStart + (rayEnd - rayStart) * closestFraction; - lastPickedFractionLocal.Value = closestFraction; - lastPickedFixtureLocal.Value = closestFixture; - lastPickedNormalLocal.Value = closestNormal; + lastPickedPosition = rayStart + (rayEnd - rayStart) * closestFraction; + lastPickedFraction = closestFraction; + lastPickedFixture = closestFixture; + lastPickedNormal = closestNormal; return closestBody; } @@ -1143,7 +1077,7 @@ namespace Barotrauma Item.UpdateHulls(); - List bodyItems = Item.ItemList.Where(it => it.Submarine == this && it.body != null).ToList(); + List bodyItems = Item.ItemList.FindAll(it => it.Submarine == this && it.body != null); List subEntities = MapEntity.MapEntityList.FindAll(me => me.Submarine == this); foreach (MapEntity e in subEntities) @@ -1577,9 +1511,9 @@ namespace Barotrauma public List GetWaypoints(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, WayPoint.WayPointList); public List GetWalls(bool alsoFromConnectedSubs) => GetEntities(alsoFromConnectedSubs, Structure.WallList); - public List GetEntities(bool includingConnectedSubs, IEnumerable list) where T : MapEntity + public List GetEntities(bool includingConnectedSubs, List list) where T : MapEntity { - return list.Where(e => IsEntityFoundOnThisSub(e, includingConnectedSubs)).ToList(); + return list.FindAll(e => IsEntityFoundOnThisSub(e, includingConnectedSubs)); } public List<(ItemContainer container, int freeSlots)> GetCargoContainers() @@ -1604,6 +1538,11 @@ namespace Barotrauma return containers; } + public IEnumerable GetEntities(bool includingConnectedSubs, IEnumerable list) where T : MapEntity + { + return list.Where(e => IsEntityFoundOnThisSub(e, includingConnectedSubs)); + } + public bool IsEntityFoundOnThisSub(MapEntity entity, bool includingConnectedSubs, bool allowDifferentTeam = false, bool allowDifferentType = false) { if (entity == null) { return false; } @@ -1727,8 +1666,9 @@ namespace Barotrauma HiddenSubPosition += Vector2.UnitY * GameMain.GameSession.LevelData.Size.Y; } - foreach (Submarine sub in loaded) + for (int i = 0; i < loaded.Count; i++) { + Submarine sub = loaded[i]; HiddenSubPosition = new Vector2( //1st sub on the left side, 2nd on the right, etc @@ -1860,9 +1800,10 @@ namespace Barotrauma } entityGrid = Hull.GenerateEntityGrid(this); - foreach (MapEntity me in MapEntity.MapEntityList.Where(e => e.Submarine == this)) + for (int i = 0; i < MapEntity.MapEntityList.Count; i++) { - me.Move(HiddenSubPosition, ignoreContacts: true); + if (MapEntity.MapEntityList[i].Submarine != this) { continue; } + MapEntity.MapEntityList[i].Move(HiddenSubPosition, ignoreContacts: true); } Loading = false; @@ -2207,7 +2148,7 @@ namespace Barotrauma DebugConsole.ThrowError("Error while removing \"" + item.Name + "\"!", e); } } - Item.ClearAllItemCollections(); + Item.ItemList.Clear(); } Ragdoll.RemoveAll(); @@ -2216,7 +2157,7 @@ namespace Barotrauma GameMain.World = null; Powered.Grids.Clear(); - Powered.ClearChangedConnections(); + Powered.ChangedConnections.Clear(); GC.Collect(); @@ -2256,7 +2197,7 @@ namespace Barotrauma ConnectedDockingPorts?.Clear(); - Powered.ClearChangedConnections(); + Powered.ChangedConnections.Clear(); Powered.Grids.Clear(); loaded.Remove(this); diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs index b2f5a366f..1dc9d991c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs @@ -5,75 +5,17 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Xml.Linq; using Barotrauma.Extensions; namespace Barotrauma { - /// - /// Thread-safe wrapper for WayPoint list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafeWayPointList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(WayPoint waypoint) - { - lock (_writeLock) - { - var newList = new List(_list) { waypoint }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(WayPoint waypoint) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(waypoint); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(WayPoint waypoint) => _list.Contains(waypoint); - - public WayPoint this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public WayPoint FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public WayPoint Find(Predicate predicate) => _list.Find(predicate); - public List FindAll(Predicate predicate) => _list.FindAll(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - public bool Exists(Predicate predicate) => _list.Exists(predicate); - } - [Flags] public enum SpawnType { Path = 0, Human = 1, Enemy = 2, Cargo = 4, Corpse = 8, Submarine = 16, ExitPoint = 32, Disabled = 64 }; partial class WayPoint : MapEntity { - public static ThreadSafeWayPointList WayPointList = new ThreadSafeWayPointList(); + public static List WayPointList = new List(); public static bool ShowWayPoints = true, ShowSpawnPoints = true; @@ -990,7 +932,7 @@ namespace Barotrauma public static WayPoint GetRandom(SpawnType spawnType = SpawnType.Human, JobPrefab assignedJob = null, Submarine sub = null, bool useSyncedRand = false, string spawnPointTag = null, bool ignoreSubmarine = false) { - return WayPointList.ToList().GetRandom(wp => + return WayPointList.GetRandom(wp => (ignoreSubmarine || wp.Submarine == sub) && //checking for the disabled flag is not strictly necessary because we check for equality of the spawn type, //but lets do that anyway in case we change the handling of the spawn type at some point diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs index 92442e806..c59fd4ec9 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs @@ -62,7 +62,7 @@ namespace Barotrauma.Networking DebugConsole.Log($"Changed client {Name}'s team to {teamID}."); if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; } teamID = value; } @@ -86,7 +86,7 @@ namespace Barotrauma.Networking { if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; if (value != null) { CharacterID = value.ID; @@ -154,7 +154,7 @@ namespace Barotrauma.Networking #endif if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; } } } @@ -178,7 +178,7 @@ namespace Barotrauma.Networking { if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer) { - GameMain.NetworkMember.IncrementLastClientListUpdateID(); + GameMain.NetworkMember.LastClientListUpdateID++; } inGame = value; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/EntitySpawner.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/EntitySpawner.cs index d95b5bced..41fe185a9 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/EntitySpawner.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/EntitySpawner.cs @@ -434,7 +434,7 @@ namespace Barotrauma if (GameMain.NetworkMember is { IsClient: true }) { return; } while (spawnOrRemoveQueue.Count > 0) { - if (!spawnOrRemoveQueue.TryDequeue(out var spawnOrRemove)) { break; } + var spawnOrRemove = spawnOrRemoveQueue.Dequeue(); if (spawnOrRemove.TryGet(out Entity entityToRemove)) { if (entityToRemove is Item item) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/INetSerializableStruct.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/INetSerializableStruct.cs index b3ab41c9e..ebb9572ab 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/INetSerializableStruct.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/INetSerializableStruct.cs @@ -1,6 +1,5 @@ #nullable enable using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; @@ -147,10 +146,10 @@ namespace Barotrauma } } - private static readonly ConcurrentDictionary> CachedVariables = new ConcurrentDictionary>(); + private static readonly Dictionary> CachedVariables = new Dictionary>(); - private static readonly ConcurrentDictionary TypeBehaviors - = new ConcurrentDictionary(new Dictionary + private static readonly Dictionary TypeBehaviors + = new Dictionary { { typeof(Boolean), new ReadWriteBehavior(ReadBoolean, WriteBoolean) }, { typeof(Byte), new ReadWriteBehavior(ReadByte, WriteByte) }, @@ -169,7 +168,7 @@ namespace Barotrauma { typeof(Vector2), new ReadWriteBehavior(ReadVector2, WriteVector2) }, { typeof(SerializableDateTime), new ReadWriteBehavior(ReadSerializableDateTime, WriteSerializableDateTime) }, { typeof(NetLimitedString), new ReadWriteBehavior(ReadNetLString, WriteNetLString) } - }); + }; private static readonly ImmutableDictionary, Func> BehaviorFactories = new Dictionary, Func> { @@ -585,11 +584,7 @@ namespace Barotrauma if (!predicate(type)) { continue; } behavior = factory(type); - // Use TryAdd for thread-safety; if another thread already added, use that value - if (!TypeBehaviors.TryAdd(type, behavior)) - { - behavior = TypeBehaviors[type]; - } + TypeBehaviors.Add(type, behavior); return true; } @@ -599,11 +594,8 @@ namespace Barotrauma public static ImmutableArray GetPropertiesAndFields(Type type) { - return CachedVariables.GetOrAdd(type, static t => CreateCachedVariables(t)); - } + if (CachedVariables.TryGetValue(type, out var cached)) { return cached; } - private static ImmutableArray CreateCachedVariables(Type type) - { List variables = new List(); IEnumerable propertyInfos = type.GetProperties().Where(HasAttribute).Where(NotStatic); @@ -641,6 +633,7 @@ namespace Barotrauma } ImmutableArray array = variables.All(v => v.HasOwnAttribute) ? variables.OrderBy(v => v.Attribute.OrderKey).ToImmutableArray() : variables.ToImmutableArray(); + CachedVariables.Add(type, array); return array; bool HasAttribute(MemberInfo info) => (info.GetCustomAttribute() ?? type.GetCustomAttribute()) != null; @@ -881,4 +874,4 @@ namespace Barotrauma } } } -} +} \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs b/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs index cbea90c64..c33e87c57 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs @@ -1,7 +1,6 @@ using Microsoft.Xna.Framework; using System; using System.Collections.Generic; -using System.Threading; namespace Barotrauma.Networking { @@ -187,19 +186,10 @@ namespace Barotrauma.Networking { protected const int MaxSubNameLengthInErrorMessages = 16; - private int lastClientListUpdateID; public UInt16 LastClientListUpdateID { - get => (UInt16)Interlocked.CompareExchange(ref lastClientListUpdateID, 0, 0); - set => Interlocked.Exchange(ref lastClientListUpdateID, value); - } - - /// - /// Thread-safe increment of LastClientListUpdateID - /// - public void IncrementLastClientListUpdateID() - { - Interlocked.Increment(ref lastClientListUpdateID); + get; + set; } public abstract bool IsServer { get; } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBody.cs b/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBody.cs index cfeac247b..58f0f5280 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBody.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBody.cs @@ -4,69 +4,12 @@ using FarseerPhysics.Dynamics; using Microsoft.Xna.Framework; using System; using System.Collections.Generic; -using System.Linq; -using System.Threading; using System.Xml.Linq; using LimbParams = Barotrauma.RagdollParams.LimbParams; using ColliderParams = Barotrauma.RagdollParams.ColliderParams; namespace Barotrauma { - /// - /// Thread-safe wrapper for PhysicsBody list operations. - /// Uses copy-on-write pattern for lock-free reads. - /// - internal class ThreadSafePhysicsBodyList : IEnumerable - { - private volatile List _list = new List(); - private readonly object _writeLock = new object(); - - public int Count => _list.Count; - - public void Add(PhysicsBody body) - { - lock (_writeLock) - { - var newList = new List(_list) { body }; - Interlocked.Exchange(ref _list, newList); - } - } - - public bool Remove(PhysicsBody body) - { - lock (_writeLock) - { - var newList = new List(_list); - bool removed = newList.Remove(body); - if (removed) - { - Interlocked.Exchange(ref _list, newList); - } - return removed; - } - } - - public void Clear() - { - Interlocked.Exchange(ref _list, new List()); - } - - public bool Contains(PhysicsBody body) => _list.Contains(body); - - public PhysicsBody this[int index] => _list[index]; - - public IEnumerator GetEnumerator() => _list.GetEnumerator(); - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator(); - - // LINQ-friendly methods - public List ToList() => new List(_list); - public PhysicsBody FirstOrDefault(Func predicate) => _list.FirstOrDefault(predicate); - public PhysicsBody Find(Predicate predicate) => _list.Find(predicate); - public IEnumerable Where(Func predicate) => _list.Where(predicate); - public bool Any() => _list.Any(); - public bool Any(Func predicate) => _list.Any(predicate); - } - class PosInfo { public Vector2 Position @@ -149,8 +92,8 @@ namespace Barotrauma public const float MinDensity = 0.01f; public const float DefaultAngularDamping = 5.0f; - private static readonly ThreadSafePhysicsBodyList list = new ThreadSafePhysicsBodyList(); - public static ThreadSafePhysicsBodyList List + private static readonly List list = new List(); + public static List List { get { return list; } } diff --git a/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBodyQueue.cs b/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBodyQueue.cs deleted file mode 100644 index a8aec47ef..000000000 --- a/Barotrauma/BarotraumaShared/SharedSource/Physics/PhysicsBodyQueue.cs +++ /dev/null @@ -1,155 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; - -namespace Barotrauma -{ - /// - /// Thread-safe queue for deferring physics operations to the main thread. - /// This is necessary because Farseer Physics' DynamicTree is not thread-safe, - /// and physics operations cannot be safely performed during parallel updates. - /// - /// Supported operations include: - /// - Physics body creation - /// - Physics body transform updates (SetTransform, SetTransformIgnoreContacts) - /// - Any other operation that modifies the Farseer physics world - /// -/// -/// ├─> PhysicsBodyQueue.IsInParallelContext = true (ThreadStatic) -/// ├─> Item.Update() -/// │ └─> StatusEffect.Apply() -/// │ └─> Character.Kill() -/// │ └─> Item.Drop() -/// │ └─> Check if IsInParallelContext == true -/// │ └─> PhysicsBodyQueue.Enqueue(Physics operation) -/// ├──> PhysicsBodyQueue.IsInParallelContext = false -/// └──> PhysicsBodyQueue.ProcessPendingOperations() ← Main thread executes -/// └─> body.SetTransformIgnoreContacts() - static class PhysicsBodyQueue - { - private static readonly object _lock = new object(); - private static readonly Queue _pendingOperations = new Queue(); - - /// - /// Thread-local flag indicating whether the current thread is in a parallel physics update context. - /// When true, physics operations should be deferred using this queue instead of executing immediately. - /// - [ThreadStatic] - private static bool _isInParallelContext; - - /// - /// Gets or sets whether the current thread is in a parallel update context. - /// When true, physics operations should be queued instead of executed immediately. - /// - public static bool IsInParallelContext - { - get => _isInParallelContext; - set => _isInParallelContext = value; - } - - /// - /// Enqueues a physics operation to be executed on the main thread. - /// This method is thread-safe and can be called from parallel update loops. - /// - /// The physics operation to defer - public static void Enqueue(Action operation) - { - if (operation == null) { return; } - lock (_lock) - { - _pendingOperations.Enqueue(operation); - } - } - - /// - /// Enqueues a physics body creation action to be executed on the main thread. - /// This method is thread-safe and can be called from parallel update loops. - /// - /// The action that creates the physics body - public static void EnqueueCreation(Action createAction) - { - Enqueue(createAction); - } - - /// - /// Executes a physics operation, either immediately or deferred depending on context. - /// If called from a parallel context, the operation will be queued for later execution. - /// If called from the main thread (outside parallel loops), the operation executes immediately. - /// - /// The physics operation to execute - public static void ExecuteOrDefer(Action operation) - { - if (operation == null) { return; } - - if (_isInParallelContext) - { - Enqueue(operation); - } - else - { - operation(); - } - } - - /// - /// Gets the number of pending physics operations. - /// - public static int PendingCount - { - get - { - lock (_lock) - { - return _pendingOperations.Count; - } - } - } - - /// - /// Processes all pending physics operations. - /// Must be called on the main thread, outside of any parallel loops. - /// - public static void ProcessPendingOperations() - { - while (true) - { - Action action; - lock (_lock) - { - if (_pendingOperations.Count == 0) { break; } - action = _pendingOperations.Dequeue(); - } - try - { - action?.Invoke(); - } - catch (Exception e) - { - DebugConsole.ThrowError($"Error processing deferred physics operation: {e.Message}", e); - } - } - } - - /// - /// Legacy method for backwards compatibility. - /// Calls ProcessPendingOperations(). - /// - public static void ProcessPendingCreations() - { - ProcessPendingOperations(); - } - - /// - /// Clears all pending physics operations. - /// Should be called when ending a round or cleaning up. - /// - public static void Clear() - { - lock (_lock) - { - _pendingOperations.Clear(); - } - } - } -} - diff --git a/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs b/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs index e2fddef7c..7128946ac 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs @@ -178,23 +178,9 @@ namespace Barotrauma Parallel.Invoke(parallelOptions, () => GameMain.ParticleManager.Update((float)deltaTime), - () => - { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, cam); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } - } + () => { if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, cam); } ); - // Process any physics operations queued during Level update - PhysicsBodyQueue.ProcessPendingOperations(); - sw.Stop(); GameMain.PerformanceCounter.AddElapsedTicks("Update:Particles+Level", sw.ElapsedTicks); @@ -260,33 +246,12 @@ namespace Barotrauma #elif SERVER Parallel.Invoke(parallelOptions, - () => - { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, Camera.Instance); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } - }, - () => - { - PhysicsBodyQueue.IsInParallelContext = true; - try - { - Character.UpdateAll((float)deltaTime, Camera.Instance); - } - finally - { - PhysicsBodyQueue.IsInParallelContext = false; - } - } + () => { if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, Camera.Instance); }, + () => Character.UpdateAll((float)deltaTime, Camera.Instance) ); - - PhysicsBodyQueue.ProcessPendingOperations(); + + //StatusEffect.UpdateAll is not thread-safe and must be executed on the main thread + StatusEffect.UpdateAll((float)deltaTime); #endif var submarines = Submarine.Loaded.ToList(); @@ -309,9 +274,7 @@ namespace Barotrauma #elif SERVER MapEntity.UpdateAll((float)deltaTime, Camera.Instance, parallelOptions); - - StatusEffect.UpdateAll((float)deltaTime); - + #endif #if CLIENT diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs index b589b8d83..9c9be6e95 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/DelayedEffect.cs @@ -1,56 +1,26 @@ using Barotrauma.Items.Components; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using System.Threading; namespace Barotrauma { class DelayedListElement { - public readonly long Id; public readonly DelayedEffect Parent; public readonly Entity Entity; - - private Vector2? _worldPosition; - private readonly object _worldPositionLock = new object(); - public Vector2? WorldPosition - { - get - { - lock (_worldPositionLock) - { - return _worldPosition; - } - } - set - { - lock (_worldPositionLock) - { - _worldPosition = value; - } - } - } - + public Vector2? WorldPosition; /// /// Should the delayed effect attempt to determine the position of the effect based on the targets, or just use the position that was passed to the constructor. /// public bool GetPositionBasedOnTargets; public readonly Vector2? StartPosition; public readonly List Targets; - - private volatile float _delay; - public float Delay - { - get => _delay; - set => _delay = value; - } + public float Delay; public DelayedListElement(DelayedEffect parentEffect, Entity parentEntity, IEnumerable targets, float delay, Vector2? worldPosition, Vector2? startPosition) { - Id = Interlocked.Increment(ref DelayedEffect._delayElementIdCounter); Parent = parentEffect; Entity = parentEntity; Targets = new List(targets); @@ -59,19 +29,9 @@ namespace Barotrauma StartPosition = startPosition; } } - class DelayedEffect : StatusEffect { - // Thread-safe counter for generating unique IDs for DelayedListElement - internal static long _delayElementIdCounter; - - // Thread-safe dictionary for delayed effects - public static readonly ConcurrentDictionary DelayListDict = new ConcurrentDictionary(); - - /// - /// Provides a thread-safe enumerable view of the delay list for iteration. - /// - public static IEnumerable DelayList => DelayListDict.Values; + public static readonly List DelayList = new List(); private enum DelayTypes { @@ -102,10 +62,9 @@ namespace Barotrauma if (this.type != type || !HasRequiredItems(entity)) { return; } if (!Stackable) { - // Thread-safe iteration over ConcurrentDictionary - foreach (var kvp in DelayListDict) + foreach (var existingEffect in DelayList) { - if (kvp.Value.Parent == this && kvp.Value.Targets.FirstOrDefault() == target) + if (existingEffect.Parent == this && existingEffect.Targets.FirstOrDefault() == target) { return; } @@ -113,19 +72,18 @@ namespace Barotrauma } if (!IsValidTarget(target)) { return; } - var targets = CurrentTargets; - targets.Clear(); - targets.Add(target); - if (!HasRequiredConditions(targets)) { return; } + currentTargets.Clear(); + currentTargets.Add(target); + if (!HasRequiredConditions(currentTargets)) { return; } switch (delayType) { case DelayTypes.Timer: - var newDelayListElement = new DelayedListElement(this, entity, targets, delay, worldPosition ?? GetPosition(entity, targets, worldPosition), startPosition: null) + var newDelayListElement = new DelayedListElement(this, entity, currentTargets, delay, worldPosition ?? GetPosition(entity, currentTargets, worldPosition), startPosition: null) { GetPositionBasedOnTargets = worldPosition == null }; - DelayListDict.TryAdd(newDelayListElement.Id, newDelayListElement); + DelayList.Add(newDelayListElement); break; case DelayTypes.ReachCursor: Projectile projectile = (entity as Item)?.GetComponent(); @@ -147,8 +105,7 @@ namespace Barotrauma return; } - var reachCursorElement = new DelayedListElement(this, entity, targets, Vector2.Distance(entity.WorldPosition, projectile.User.CursorWorldPosition), worldPosition, entity.WorldPosition); - DelayListDict.TryAdd(reachCursorElement.Id, reachCursorElement); + DelayList.Add(new DelayedListElement(this, entity, currentTargets, Vector2.Distance(entity.WorldPosition, projectile.User.CursorWorldPosition), worldPosition, entity.WorldPosition)); break; } } @@ -162,28 +119,25 @@ namespace Barotrauma if (delayType == DelayTypes.ReachCursor && Character.Controlled == null) { return; } if (!Stackable) { - // Thread-safe iteration over ConcurrentDictionary - foreach (var kvp in DelayListDict) + foreach (var existingEffect in DelayList) { - if (kvp.Value.Parent == this && kvp.Value.Targets.SequenceEqual(targets)) { return; } + if (existingEffect.Parent == this && existingEffect.Targets.SequenceEqual(targets)) { return; } } } - var localTargets = CurrentTargets; - localTargets.Clear(); + currentTargets.Clear(); foreach (ISerializableEntity target in targets) { if (!IsValidTarget(target)) { continue; } - localTargets.Add(target); + currentTargets.Add(target); } - if (!HasRequiredConditions(localTargets)) { return; } + if (!HasRequiredConditions(currentTargets)) { return; } switch (delayType) { case DelayTypes.Timer: - var timerElement = new DelayedListElement(this, entity, localTargets, delay, worldPosition, null); - DelayListDict.TryAdd(timerElement.Id, timerElement); + DelayList.Add(new DelayedListElement(this, entity, currentTargets, delay, worldPosition, null)); break; case DelayTypes.ReachCursor: Projectile projectile = (entity as Item)?.GetComponent(); @@ -207,21 +161,19 @@ namespace Barotrauma return; } - var reachCursorElement = new DelayedListElement(this, entity, localTargets, Vector2.Distance(entity.WorldPosition, user.CursorWorldPosition), worldPosition, entity.WorldPosition); - DelayListDict.TryAdd(reachCursorElement.Id, reachCursorElement); + DelayList.Add(new DelayedListElement(this, entity, currentTargets, Vector2.Distance(entity.WorldPosition, user.CursorWorldPosition), worldPosition, entity.WorldPosition)); break; } } public static void Update(float deltaTime) { - // Thread-safe iteration over ConcurrentDictionary - foreach (var kvp in DelayListDict) + for (int i = DelayList.Count - 1; i >= 0; i--) { - DelayedListElement element = kvp.Value; + DelayedListElement element = DelayList[i]; if (element.Parent.CheckConditionalAlways && !element.Parent.HasRequiredConditions(element.Targets)) { - DelayListDict.TryRemove(element.Id, out _); + DelayList.Remove(element); continue; } @@ -235,7 +187,7 @@ namespace Barotrauma //keep refreshing the position until the effect runs (so e.g. a delayed effect runs at the last known position of a monster before it despawned) if (element.GetPositionBasedOnTargets && element.Entity is { Removed: false }) { - element.WorldPosition = element.Parent.GetPosition(element.Entity, element.Parent.CurrentTargets); + element.WorldPosition = element.Parent.GetPosition(element.Entity, element.Parent.currentTargets); } continue; } @@ -246,8 +198,8 @@ namespace Barotrauma } element.Parent.Apply(deltaTime, element.Entity, element.Targets, element.WorldPosition); - DelayListDict.TryRemove(element.Id, out _); + DelayList.Remove(element); } } } -} +} \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs index 7aaf375bc..a0cd1be2a 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs @@ -7,18 +7,15 @@ using FarseerPhysics.Dynamics; using Microsoft.Xna.Framework; using Steamworks; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Threading; using System.Xml.Linq; namespace Barotrauma { class DurationListElement { - public readonly long Id; public readonly StatusEffect Parent; public readonly Entity Entity; public float Duration @@ -27,24 +24,12 @@ namespace Barotrauma private set; } public readonly List Targets; - - private volatile Character _user; - public Character User - { - get => _user; - private set => _user = value; - } + public Character User { get; private set; } - private volatile float _timer; - public float Timer - { - get => _timer; - set => _timer = value; - } + public float Timer; public DurationListElement(StatusEffect parentEffect, Entity parentEntity, IEnumerable targets, float duration, Character user) { - Id = Interlocked.Increment(ref StatusEffect._durationElementIdCounter); Parent = parentEffect; Entity = parentEntity; Targets = new List(targets); @@ -54,9 +39,8 @@ namespace Barotrauma public void Reset(float duration, Character newUser) { - Duration = duration; - Volatile.Write(ref _timer, duration); - _user = newUser; + Timer = Duration = duration; + User = newUser; } } @@ -617,23 +601,14 @@ namespace Barotrauma private readonly float lifeTime; private float lifeTimer; - private ConcurrentDictionary intervalTimers; + private Dictionary intervalTimers; /// /// Makes the effect only execute once. After it has executed, it'll never execute again (during the same round). /// private readonly bool oneShot; - // Thread-safe counter for generating unique IDs for DurationListElement - internal static long _durationElementIdCounter; - - // Thread-safe dictionary for duration effects - public static readonly ConcurrentDictionary DurationListDict = new ConcurrentDictionary(); - - /// - /// Provides a thread-safe enumerable view of the duration list for iteration. - /// - public static IEnumerable DurationList => DurationListDict.Values; + public static readonly List DurationList = new List(); /// /// Only applicable for StatusEffects with a duration or delay. Should the conditional checks only be done when the effect triggers, @@ -1649,52 +1624,22 @@ namespace Barotrauma } } - // Thread-local list to avoid contention when cleaning up removed entities - [ThreadStatic] - private static List _threadLocalIntervalsToRemove; - - private static List IntervalsToRemove - { - get - { - _threadLocalIntervalsToRemove ??= new List(); - return _threadLocalIntervalsToRemove; - } - } + private static readonly List intervalsToRemove = new List(); public bool ShouldWaitForInterval(Entity entity, float deltaTime) { - if (Interval > 0.0f && entity != null) + if (Interval > 0.0f && entity != null && intervalTimers != null) { - // Thread-safe lazy initialization - if (intervalTimers == null) + if (intervalTimers.ContainsKey(entity)) { - Interlocked.CompareExchange(ref intervalTimers, new ConcurrentDictionary(), null); + intervalTimers[entity] -= deltaTime; + if (intervalTimers[entity] > 0.0f) { return true; } } - - if (intervalTimers.TryGetValue(entity, out float currentTimer)) + intervalsToRemove.Clear(); + intervalsToRemove.AddRange(intervalTimers.Keys.Where(e => e.Removed)); + foreach (var toRemove in intervalsToRemove) { - float newTimer = currentTimer - deltaTime; - if (newTimer > 0.0f) - { - intervalTimers.AddOrUpdate(entity, newTimer, (_, __) => newTimer); - return true; - } - } - - // Clean up removed entities using thread-local list - var toRemove = IntervalsToRemove; - toRemove.Clear(); - foreach (var key in intervalTimers.Keys) - { - if (key.Removed) - { - toRemove.Add(key); - } - } - foreach (var key in toRemove) - { - intervalTimers.TryRemove(key, out _); + intervalTimers.Remove(toRemove); } } return false; @@ -1710,7 +1655,7 @@ namespace Barotrauma if (Duration > 0.0f && !Stackable) { //ignore if not stackable and there's already an identical statuseffect - DurationListElement existingEffect = FindExistingDurationEffect(target); + DurationListElement existingEffect = DurationList.Find(d => d.Parent == this && d.Targets.FirstOrDefault() == target); if (existingEffect != null) { if (ResetDurationWhenReapplied) @@ -1721,74 +1666,30 @@ namespace Barotrauma } } - var targets = CurrentTargets; - targets.Clear(); - targets.Add(target); - if (!HasRequiredConditions(targets)) { return; } - Apply(deltaTime, entity, targets, worldPosition); + currentTargets.Clear(); + currentTargets.Add(target); + if (!HasRequiredConditions(currentTargets)) { return; } + Apply(deltaTime, entity, currentTargets, worldPosition); } - // Thread-local list to avoid contention when collecting targets - [ThreadStatic] - private static List _threadLocalCurrentTargets; - - protected List CurrentTargets - { - get - { - _threadLocalCurrentTargets ??= new List(); - return _threadLocalCurrentTargets; - } - } - - /// - /// Thread-safe method to find an existing duration effect for a single target. - /// - private DurationListElement FindExistingDurationEffect(ISerializableEntity target) - { - foreach (var element in DurationListDict.Values) - { - if (element.Parent == this && element.Targets.FirstOrDefault() == target) - { - return element; - } - } - return null; - } - - /// - /// Thread-safe method to find an existing duration effect for multiple targets. - /// - private DurationListElement FindExistingDurationEffect(IReadOnlyList targets) - { - foreach (var element in DurationListDict.Values) - { - if (element.Parent == this && element.Targets.SequenceEqual(targets)) - { - return element; - } - } - return null; - } - + protected readonly List currentTargets = new List(); public virtual void Apply(ActionType type, float deltaTime, Entity entity, IReadOnlyList targets, Vector2? worldPosition = null) { if (Disabled) { return; } if (this.type != type) { return; } if (ShouldWaitForInterval(entity, deltaTime)) { return; } - var localTargets = CurrentTargets; - localTargets.Clear(); + currentTargets.Clear(); foreach (ISerializableEntity target in targets) { if (!IsValidTarget(target)) { continue; } - localTargets.Add(target); + currentTargets.Add(target); } - if (TargetIdentifiers != null && localTargets.Count == 0) { return; } + if (TargetIdentifiers != null && currentTargets.Count == 0) { return; } bool hasRequiredItems = HasRequiredItems(entity); - if (!hasRequiredItems || !HasRequiredConditions(localTargets)) + if (!hasRequiredItems || !HasRequiredConditions(currentTargets)) { #if CLIENT if (!hasRequiredItems && playSoundOnRequiredItemFailure) @@ -1802,15 +1703,15 @@ namespace Barotrauma if (Duration > 0.0f && !Stackable) { //ignore if not stackable and there's already an identical statuseffect - DurationListElement existingEffect = FindExistingDurationEffect(localTargets); + DurationListElement existingEffect = DurationList.Find(d => d.Parent == this && d.Targets.SequenceEqual(currentTargets)); if (existingEffect != null) { - existingEffect.Reset(Math.Max(existingEffect.Timer, Duration), user); + existingEffect?.Reset(Math.Max(existingEffect.Timer, Duration), user); return; } } - Apply(deltaTime, entity, localTargets, worldPosition); + Apply(deltaTime, entity, currentTargets, worldPosition); } private Hull GetHull(Entity entity) @@ -2023,8 +1924,7 @@ namespace Barotrauma if (Duration > 0.0f) { - var element = new DurationListElement(this, entity, targets, Duration, user); - DurationListDict.TryAdd(element.Id, element); + DurationList.Add(new DurationListElement(this, entity, targets, Duration, user)); } else { @@ -2552,7 +2452,7 @@ namespace Barotrauma } if (Interval > 0.0f && entity != null) { - intervalTimers ??= new ConcurrentDictionary(); + intervalTimers ??= new Dictionary(); intervalTimers[entity] = Interval; } } @@ -2949,15 +2849,13 @@ namespace Barotrauma UpdateAllProjSpecific(deltaTime); DelayedEffect.Update(deltaTime); - - // Thread-safe iteration over ConcurrentDictionary - foreach (var kvp in DurationListDict) + for (int i = DurationList.Count - 1; i >= 0; i--) { - DurationListElement element = kvp.Value; + DurationListElement element = DurationList[i]; if (element.Parent.CheckConditionalAlways && !element.Parent.HasRequiredConditions(element.Targets)) { - DurationListDict.TryRemove(element.Id, out _); + DurationList.RemoveAt(i); continue; } @@ -2966,7 +2864,7 @@ namespace Barotrauma (t is Limb limb && (limb.character == null || limb.character.Removed))); if (element.Targets.Count == 0) { - DurationListDict.TryRemove(element.Id, out _); + DurationList.RemoveAt(i); continue; } @@ -3061,7 +2959,7 @@ namespace Barotrauma element.Timer -= deltaTime; if (element.Timer > 0.0f) { continue; } - DurationListDict.TryRemove(element.Id, out _); + DurationList.Remove(element); } } @@ -3161,8 +3059,8 @@ namespace Barotrauma public static void StopAll() { CoroutineManager.StopCoroutines("statuseffect"); - DelayedEffect.DelayListDict.Clear(); - DurationListDict.Clear(); + DelayedEffect.DelayList.Clear(); + DurationList.Clear(); } public void AddTag(Identifier tag) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Utils/ToolBox.cs b/Barotrauma/BarotraumaShared/SharedSource/Utils/ToolBox.cs index 2ab344c36..a96376047 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Utils/ToolBox.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Utils/ToolBox.cs @@ -2,7 +2,6 @@ using Barotrauma.Networking; using Microsoft.Xna.Framework; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; @@ -76,7 +75,7 @@ namespace Barotrauma return !corrected; } - private static readonly ConcurrentDictionary cachedFileNames = new ConcurrentDictionary(); + private static readonly Dictionary cachedFileNames = new Dictionary(); public static string CorrectFilenameCase(string filename, out bool corrected, string directory = "") { @@ -154,7 +153,7 @@ namespace Barotrauma if (i < subDirs.Length - 1) { filename += "/"; } } - cachedFileNames.TryAdd(originalFilename, filename); + cachedFileNames.Add(originalFilename, filename); return filename; } @@ -356,26 +355,32 @@ namespace Barotrauma return text; } - private static readonly ConcurrentDictionary> cachedLines = new ConcurrentDictionary>(); + private static Dictionary> cachedLines = new Dictionary>(); public static string GetRandomLine(string filePath, Rand.RandSync randSync = Rand.RandSync.ServerAndClient) { - List lines = cachedLines.GetOrAdd(filePath, path => + List lines; + if (cachedLines.ContainsKey(filePath)) + { + lines = cachedLines[filePath]; + } + else { try { - var fileLines = File.ReadAllLines(path, catchUnauthorizedAccessExceptions: false).ToList(); - if (fileLines.Count == 0) + lines = File.ReadAllLines(filePath, catchUnauthorizedAccessExceptions: false).ToList(); + cachedLines.Add(filePath, lines); + if (lines.Count == 0) { - DebugConsole.ThrowError("File \"" + path + "\" is empty!"); + DebugConsole.ThrowError("File \"" + filePath + "\" is empty!"); + return ""; } - return fileLines; } catch (Exception e) { - DebugConsole.ThrowError("Couldn't open file \"" + path + "\"!", e); - return new List(); + DebugConsole.ThrowError("Couldn't open file \"" + filePath + "\"!", e); + return ""; } - }); + } if (lines.Count == 0) return ""; return lines[Rand.Range(0, lines.Count, randSync)]; diff --git a/Libraries/Farseer Physics Engine 3.5/Collision/DynamicTree.cs b/Libraries/Farseer Physics Engine 3.5/Collision/DynamicTree.cs index 6bc690f09..fac9982bd 100644 --- a/Libraries/Farseer Physics Engine 3.5/Collision/DynamicTree.cs +++ b/Libraries/Farseer Physics Engine 3.5/Collision/DynamicTree.cs @@ -30,7 +30,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Threading; using FarseerPhysics.Common; using FarseerPhysics.Dynamics; using Microsoft.Xna.Framework; @@ -75,15 +74,8 @@ namespace FarseerPhysics.Collision /// public class DynamicTree { - // Thread-local stacks to ensure thread safety during parallel queries/raycasts - [ThreadStatic] - private static Stack _raycastStack; - [ThreadStatic] - private static Stack _queryStack; - - private static Stack RaycastStack => _raycastStack ??= new Stack(256); - private static Stack QueryStack => _queryStack ??= new Stack(256); - + private Stack _raycastStack = new Stack(256); + private Stack _queryStack = new Stack(256); private int _freeList; private int _nodeCapacity; private int _nodeCount; @@ -354,12 +346,12 @@ namespace FarseerPhysics.Collision /// The aabb. public void Query(Func callback, ref AABB aabb, ref Body body) { - QueryStack.Clear(); - QueryStack.Push(_root); + _queryStack.Clear(); + _queryStack.Push(_root); - while (QueryStack.Count > 0) + while (_queryStack.Count > 0) { - int nodeId = QueryStack.Pop(); + int nodeId = _queryStack.Pop(); if (nodeId == NullNode) { continue; @@ -394,8 +386,8 @@ namespace FarseerPhysics.Collision } else { - QueryStack.Push(node.Child1); - QueryStack.Push(node.Child2); + _queryStack.Push(node.Child1); + _queryStack.Push(node.Child2); } } } @@ -403,12 +395,12 @@ namespace FarseerPhysics.Collision public void Query(Func callback, ref AABB aabb) { - QueryStack.Clear(); - QueryStack.Push(_root); + _queryStack.Clear(); + _queryStack.Push(_root); - while (QueryStack.Count > 0) + while (_queryStack.Count > 0) { - int nodeId = QueryStack.Pop(); + int nodeId = _queryStack.Pop(); if (nodeId == NullNode) { continue; @@ -427,8 +419,8 @@ namespace FarseerPhysics.Collision } else { - QueryStack.Push(_nodes[nodeId].Child1); - QueryStack.Push(_nodes[nodeId].Child2); + _queryStack.Push(_nodes[nodeId].Child1); + _queryStack.Push(_nodes[nodeId].Child2); } } } @@ -468,12 +460,12 @@ namespace FarseerPhysics.Collision Vector2.Max(ref p1, ref t, out segmentAABB.UpperBound); } - RaycastStack.Clear(); - RaycastStack.Push(_root); + _raycastStack.Clear(); + _raycastStack.Push(_root); - while (RaycastStack.Count > 0) + while (_raycastStack.Count > 0) { - int nodeId = RaycastStack.Pop(); + int nodeId = _raycastStack.Pop(); if (nodeId == NullNode) { continue; @@ -530,8 +522,8 @@ namespace FarseerPhysics.Collision } else { - RaycastStack.Push(_nodes[nodeId].Child1); - RaycastStack.Push(_nodes[nodeId].Child2); + _raycastStack.Push(_nodes[nodeId].Child1); + _raycastStack.Push(_nodes[nodeId].Child2); } } } diff --git a/README.md b/README.md index 0e6cfed9a..eba4ae19a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LuaCsForBarotrauma Enhanced Performance Project +# LuaCsForBarotrauma Enhanced Performence Project > ⚠ **Warning：** This release is only available for server-side use and is not recommended to run on the client. Make sure that compatibility is adequately tested before deployment.