Changeset 169 for MicroThreading/UMicroThreading.pas

Timestamp:

Feb 11, 2011, 2:16:17 PM (14 years ago)

Author:

george

Message:

• Modified: Reducing some spare methods.

File:

• MicroThreading/UMicroThreading.pas (modified) (11 diffs)

MicroThreading/UMicroThreading.pas

@@ -35 +35 @@
   SReleaseNotAcquiredLock = 'Release on not acquired lock';
   SMethodNotAssigned = 'Method for microthread not assigned';
+  SCriticalSectionDecrement = 'Critical section counter decremented to negative number';
 
 
@@ -117 +118 @@
     procedure Yield;
     procedure MTSleep(Duration: TDateTime); // No conflicting name to global Sleep procedure
-    procedure WaitForCriticalSection(CriticalSection: TMicroThreadCriticalSection);
-    function WaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
     procedure WaitFor;
     procedure Terminate;
@@ -236 +235 @@
     BurstCount: Integer;
     function Add(MicroThread: TMicroThread): Integer;
-    function AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean = False): Integer;
+    function AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean = True): Integer;
     procedure Remove(MicroThread: TMicroThread; Free: Boolean = True);
     constructor Create;
@@ -278 +277 @@
 procedure MTSleep(Duration: TDateTime);
 procedure MTSynchronize(Method: TThreadMethod);
-function MTWaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
 procedure Log(Text: string);
 procedure Register;
@@ -345 +343 @@
 end;
 
-function MTWaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
-var
-  MT: TMicroThread;
-begin
-  MT := GetCurrentMicroThread;
-  if Assigned(MT) then Result := MT.WaitForEvent(Event, Duration)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
-end;
-
 var
   LogLock: TCriticalSection;
@@ -381 +370 @@
 begin
   MT := GetCurrentMicroThread;
-  if Assigned(MT) then MT.WaitForCriticalSection(Self)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
+  if Assigned(MT) then
+  try
+    MainScheduler.FMicroThreadsLock.Acquire;
+    Lock.Acquire;
+    Inc(FCounter);
+    if FCounter > 1 then begin
+      FMicroThreads.Add(MT);
+      MT.FBlockState := tbsCriticalSection;
+      MT.FStatePending := tsBlocked;
+      try
+        Lock.Release;
+        MainScheduler.FMicroThreadsLock.Release;
+        MT.Yield;
+      finally
+        MainScheduler.FMicroThreadsLock.Acquire;
+        Lock.Acquire;
+      end;
+    end;
+  finally
+    Lock.Release;
+    MainScheduler.FMicroThreadsLock.Release;
+  end else
+    raise EMicroThreadError.Create(SNotInMicroThread);
 end;
 
@@ -394 +404 @@
       // Release one waiting micro thread
       TMicroThread(FMicroThreads[0]).FState := tsWaiting;
+      TMicroThread(FMicroThreads[0]).FStatePending := tsNone;
       FMicroThreads.Delete(0);
     end;
+    if FCounter < 0 then
+      raise EMicroThreadError.Create(SCriticalSectionDecrement);
   finally
     Lock.Release;
@@ -468 +481 @@
 begin
   MT := GetCurrentMicroThread;
-  if Assigned(MT) then Result := MT.WaitForEvent(Self, Duration)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
+  if Assigned(MT) then begin
+    try
+      FMicroThreadsLock.Acquire;
+      if Signaled then begin
+        Result := wrSignaled;
+        Exit;
+      end;
+      FMicroThreads.Add(Self);
+      MT.FBlockTime := NowPrecise + Duration;
+      MT.FBlockState := tbsWaitFor;
+      MT.FStatePending := tsBlocked;
+    finally
+      FMicroThreadsLock.Release;
+    end;
+    MT.Yield;
+    if (MT.FBlockTime <> 0) and (MT.FBlockTime < NowPrecise) then
+      Result := wrTimeout else Result := wrSignaled;
+
+    try
+      FMicroThreadsLock.Acquire;
+      FMicroThreads.Remove(Self);
+    finally
+      FMicroThreadsLock.Release;
+    end
+  end else
+    raise EMicroThreadError.Create(SNotInMicroThread);
 end;
 
@@ -773 +810 @@
     // Called from another microthread
     while not ((FState = tsBlocked) and (FBlockState = tbsTerminated)) do begin
-      MTSleep(1);
+      MTSleep(1 * OneMillisecond);
     end;
   end else begin
@@ -792 +829 @@
 end;
 
-procedure TMicroThread.WaitForCriticalSection(
-  CriticalSection: TMicroThreadCriticalSection);
-begin
-  try
-    FScheduler.FMicroThreadsLock.Acquire;
-    CriticalSection.Lock.Acquire;
-    Inc(CriticalSection.FCounter);
-    if CriticalSection.FCounter > 1 then begin
-      CriticalSection.FMicroThreads.Add(Self);
-      FBlockState := tbsCriticalSection;
-      FStatePending := tsBlocked;
-      try
-        CriticalSection.Lock.Release;
-        FScheduler.FMicroThreadsLock.Release;
-        Yield;
-      finally
-        FScheduler.FMicroThreadsLock.Acquire;
-        CriticalSection.Lock.Acquire;
-      end;
-    end;
-  finally
-    CriticalSection.Lock.Release;
-    FScheduler.FMicroThreadsLock.Release;
-  end;
-end;
-
-function TMicroThread.WaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
-begin
-  try
-    Event.FMicroThreadsLock.Acquire;
-    if Event.Signaled then begin
-      Result := wrSignaled;
-      Exit;
-    end;
-    Event.FMicroThreads.Add(Self);
-    FBlockTime := NowPrecise + Duration;
-    FBlockState := tbsWaitFor;
-    FStatePending := tsBlocked;
-  finally
-    Event.FMicroThreadsLock.Release;
-  end;
-  Yield;
-  if (FBlockTime <> 0) and (FBlockTime < NowPrecise) then Result := wrTimeout
-    else Result := wrSignaled;
-
-  try
-    Event.FMicroThreadsLock.Acquire;
-    Event.FMicroThreads.Remove(Self);
-  finally
-    Event.FMicroThreadsLock.Release;
-  end;
-end;
-
 constructor TMicroThread.Create(CreateSuspended: Boolean;
   const StackSize: SizeUInt = DefaultStackSize);
@@ -851 +835 @@
   FStackSize := StackSize;
   FStack := GetMem(FStackSize);
-  FBasePointer := FStack + FStackSize - SizeOf(Pointer);
-  FStackPointer := FBasePointer - SizeOf(Pointer);
+  FBasePointer := 0; // FStack + FStackSize - SizeOf(Pointer);
+  FStackPointer := FStack + FStackSize - 2 * SizeOf(Pointer);
   FillChar(FStackPointer^, 2 * SizeOf(Pointer), 0);