Changeset 368 for trunk

Timestamp:

Nov 3, 2007, 3:37:02 AM (17 years ago)

Author:

dai

Message:

GCのマーク時間を短縮した

File:

• trunk/Include/system/gc.sbp (modified) (8 diffs)

trunk/Include/system/gc.sbp

@@ -346 +346 @@
 
     /*!
-    @brief  スウィープする
-    @author Daisuke Yamamoto
-    @date   2007/10/21
-    */
-    Sub sweep()
+    @brief  必要であればスウィープする
+    @author Daisuke Yamamoto
+    @date   2007/10/21
+    */
+    Sub TrySweep()
         If isSweeping <> False or (iAllSize<limitMemorySize and countOfMemoryObjects<limitMemoryObjectNum) Then
             'メモリ使用量が上限値を超えていないとき
@@ -356 +356 @@
         End If
 
+        Sweep()
+    End Sub
+
+    /*!
+    @brief  スウィープする
+    @author Daisuke Yamamoto
+    @date   2007/10/21
+    */
+    Sub Sweep()
         Dim hThread As HANDLE
         Dim ThreadId As DWord
@@ -377 +386 @@
     */
     Function HitTest(pSample As VoidPtr) As Long
+        If pSample = NULL Then
+            Return -1
+        End If
+
         Dim i As Long
         For i=0 To ELM(countOfMemoryObjects)
@@ -606 +619 @@
 
 
-        If isSweeping <> False or (iAllSize<limitMemorySize and countOfMemoryObjects<limitMemoryObjectNum) Then
-            ExitThread(0)
-        End If
+        'If isSweeping <> False or (iAllSize<limitMemorySize and countOfMemoryObjects<limitMemoryObjectNum) Then
+        '   ExitThread(0)
+        'End If
         isSweeping = True
 
@@ -710 +723 @@
 Function GC_malloc(size As Long) As VoidPtr
     ' sweep
-    _System_pGC->sweep()
+    _System_pGC->TrySweep()
 
     'allocate
@@ -718 +731 @@
 Function GC_malloc_atomic(size As Long) As VoidPtr
     ' sweep
-    _System_pGC->sweep()
+    _System_pGC->TrySweep()
 
     'allocate
@@ -726 +739 @@
 Function _System_GC_malloc_ForObject(size As Long) As VoidPtr
     ' sweep
-    _System_pGC->sweep()
+    _System_pGC->TrySweep()
 
     'allocate
@@ -734 +747 @@
 Function _System_GC_malloc_ForObjectPtr(size As Long) As VoidPtr
     ' sweep
-    _System_pGC->sweep()
+    _System_pGC->TrySweep()
 
     'allocate