Changeset 330 for trunk/Include

Timestamp:

Sep 9, 2007, 12:41:35 PM (17 years ago)

Author:

dai

Message:

コンストラクタパラメータを処理中にGCがかかると、初期化中オブジェクトのスキャンで強制終了してしまうバグを修正。
グローバル領域に保持されるオブジェクトの一部がGCによって不正に回収されてしまうバグを修正。
Thread.Nameプロパティを実装

Location:

trunk/Include

Files:

• Classes/System/IO/DirectoryInfo.ab (modified) (1 diff)
• Classes/System/Threading/Thread.ab (modified) (6 diffs)
• system/gc.sbp (modified) (5 diffs)

trunk/Include/Classes/System/IO/DirectoryInfo.ab

@@ -165 +165 @@
 
         Dim files As List<FileSystemInfo>
-        Dim i As Long
+        Dim i = 0 As Long
         Do
             If i > 1 Then

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

@@ -26 +26 @@
     m_fp As PTHREAD_START_ROUTINE
     m_args As VoidPtr
+    name As String
 
 Public
@@ -34 +35 @@
 
         m_fp=0
+
+        name = "sub thread"
     End Sub
     Sub Thread(fp As PTHREAD_START_ROUTINE, args As VoidPtr)
@@ -42 +45 @@
         m_fp=fp
         m_args=args
+
+        name = "sub thread"
     End Sub
 
@@ -50 +55 @@
         m_fp=obj.m_fp
         m_args=obj.m_args
+
+        name = "sub thread"
     End Sub
 
@@ -55 +62 @@
         m_hThread=hThread
         m_dwThreadId=dwThreadId
+
+        name = "sub thread"
     End Sub
 
@@ -83 +92 @@
         Return m_dwThreadId
     End Function
+
+    Function Name() As String
+        Return name
+    End Function
+    Sub Name( name As String )
+        This.name = name
+    End Sub
 
 

trunk/Include/system/gc.sbp

@@ -126 +126 @@
         ' 自身のThreadオブジェクトを生成
         Dim thread As Thread(hTargetThread,GetCurrentThreadId(),0)
+        thread.Name = "main"
 
         _System_pobj_AllThreads->BeginThread(ObjPtr( thread ),_System_gc_StackRoot_StartPtr As *LONG_PTR)
@@ -179 +180 @@
             pdwFlags[n]=flags
         LeaveCriticalSection(CriticalSection)
+
+        /*
+        ' デバッグ用
+        If n = 1996 Then
+            debug
+        End If
+        */
 
         n++
@@ -283 +291 @@
         End If
 
+        /*
+        _System_DebugOnly_OutputDebugString( "  (scanning object)" )
+        _System_DebugOnly_OutputDebugString( classTypeInfo.Name )
+        _System_DebugOnly_OutputDebugString( Ex"\r\n" )
+        */
+
         Dim i As Long
         For i = 0 To ELM(classTypeInfo.numOfReference)
@@ -330 +344 @@
         Dim i As Long
         For i=0 To ELM(_System_pobj_AllThreads->ThreadNum)
-            If _System_pobj_AllThreads->ppobj_Thread[i] Then
+            Dim thread = _System_pobj_AllThreads->ppobj_Thread[i]
+            If thread Then
                 FillMemory(VarPtr(Context),SizeOf(CONTEXT),0)
                 Context.ContextFlags=CONTEXT_CONTROL
-                If _System_pobj_AllThreads->ppobj_Thread[i]->__GetContext(Context)=0 Then
+                If thread->__GetContext(Context)=0 Then
                     _System_DebugOnly_OutputDebugString(Ex"レジスタ情報の取得に失敗しました。\r\n")
                 End If
@@ -350 +365 @@
                     Exit Sub
                 End If
+
+                /*
+                _System_DebugOnly_OutputDebugString( "(scanning thread local)" )
+                _System_DebugOnly_OutputDebugString( thread.Name )
+                _System_DebugOnly_OutputDebugString( Ex"\r\n" )
+                */
 
                 Scan( NowSp, maxNum, pbMark )