Merge pull request #146 from shangfengh/dev

refactor: ⚡ delete the ObjOfShipLock
eesast · Mar 23, 2024 · 541bbf6 · 541bbf6
2 parents dad1d65 + c2330fa
commit 541bbf6
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 21 deletions.
diff --git a/logic/GameClass/GameObj/GameObj.cs b/logic/GameClass/GameObj/GameObj.cs
@@ -19,6 +19,7 @@ public abstract class GameObj(XY initPos, int initRadius, GameObjType initType)
         private static long currentMaxID = 0;         // 目前游戏对象的最大ID
         public const long invalidID = long.MaxValue;  // 无效的ID
         public long ID { get; } = Interlocked.Increment(ref currentMaxID);
+
         protected XY position = initPos;
         public abstract XY Position { get; }
         public abstract bool IsRigid { get; }

diff --git a/logic/GameClass/GameObj/Map/Map.cs b/logic/GameClass/GameObj/Map/Map.cs
@@ -220,7 +220,7 @@ public Map(MapStruct mapResource)
                                 return false;
                             };
 
-                            if (GameObjDict[GameObjType.Wormhole].Cast<Wormhole>().Find(wormhole => HasWormhole(wormhole)) == null)
+                            if (GameObjDict[GameObjType.Wormhole].Cast<Wormhole>()?.Find(wormhole => HasWormhole(wormhole)) == null)
                             {
                                 List<XY> grids = [new XY(i, j)];
                                 Add(new Wormhole(GameData.GetCellCenterPos(i, j), grids));
@@ -233,7 +233,7 @@ public Map(MapStruct mapResource)
                     }
                 }
             }
-            Homes = GameObjDict[GameObjType.Home].Cast<Home>().ToNewList();
+            Homes = GameObjDict[GameObjType.Home].Cast<Home>()?.ToNewList()!;
         }
     }
 }
diff --git a/logic/GameClass/GameObj/Movable.cs b/logic/GameClass/GameObj/Movable.cs
@@ -14,7 +14,7 @@ public abstract class Movable(XY initPos, int initRadius, GameObjType initType)
         public object ActionLock => actionLock;
         private readonly ReaderWriterLockSlim moveReaderWriterLock = new();
         /// <summary>
-        /// 规定MoveReaderWriterLock < ActionLock
+        /// 规定ActionLock > MoveReaderWriterLock  
         /// </summary>
         public ReaderWriterLockSlim MoveReaderWriterLock => moveReaderWriterLock;
         public Semaphore ThreadNum { get; } = new(1, 1);

diff --git a/logic/GameClass/GameObj/ObjOfShip.cs b/logic/GameClass/GameObj/ObjOfShip.cs
@@ -10,19 +10,16 @@ namespace GameClass.GameObj
     public abstract class ObjOfShip(XY initPos, int initRadius, GameObjType initType)
         : Movable(initPos, initRadius, initType), IObjOfShip
     {
-        public object ObjOfShipLock { get; } = new();
         private IShip? parent = null;
         public IShip? Parent
         {
             get
             {
-                lock (ObjOfShipLock)
-                    return parent;
+                return Interlocked.CompareExchange(ref parent, null, null);
             }
             set
             {
-                lock (ObjOfShipLock)
-                    parent = value;
+                Interlocked.Exchange(ref parent, value);
             }
         }
     }

diff --git a/logic/Gaming/AttackManager.cs b/logic/Gaming/AttackManager.cs
@@ -99,7 +99,8 @@ private void BulletBomb(Bullet bullet, GameObj? objBeingShot)
                     {
                         if (bullet.CanBeBombed(kvp.Key))
                         {
-                            beAttackedList.AddRange(gameMap.GameObjDict[kvp.Key].FindAll(gameObj => bullet.CanAttack((GameObj)gameObj)));
+                            var thisList = gameMap.GameObjDict[kvp.Key].FindAll(gameObj => bullet.CanAttack((GameObj)gameObj));
+                            if (thisList != null) beAttackedList.AddRange(thisList);
                         }
                     }
                     foreach (GameObj beAttackedObj in beAttackedList.Cast<GameObj>())

diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs
@@ -222,14 +222,15 @@ public List<IGameObj> GetGameObj()
             {
                 if (GameData.NeedCopy(keyValuePair.Key))
                 {
-                    gameObjList.AddRange(gameMap.GameObjDict[keyValuePair.Key].ToNewList());
+                    var thisList = gameMap.GameObjDict[keyValuePair.Key].ToNewList();
+                    if (thisList != null) gameObjList.AddRange(thisList);
                 }
             }
             return gameObjList;
         }
         public void UpdateBirthPoint()
         {
-            gameMap.GameObjDict[GameObjType.Construction].Cast<Construction>().ForEach(
+            gameMap.GameObjDict[GameObjType.Construction].Cast<Construction>()?.ForEach(
                 delegate (Construction construction)
                 {
                     if (construction.ConstructionType == ConstructionType.Community)
@@ -254,7 +255,7 @@ public void UpdateBirthPoint()
             {
                 foreach (XY birthPoint in team.BirthPointList)
                 {
-                    gameMap.GameObjDict[GameObjType.Construction].Cast<Construction>().ForEach(
+                    gameMap.GameObjDict[GameObjType.Construction].Cast<Construction>()?.ForEach(
                         delegate (Construction construction)
                     {
                         if (construction.Position == birthPoint)
@@ -277,7 +278,7 @@ public Game(MapStruct mapResource, int numOfTeam)
             actionManager = new(gameMap, shipManager);
             attackManager = new(gameMap, shipManager);
             teamList = [];
-            gameMap.GameObjDict[GameObjType.Home].Cast<GameObj>().ForEach(
+            gameMap.GameObjDict[GameObjType.Home].Cast<GameObj>()?.ForEach(
                 delegate (GameObj gameObj)
                 {
                     if (gameObj.Type == GameObjType.Home)

diff --git a/logic/Preparation/Utility/SafeValue/Atomic.cs b/logic/Preparation/Utility/SafeValue/Atomic.cs
@@ -8,6 +8,20 @@ public abstract class Atomic
     {
     }
 
+
+    public class AtomicT<T>(T? x) : Atomic where T : class?
+    {
+        protected T? v = x;
+
+        public override string ToString() => Interlocked.CompareExchange(ref v, null, null)?.ToString() ?? "NULL";
+        public T? Get() => Interlocked.CompareExchange(ref v, null, null);
+        public static implicit operator T?(AtomicT<T> aint) => Interlocked.CompareExchange(ref aint.v, null, null);
+        /// <returns>返回操作前的值</returns>
+        public virtual T? SetReturnOri(T? value) => Interlocked.Exchange(ref v, value);
+        /// <returns>返回操作前的值</returns>
+        public virtual T? CompareExReturnOri(T? newV, T? compareTo) => Interlocked.CompareExchange(ref v, newV, compareTo);
+    }
+
     public class AtomicInt(int x) : Atomic
     {
         protected int v = x;

diff --git a/logic/Preparation/Utility/SafeValue/ListLocked.cs b/logic/Preparation/Utility/SafeValue/ListLocked.cs
@@ -6,7 +6,7 @@
 
 namespace Preparation.Utility
 {
-    public class LockedClassList<T> where T : class
+    public class LockedClassList<T> where T : class?
     {
         private readonly ReaderWriterLockSlim listLock = new();
         private List<T> list;
@@ -104,7 +104,7 @@ public bool RemoveAt(int index)
         #endregion
 
         #region 读取与对类操作
-        public TResult ReadLock<TResult>(Func<TResult> func)
+        public TResult? ReadLock<TResult>(Func<TResult?> func)
         {
             listLock.EnterReadLock();
             try
@@ -130,7 +130,7 @@ public void ReadLock(Action func)
 
         }
 
-        public T this[int index]
+        public T? this[int index]
         {
             get
             {
@@ -158,7 +158,7 @@ public bool Contains(T item)
             return ReadLock(() => { return list.Find(match); });
         }
 
-        public List<T> FindAll(Predicate<T> match)
+        public List<T>? FindAll(Predicate<T> match)
         {
             return ReadLock(() => { return list.FindAll(match); });
         }
@@ -167,17 +167,17 @@ public List<T> FindAll(Predicate<T> match)
 
         public void ForEach(Action<T> action) => ReadLock(() => { list.ForEach(action); });
 
-        public Array ToArray()
+        public Array? ToArray()
         {
             return ReadLock(() => { return list.ToArray(); });
         }
-        public List<T> ToNewList()
+        public List<T>? ToNewList()
         {
             List<T> lt = new();
             return ReadLock(() => { lt.AddRange(list); return lt; });
         }
 
-        public LockedClassList<TResult> Cast<TResult>() where TResult : class
+        public LockedClassList<TResult>? Cast<TResult>() where TResult : class?
         {
             LockedClassList<TResult> lt = new();
             return ReadLock(() => { lt.AddRange(list.Cast<TResult>()); return lt; });

diff --git a/logic/Server/GameServer.cs b/logic/Server/GameServer.cs
@@ -188,7 +188,7 @@ public void ReportGame(GameState gameState, bool requiredGaming = true)
 
         private bool PlayerDeceased(int playerID)    //# 这里需要判断大本营deceased吗？
         {
-            return game.GameMap.GameObjDict[GameObjType.Ship].Cast<Ship>().Find(
+            return game.GameMap.GameObjDict[GameObjType.Ship].Cast<Ship>()?.Find(
                 ship => ship.PlayerID == playerID && ship.ShipState == ShipStateType.Deceased
                 ) != null;
         }