Changeset 261

Timestamp:

May 26, 2007, 1:08:15 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

CriticalSection, CriticalSectionLockの追加

Location:

Include/Classes

Files:

• ActiveBasic (added)
• ActiveBasic/Windows (added)
• ActiveBasic/Windows/CriticalSection.ab (added)
• ActiveBasic/Windows/index.ab (added)
• System/Threading/WaitHandle.ab (modified) (7 diffs)
• System/misc.ab (modified) (2 diffs)

Include/Classes/System/Threading/WaitHandle.ab

@@ -4 +4 @@
 #define __SYSTEM_THREADING_WAITHANDLE_AB__
 
-'Namespace System
-'Namespace Threading
+#require <Classes/System/misc.ab>
+
+Namespace System
+Namespace Threading
 
 Namespace Detail
@@ -12 +14 @@
 
 Class WaitHandle
+    Inherits System.IDisposable
 Public
     ' Properties
@@ -28 +31 @@
 
     Virtual Sub ~WaitHandle()
-        CloseHandle(h)
+        Dispose()
     End Sub
 
     Virtual Sub Close()
-        CloseHandle(h)
+        Dispose()
     End Sub
 
-    Function WaitOne() As BOOL
+    Override Sub Dispose()
+        Dim hDisposing = InterlockedExchangePointer(h, 0)
+        If hDisposing <> 0 Then
+            CloseHandle(hDisposing)
+        End If
+    End Sub
+
+    Function WaitOne() As Boolean
         Return WaitOne(INFINITE, FALSE)
     End Function
 
-    Function WaitOne(millisecondsTimeout As Long, exitContext As BOOL) As BOOL
+    Function WaitOne(millisecondsTimeout As Long, exitContext As BOOL) As Boolean
         Return WaitHandle.AfterWait(WaitForSingleObject(h, millisecondsTimeout As DWord), 1)
     End Function
@@ -65 +75 @@
 '   Static Function WaitAny(timeout As TimeSpan, handles As *HANDLE, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
 */
-    Static Function SignalAndWait(ByRef toSignal As WaitHandle, ByRef toWaitOn As WaitHandle) As BOOL
+    Static Function SignalAndWait(toSignal As WaitHandle, toWaitOn As WaitHandle) As Boolean
         Return SignalAndWait(toSignal, toWaitOn, INFINITE, FALSE)
     End Function
 
 Public
-    Static Function SignalAndWait(ByRef toSignal As WaitHandle, ByRef toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As BOOL) As BOOL
+    Static Function SignalAndWait(toSignal As WaitHandle, toWaitOn As WaitHandle, millisecondsTimeout As Long, exitContext As BOOL) As Boolean
         Dim pSignalObjectAndWait = GetProcAddress(GetModuleHandle("Kernel32.dll"), "SignalObjectAndWait") As Detail.PFNSignalObjectAndWait
         If pSignalObjectAndWait = 0 Then
@@ -92 +102 @@
     h As HANDLE
 
-    Static Function AfterWait(ret As DWord, n As DWord) As BOOL
+    Static Function AfterWait(ret As DWord, n As DWord) As Boolean
         Select Case ret
             Case WAIT_TIMEOUT
-                Return FALSE
+                Return False
             Case WAIT_ABANDONED
                 ' Throw AbandonedMutexException
@@ -103 +113 @@
             Case Else
                 If WAIT_OBJECT_0 <= ret And ret < WAIT_OBJECT_0 + n Then
-                    Return TRUE
+                    Return True
                 End If
                 ' ObjectDisposedException?
@@ -112 +122 @@
 End Class
 
-'End Namespace 'Threading
-'End Namespace 'System
+End Namespace 'Threading
+End Namespace 'System
 
 #endif '__SYSTEM_THREADING_WAITHANDLE_AB__

Include/Classes/System/misc.ab

@@ -4 +4 @@
 #define __SYSTEM_MISC_AB__
 
-#require <Classes/System/Threading/WaitHandle.ab>
+'#require <Classes/System/Threading/WaitHandle.ab>
 
-Interface IObject
-End Interface
+Namespace System
 
 Interface IAsyncResult
     ' Properties
-    Function AsyncState() As *IObject
-    Function AsyncWaitHandle() As WaitHandle
-    Function CompletedSynchronously() As BOOL
-    Function IsCompleted() As BOOL
+    Function AsyncState() As Object
+    Function AsyncWaitHandle() As System.Threading.WaitHandle
+    Function CompletedSynchronously() As Boolean
+    Function IsCompleted() As Boolean
 End Interface
 
 Interface IClonable
     ' Method
-    Function Clone() As *IObject
+    Function Clone() As Object
 End Interface
 
 Interface IComparable
     ' Method
-    Function CompareTo(ByRef obj As IObject) As Long
+    Function CompareTo(obj As Object) As Long
+End Interface
+
+Interface IDisposable
+    ' Method
+    Sub Dispose()
 End Interface
 
@@ -32 +36 @@
 End Class
 
+End Namespace 'System
+#require <Classes/System/Threading/WaitHandle.ab>
+
 #endif '__SYSTEM_MISC_AB__