Changeset 480 for trunk/Include/Classes

Timestamp:

Mar 15, 2008, 3:34:56 PM (17 years ago)

Author:

dai

Message:

関数の戻り値の構造体など、一時メモリに保持された構造体のメンバに直接アクセスした場合、その一時メモリの解放が正常に行われないバグを修正

File:

• trunk/Include/Classes/System/Threading/Thread.ab (modified) (5 diffs)

trunk/Include/Classes/System/Threading/Thread.ab

@@ -30 +30 @@
     throwingParamObject As Object
 
+    needFreeStructurePointers As *VoidPtr
+    countOfNeedFreeStructurePointers As Long
+
 Public
     Sub Thread()
@@ -127 +130 @@
         '------------
 
+        ' 構造体の一時メモリ退避用領域を作成
+        needFreeStructurePointers = _System_malloc( 1 )
+        countOfNeedFreeStructurePointers = 0
+
         'GCにスレッド開始を通知
         _System_pobj_AllThreads->BeginThread(This, _System_GetSp() As *LONG_PTR)
@@ -143 +150 @@
         'GCにスレッド終了を通知
         _System_pobj_AllThreads->EndThread(This)
+
+        ' 構造体の一時メモリ退避用領域を破棄
+        _System_free( needFreeStructurePointers )
 
         '自身のスレッドハンドルを閉じる
@@ -189 +199 @@
         Return throwingParamObject
     End Function
+
+    Sub __AddNeedFreeTempStructure( structurePointer As VoidPtr )
+        needFreeStructurePointers = _System_realloc( needFreeStructurePointers, ( countOfNeedFreeStructurePointers + 1 ) * SizeOf(VoidPtr) )
+        needFreeStructurePointers[countOfNeedFreeStructurePointers] = structurePointer
+        countOfNeedFreeStructurePointers ++
+    End Sub
+
+    Sub __FreeTempStructure()
+        Dim i = 0 As Long
+        While i<countOfNeedFreeStructurePointers
+            free( needFreeStructurePointers[i] )
+            i++
+        Wend
+        countOfNeedFreeStructurePointers = 0
+    End Sub
 
 
@@ -389 +414 @@
 
 End Namespace 'Detail
+
+Sub _System_AddNeedFreeTempStructure( structurePointer As VoidPtr )
+    Thread.CurrentThread.__AddNeedFreeTempStructure( structurePointer )
+End Sub
+Sub _System_FreeTempStructure()
+    Thread.CurrentThread.__FreeTempStructure()
+End Sub