Changeset 369

Timestamp:

Nov 3, 2007, 5:01:18 AM (17 years ago)

Author:

dai

Message:

GCにてヒープ領域判定処理を追加。更に高速化した。

Location:

trunk/Include

Files:

• api_system.sbp (modified) (1 diff)
• system/gc.sbp (modified) (11 diffs)

trunk/Include/api_system.sbp

@@ -680 +680 @@
 Declare Function HeapReAlloc Lib "kernel32" (hHeap As HANDLE, dwFlags As DWord, lpMem As VoidPtr, dwBytes As SIZE_T) As VoidPtr
 Declare Function HeapSize Lib "kernel32" (hHeap As HANDLE, dwFlags As DWord, lpMem As VoidPtr) As SIZE_T
+Declare Function HeapValidate Lib "kernel32" (hHeap As HANDLE, dwFlags As DWord, lpMem As VoidPtr) As BOOL
 Declare Sub InitializeCriticalSection Lib "kernel32" (ByRef CriticalSection As CRITICAL_SECTION)
 Declare Function IsBadReadPtr Lib "kernel32" (lp As VoidPtr, ucb As ULONG_PTR) As BOOL

trunk/Include/system/gc.sbp

@@ -32 +32 @@
 Class _System_CGarbageCollection
 
+    hHeap As HANDLE                             ' GC用のヒープ
+
     pMemoryObjects As *_System_MemoryObject     ' メモリオブジェクト
     countOfMemoryObjects As Long                ' 管理するメモリオブジェクトの個数
@@ -38 +40 @@
 
     isSweeping As Boolean   ' スウィープ中かどうか
+
+    minPtr As ULONG_PTR
+    maxPtr As ULONG_PTR
 
     ' クリティカルセクション
@@ -123 +128 @@
         )
 
+        hHeap = HeapCreate( 0, 0, 0 )
+
         pMemoryObjects = _System_calloc( 1 )
         countOfMemoryObjects=0
@@ -135 +142 @@
         ' スウィープ中かどうか
         isSweeping = False
+
+        minPtr = &HFFFFFFFFFFFFFFFF As ULONG_PTR
+        maxPtr = 0
 
         'クリティカルセッションを生成
@@ -249 +259 @@
             pMemoryObjects[countOfMemoryObjects].generationCount = 0
 
+            If minPtr > new_ptr As ULONG_PTR Then
+                minPtr = new_ptr As ULONG_PTR
+            End If
+            If maxPtr < ( new_ptr + size ) As ULONG_PTR Then
+                maxPtr = ( new_ptr + size ) As ULONG_PTR
+            End If
+
             countOfMemoryObjects++
         LeaveCriticalSection(CriticalSection)
@@ -277 +294 @@
 
         ' 実際のメモリバッファはインデックスの分だけ多めに確保する
-        Dim ptr = HeapAlloc( _System_hProcessHeap, dwFlags, size + SizeOf( LONG_PTR ) ) + SizeOf( LONG_PTR )
+        Dim ptr = HeapAlloc( hHeap, dwFlags, size + SizeOf( LONG_PTR ) ) + SizeOf( LONG_PTR )
 
         ' 管理対象のメモリオブジェクトとして追加
@@ -302 +319 @@
 
             pTempMemoryObject->size = size
-            pTempMemoryObject->ptr = HeapReAlloc( _System_hProcessHeap, HEAP_ZERO_MEMORY, pTempMemoryObject->ptr - SizeOf(LONG_PTR), size + SizeOf(LONG_PTR) ) + SizeOf(LONG_PTR)
+            pTempMemoryObject->ptr = HeapReAlloc( hHeap, HEAP_ZERO_MEMORY, pTempMemoryObject->ptr - SizeOf(LONG_PTR), size + SizeOf(LONG_PTR) ) + SizeOf(LONG_PTR)
+
+            If minPtr > pTempMemoryObject->ptr As ULONG_PTR Then
+                minPtr = pTempMemoryObject->ptr As ULONG_PTR
+            End If
+            If maxPtr < ( pTempMemoryObject->ptr + size ) As ULONG_PTR Then
+                maxPtr = ( pTempMemoryObject->ptr + size ) As ULONG_PTR
+            End If
 
         LeaveCriticalSection(CriticalSection)
@@ -324 +348 @@
                 iAllSize -= pTempMemoryObject->size
 
-                HeapFree( _System_hProcessHeap, 0, pTempMemoryObject->ptr - SizeOf(LONG_PTR) )
+                HeapFree( hHeap, 0, pTempMemoryObject->ptr - SizeOf(LONG_PTR) )
                 pTempMemoryObject->ptr = NULL
                 pTempMemoryObject->size = 0
@@ -387 +411 @@
     Function HitTest(pSample As VoidPtr) As Long
         If pSample = NULL Then
+            Return -1
+        End If
+        If not( minPtr <= pSample and pSample <= maxPtr ) Then
             Return -1
         End If
@@ -628 +655 @@
 
         ' マークリストを生成
-        Dim pbMark = HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,countOfMemoryObjects*SizeOf(Byte)) As *Byte
+        Dim pbMark = _System_calloc(countOfMemoryObjects*SizeOf(Byte)) As *Byte
 
         ' グローバル領域をルートに指定してスキャン
@@ -649 +676 @@
 
         'マークリストを解放
-        HeapFree(_System_hProcessHeap,0,pbMark)
+        _System_free(pbMark)
 
         If iBackAllSize <= iAllSize * 2 Then