Changeset 171 for Include/system

Timestamp:

Mar 17, 2007, 6:01:56 AM (18 years ago)

Author:

dai

Message:

スウィープ中に呼ばれたデストラクタの中で、GC関連のメソッドを呼ぶとデッドロックしてしまうバグを修正。

File:

• Include/system/gc.sbp (modified) (3 diffs)

Include/system/gc.sbp

@@ -198 +198 @@
 
     Sub sweep()
-        EnterCriticalSection(CriticalSection)
-            If iAllSize<limitMemorySize Then
-                'メモリ使用量が上限値を超えていないとき
-                LeaveCriticalSection(CriticalSection)
-                Exit Sub
-            End If
-
-            OutputDebugString( Ex"garbage colletion sweep start!\r\n" )
-
-            Dim hThread As HANDLE
-            Dim ThreadId As DWord
-            hThread=_beginthreadex(NULL,0,AddressOf(SweepOnOtherThread),VarPtr(This),0,ThreadId)
-            WaitForSingleObject(hThread,INFINITE)
-            CloseHandle(hThread)
-        LeaveCriticalSection(CriticalSection)
+        If iAllSize<limitMemorySize Then
+            'メモリ使用量が上限値を超えていないとき
+            Exit Sub
+        End If
+
+        OutputDebugString( Ex"garbage colletion sweep start!\r\n" )
+
+        Dim hThread As HANDLE
+        Dim ThreadId As DWord
+        hThread=_beginthreadex(NULL,0,AddressOf(SweepOnOtherThread),VarPtr(This),0,ThreadId)
+        WaitForSingleObject(hThread,INFINITE)
+        CloseHandle(hThread)
     End Sub
 
@@ -348 +345 @@
     ' スウィープ（新規スレッドで呼び出し）
     Function Cdecl SweepOnOtherThread() As Long
+        EnterCriticalSection(CriticalSection)
 
         ' すべてのスレッドを一時停止
@@ -399 +397 @@
         '-------------------------------------
         _System_pobj_AllThreads->ResumeAllThread()
+
+        LeaveCriticalSection(CriticalSection)
     End Function