Changeset 19

Timestamp:

Nov 27, 2006, 2:51:04 AM (18 years ago)

Author:

dai

Message:

 

File:

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

Include/Classes/System/Threading/Thread.ab

@@ -1 @@
-'threading.ab
+'threading.sbp
 
 Enum ThreadPriority
-    Highest = THREAD_PRIORITY_HIGHEST
-    AboveNormal = THREAD_PRIORITY_ABOVE_NORMAL
-    Normal = THREAD_PRIORITY_NORMAL
-    BelowNormal = THREAD_PRIORITY_BELOW_NORMAL
-    Lowest = THREAD_PRIORITY_LOWEST
+    Highest =      2
+    AboveNormal =  1
+    Normal =       0
+    BelowNormal = -1
+    Lowest =      -2
 End Enum
 
@@ -13 +13 @@
 Class Thread
     m_hThread As HANDLE
+    m_dwThreadId As DWord
+
     m_Priority As ThreadPriority
 
@@ -20 +22 @@
     Sub Thread()
         m_hThread=0
+        m_dwThreadId=0
         m_Priority=ThreadPriority.Normal
 
@@ -26 +29 @@
     Sub Thread(fp As PTHREAD_START_ROUTINE, args As VoidPtr)
         m_hThread=0
+        m_dwThreadId=0
         m_Priority=ThreadPriority.Normal
 
@@ -32 +36 @@
     End Sub
 
-
+    Sub Thread(ByRef obj As Thread)
+        m_hThread=obj.m_hThread
+        m_dwThreadId=obj.m_dwThreadId
+        m_Priority=obj.m_Priority
+        m_fp=obj.m_fp
+        m_args=obj.m_args
+    End Sub
+
+    Sub Thread(hThread As HANDLE,dwThreadId As DWord,dummy As Long)
+        m_hThread=hThread
+        m_dwThreadId=dwThreadId
+        m_Priority=ThreadPriority.Normal
+    End Sub
+
+    Sub ~Thread()
+    End Sub
+
+
+    Function Equals(ByRef obj_Thread As Thread) As BOOL
+        If m_dwThreadId=obj_Thread.m_dwThreadId Then
+            Return TRUE
+        End If
+        Return FALSE
+    End Function
+
+
+
+    '-----------------------
+    ' Public Properties
+    '-----------------------
+
+    'Priority Property
     Sub Priority(value As ThreadPriority)
         m_Priority=value
-        If m_hThread Then
-            SetThreadPriority(m_hThread, value)
-        End If
+        SetThreadPriority(m_hThread,value)
     End Sub
     Function Priority() As ThreadPriority
@@ -43 +76 @@
     End Function
 
+    'ThreadId
+    Function ThreadId() As DWord
+        Return m_dwThreadId
+    End Function
+
+
+
 
     Sub Start()
         Dim ThreadId As DWord
-        m_hThread=_beginthreadex(NULL,0,AddressOf(ThreadEntryPoint),VarPtr(This),CREATE_SUSPENDED,ThreadId)
+        m_hThread=_beginthreadex(NULL,0,AddressOf(_run),VarPtr(This),CREATE_SUSPENDED,m_dwThreadId)
         SetThreadPriority(m_hThread,m_Priority)
         Resume()
@@ -52 +92 @@
 
 Private
-    Static Function ThreadEntryPoint(pv As VoidPtr) As DWord
-        Dim pThis As *Thread
-        pThis = pv
-        ThreadEntryPoint = pThis->ThreadStartup() As DWord
-    End Function
-
-    Function ThreadStartup() As Long
+    Function Cdecl _run() As Long
         '------------
         ' 前処理
@@ -64 +98 @@
 
         'GCにスレッド開始を通知
-        _System_GC.BeginThread(m_hThread,_System_GetSp() As *LONG_PTR)
+        _System_pobj_AllThreads->BeginThread(This,_System_GetSp() As *LONG_PTR)
 
 
@@ -70 +104 @@
         '実行
         '------------
-        ThreadStartup = Run()
+        _run=Run()
 
 
@@ -78 +112 @@
 
         'GCにスレッド終了を通知
-        _System_GC.EndThread(m_hThread)
+        _System_pobj_AllThreads->EndThread(This)
 
         '自身のスレッドハンドルを閉じる
         CloseHandle(m_hThread)
