Changeset 164 for MicroThreading/UMicroThreading.pas

Timestamp:

Feb 8, 2011, 11:05:30 AM (14 years ago)

Author:

george

Message:

• Modified: Optimalized microthread execution from main thread.
• Fixed: Passthrough of WaitFor on already signaled event.

File:

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

MicroThreading/UMicroThreading.pas

@@ -24 +24 @@
 
 const
-  DefaultStackSize = $4000;
+  DefaultStackSize = $8000;
 
 resourcestring
@@ -210 +210 @@
     FMainThreadStarter: TTimer;
     FEvents: TObjectList;
+    FMainThreadOutsideStart: TDateTime;
+    FMainThreadOutsideDuration: TDateTime;
     function GetMicroThreadCount: Integer;
     function GetThreadPoolCount: Integer;
@@ -241 +243 @@
     property Active: Boolean read FActive write SetActive;
     property UseMainThread: Boolean read FUseMainThread write SetUseMainThread;
+    property MainThreadOutsideDuration: TDateTime read FMainThreadOutsideDuration;
   end;
 
@@ -339 +342 @@
   MT := GetCurrentMicroThread;
   if Assigned(MT) then Result := MT.WaitForEvent(Event, Duration)
-    else raise Exception.Create(SNotInThread);
+    else begin
+      while not Event.Signaled do begin
+        Sleep(1);
+        Application.ProcessMessages;
+      end;
+      //raise Exception.Create(SNotInThread);
 //    else Result := Event.WaitFor(Trunc(Duration / OneMillisecond));
+    end;
 end;
 
@@ -487 +496 @@
 function TMicroThreadManager.Execute(Count: Integer): Integer;
 begin
-  FLoopStart := NowPrecise;
+  //FLoopStart := NowPrecise;
   FStack := StackBottom;
   FStackSize := StackBottom + StackLength;
@@ -494 +503 @@
   Yield;
   Result := FExecutedCount;
-  FLoopDuration := NowPrecise - FLoopStart;
+  //FLoopDuration := NowPrecise - FLoopStart;
 end;
 
@@ -615 +624 @@
 begin
   if Assigned(FThread) then
-    FThread.Synchronize(FThread, AMethod);
+    FThread.Synchronize(FThread, AMethod)
+    else AMethod;
 end;
 
@@ -744 +754 @@
 procedure TMicroThread.WaitFor;
 begin
-  if GetMicroThreadId <> -1 then
-  while not ((FState = tsBlocked) and (FBlockState = tbsTerminated)) do begin
-    MTSleep(1);
+  if GetMicroThreadId <> -1 then begin
+    // Called from another microthread
+    while not ((FState = tsBlocked) and (FBlockState = tbsTerminated)) do begin
+      MTSleep(1);
+    end;
+  end else begin
+    // Called directly from main thread
+    while not ((FState = tsBlocked) and (FBlockState = tbsTerminated)) do begin
+      Sleep(1);
+      Application.ProcessMessages;
+    end;
   end;
 end;
@@ -762 +780 @@
   try
     Event.FMicroThreadsLock.Acquire;
+    if Event.Signaled then begin
+      Result := wrSignaled;
+      Exit;
+    end;
     Event.FMicroThreads.Add(Self);
     FBlockTime := NowPrecise + Duration;
@@ -890 +912 @@
   FMainThreadManager.FScheduler := Self;
   UseMainThread := False;
-  BurstCount := 100;
+  BurstCount := 50;
 end;
 
@@ -984 +1006 @@
 begin
 //  try
-    Duration := 100 * OneMillisecond;
-    StartTime := NowPrecise;
+    FMainThreadOutsideDuration := NowPrecise - FMainThreadOutsideStart;
+    BurstCount := 1;
+    Duration := 50 * OneMillisecond;
+    StartTime := Now;
     Executed := -1;
-    while (Executed <> 0) and ((NowPrecise - StartTime) < Duration) do begin
+    while (Executed <> 0) and ((Now - StartTime) < Duration) do begin
       Executed := FMainThreadManager.Execute(BurstCount);
     end;
@@ -999 +1023 @@
 //    raise;
 //  end;
+  FMainThreadOutsideStart := NowPrecise;
 end;