clear merging conflict

2025-08-25 10:17:25 +08:00
parent 88e9ee97e9 1fc687f7d0
commit fe097fd94c
1571 changed files with 629573 additions and 76392 deletions
@@ -28,6 +28,13 @@
 //     
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 using hlsfHandle = StgSharp.HighPerformance.Memory.HybridLayerSegregatedFitAllocationHandle;

 namespace StgSharp.HighPerformance.Memory
@@ -47,6 +54,13 @@ namespace StgSharp.HighPerformance.Memory
            if (e == null) {
                return;
            }
+            AcquireEntrySpinLock(e);
+            try
+            {
+                if (GetEntryState(e) != EntryState.Allocated) {
+                    return;
+                }
+                SetEntryState(e, EntryState.ThreadOccupied);

            if (e->State != EntryState.Allocated) {
                return;