-        m_hThread = 0
+        m_hThread=0
 
     End Function
@@ -100 +134 @@
     End Sub
 
-    Sub Join()
-        If m_hThread Then
-            WaitForSingleObject(m_hThread, INFINITE)
-        End If
-    End Sub
+    Function __GetContext(ByRef Context As CONTEXT) As BOOL
+        Return GetThreadContext(m_hThread,Context)
+    End Function
+
+
+    Static Function CurrentThread() As Thread
+        Dim obj_Thread As Thread()
+        _System_pobj_AllThreads->CurrentThread(obj_Thread)
+        Return obj_Thread
+    End Function
 End Class
+
+
+'すべてのスレッドの管理
+Class _System_CThreadCollection
+Public
+    ppobj_Thread As **Thread
+    pStackBase As **LONG_PTR
+    ThreadNum As Long
+
+    CriticalSection As CRITICAL_SECTION
+
+    Sub _System_CThreadCollection()
+        ppobj_Thread=HeapAlloc(_System_hProcessHeap,0,1)
+        pStackBase=HeapAlloc(_System_hProcessHeap,0,1)
+        ThreadNum=0
+
+        'クリティカルセッションを生成
+        InitializeCriticalSection(CriticalSection)
+    End Sub
+
+    Sub ~_System_CThreadCollection()
+    End Sub
+
+    Sub Finalize()
+        HeapFree(_System_hProcessHeap,0,ppobj_Thread)
+        ppobj_Thread=0
+
+        HeapFree(_System_hProcessHeap,0,pStackBase)
+        pStackBase=0
+
+        ThreadNum=0
+
+        'クリティカルセッションを破棄
+        DeleteCriticalSection(CriticalSection)
+    End Sub
+
+    'スレッドを生成
+    Sub BeginThread(ByRef obj_Thread As Thread,NowSp As *LONG_PTR)
+        EnterCriticalSection(CriticalSection)
+
+            Dim pobj_NewThread As *Thread
+            pobj_NewThread=New Thread(obj_Thread)
+
+            Dim i As Long
+            For i=0 To ELM(ThreadNum)
+                If ppobj_Thread[i]=0 Then
+                    ppobj_Thread[i]=pobj_NewThread
+                    pStackBase[i]=NowSp
+                    Exit For
+                End If
+            Next
+
+            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
+                ThreadNum++
+            End If
+        LeaveCriticalSection(CriticalSection)
+    End Sub
+
+    'スレッドを終了
+    Sub EndThread(ByRef obj_Thread As Thread)
+        EnterCriticalSection(CriticalSection)
+            Dim i As Long
+            For i=0 To ELM(ThreadNum)
+                If ppobj_Thread[i]->Equals(obj_Thread) Then
+                    Delete ppobj_Thread[i]
+                    ppobj_Thread[i]=0
+                    pStackBase[i]=0
+                    Exit For
+                End If
+            Next
+        LeaveCriticalSection(CriticalSection)
+    End Sub
+
+    ' すべてのスレッドを中断
+    Sub SuspendAllThread()
+        Dim i As Long
+        For i=0 To ELM(ThreadNum)
+            If ppobj_Thread[i] Then
+                ppobj_Thread[i]->Suspend()
+            End If
+        Next
+    End Sub
+
+    ' すべてのスレッドを再開
+    Sub ResumeAllThread()
+        Dim i As Long
+        For i=0 To ELM(ThreadNum)
+            If ppobj_Thread[i] Then
+                ppobj_Thread[i]->Resume()
+            End If
+        Next
+    End Sub
+
+
+    Function CurrentThread(ByRef obj_Thread As Thread) As BOOL
+        Dim dwNowThreadId As DWord
+        dwNowThreadId=GetCurrentThreadId()
+
+        Dim i As Long
+        For i=0 To ELM(ThreadNum)
+            If ppobj_Thread[i]->ThreadId=dwNowThreadId Then
+                obj_Thread.Thread(ByVal ppobj_Thread[i])
+                Return 1
+            End If
+        Next
+
+        Return 0
+    End Function
+End Class
+Dim _System_pobj_AllThreads As *_System_CThreadCollection