clear merging conflict

2025-08-25 10:11:20 +08:00
parent 11b630ffa2
commit 88e9ee97e9
112 changed files with 1711 additions and 6912 deletions
@@ -48,13 +48,13 @@ namespace StgSharp.HighPerformance.Memory
                return;
            }

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


            // Set to ThreadOccupied to prevent other operations
-            SetEntryState(e, EntryState.ThreadOccupied);
+            e->State = EntryState.Empty;


            // Try merge with adjacent free blocks and remove them from buckets
@@ -68,7 +68,7 @@ namespace StgSharp.HighPerformance.Memory


            // Set the merged entry state to Empty (ready to be reused)
-            SetEntryState(e, EntryState.Empty);
+            e->State = EntryState.Empty;


            // Push the merged entry back to appropriate bucket