Changeset 58 for Include/Classes/System/Threading

Timestamp:

Jan 12, 2007, 3:21:30 AM (18 years ago)

Author:

dai

Message:

例外処理用に必要なコードを追加。
空間統括ファイル（index.ab）を作成。
その他クラスの調整。

Location:

Include/Classes/System/Threading

Files:

• Thread.ab (modified) (10 diffs)
• WaitHandle.ab (modified) (1 diff)
• index.ab (added)

Include/Classes/System/Threading/Thread.ab

@@ -1 +1 @@
 'threading.sbp
 
+
+'--------------------------------------------------------------------
+' スレッドの優先順位
+'--------------------------------------------------------------------
 Enum ThreadPriority
     Highest =      2
@@ -11 +15 @@
 TypeDef PTHREAD_START_ROUTINE = *Function(args As VoidPtr) As DWord
 
+
+'--------------------------------------------------------------------
+' スレッド クラス
+'--------------------------------------------------------------------
 Class Thread
     m_hThread As HANDLE
@@ -19 +27 @@
     m_fp As PTHREAD_START_ROUTINE
     m_args As VoidPtr
+
 Public
     Sub Thread()
@@ -137 +146 @@
         Return GetThreadContext(m_hThread,Context)
     End Function
+    Function __SetContext(ByRef Context As CONTEXT) As BOOL
+        Return SetThreadContext(m_hThread,Context)
+    End Function
 
 
@@ -147 +159 @@
 
 
-'すべてのスレッドの管理
+'--------------------------------------------------------------------
+' すべてのスレッドの管理
+'--------------------------------------------------------------------
+' TODO: このクラスをシングルトンにする
 Class _System_CThreadCollection
 Public
@@ -159 +174 @@
         ppobj_Thread=HeapAlloc(_System_hProcessHeap,0,1)
         pStackBase=HeapAlloc(_System_hProcessHeap,0,1)
+        ppException=HeapAlloc(_System_hProcessHeap,0,1)
         ThreadNum=0
 
@@ -175 +191 @@
         pStackBase=0
 
+        HeapFree(_System_hProcessHeap,0,ppException)
+        ppException = 0
+
         ThreadNum=0
 
@@ -185 +204 @@
         EnterCriticalSection(CriticalSection)
 
+            'スレッドオブジェクトを生成
             Dim pobj_NewThread As *Thread
             pobj_NewThread=New Thread(obj_Thread)
 
+            '例外処理管理用オブジェクトを生成
+            Dim pException As *ExceptionService
+            pException = New ExceptionService
+
             Dim i As Long
             For i=0 To ELM(ThreadNum)
-                If ppobj_Thread[i]=0 Then
-                    ppobj_Thread[i]=pobj_NewThread
-                    pStackBase[i]=NowSp
+                If ppobj_Thread[i] = 0 Then
+                    ppobj_Thread[i] = pobj_NewThread
+                    pStackBase[i] = NowSp
+                    ppException[i] = pException
                     Exit For
                 End If
             Next
 
-            If i=ThreadNum Then
+            If i = ThreadNum Then
                 ppobj_Thread=HeapReAlloc(_System_hProcessHeap,0,ppobj_Thread,(ThreadNum+1)*SizeOf(*Thread))
                 ppobj_Thread[ThreadNum]=pobj_NewThread
                 pStackBase=HeapReAlloc(_System_hProcessHeap,0,pStackBase,(ThreadNum+1)*SizeOf(LONG_PTR))
                 pStackBase[ThreadNum]=NowSp
+                ppException=HeapReAlloc(_System_hProcessHeap,0,ppException,(ThreadNum+1)*SizeOf(*ExceptionService))
+                ppException[ThreadNum]=pException
                 ThreadNum++
             End If
@@ -242 +269 @@
     End Sub
 
-
+    'カレントスレッドを取得
     Function CurrentThread(ByRef obj_Thread As Thread) As BOOL
         Dim dwNowThreadId As DWord
@@ -257 +284 @@
         Return 0
     End Function
+
+
+Private
+    '------------------------------------------
+    ' スレッド固有の例外処理制御
+    '------------------------------------------
+    ppException As **ExceptionService
+
+Public
+    Function GetCurrentException() As *ExceptionService
+        Dim dwNowThreadId As DWord
+        dwNowThreadId=GetCurrentThreadId()
+
+        Dim i As Long
+        For i=0 To ELM(ThreadNum)
+            If ppobj_Thread[i]->ThreadId=dwNowThreadId Then
+                Return ppException[i]
+            End If
+        Next
+
+        Return NULL
+    End Function
 End Class
 Dim _System_pobj_AllThreads As *_System_CThreadCollection

Include/Classes/System/Threading/WaitHandle.ab

@@ -99 +99 @@
                 ExitThread(0)
         End Select
-    End Sub
+    End Function
 End Class