Changeset 158 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 28, 2011, 9:10:16 PM (14 years ago)

Author:

george

Message:

• Fixed: WaitForEvent functionality. Now TEvent.WaitFor will chane microthread to blocked state with defined timeout. TEvent.SetSignal method will unblock all waiting microthreads.

File:

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

MicroThreading/UMicroThreading.pas

@@ -178 +178 @@
     FUseMainThread: Boolean;
     FMainThreadStarter: TTimer;
+    FEvents: TObjectList;
     function GetMicroThreadCount: Integer;
     function GetThreadPoolCount: Integer;
@@ -322 +323 @@
   I: Integer;
 begin
-  for I := 0 to FMicroThreads.Count - 1 do
-    TMicroThread(FMicroThreads[I]).FStatePending := tsWaiting;
-  if not FAutoReset then FSignaled := True;
+  try
+    MainScheduler.FMicroThreadsLock.Acquire;
+    for I := 0 to FMicroThreads.Count - 1 do
+    with TMicroThread(FMicroThreads[I]) do begin
+      if (FState = tsBlocked) and (FBlockState = tbsWaitFor) then
+        FState := tsWaiting;
+    end;
+    if not FAutoReset then FSignaled := True;
+  finally
+    MainScheduler.FMicroThreadsLock.Release;
+  end;
 end;
 
@@ -342 +351 @@
 constructor TMicroThreadEvent.Create;
 begin
+  FAutoReset := True;
   FMicroThreads := TObjectList.Create;
   FMicroThreads.OwnsObjects := False;
   FMicroThreadsLock := TCriticalSection.Create;
+  MainScheduler.FEvents.Add(Self);
 end;
 
 destructor TMicroThreadEvent.Destroy;
 begin
+  MainScheduler.FEvents.Delete(MainScheduler.FEvents.IndexOf(Self));
   FMicroThreadsLock.Free;
   FMicroThreads.Free;
@@ -399 +411 @@
     end;
     FCurrentMicroThread.CheckStack;
-    if FCurrentMicroThread = nil then
-      raise Exception.Create('x');
     FScheduler.ReleaseMicroThread(FCurrentMicroThread);
   end;
@@ -588 +598 @@
   if not Assigned(FManager) then
     raise Exception.Create('Manager reference lost');
-  FStatePending := tsWaiting;
+  if FStatePending = tsNone then
+    FStatePending := tsWaiting;
   FManager.Yield;
 end;
@@ -613 +624 @@
     Event.FMicroThreadsLock.Acquire;
     Event.FMicroThreads.Add(Self);
+    FBlockTime := NowPrecise + Duration;
+    FBlockState := tbsWaitFor;
+    FStatePending := tsBlocked;
   finally
     Event.FMicroThreadsLock.Release;
   end;
-  FBlockTime := NowPrecise + Duration;
-  FBlockState := tbsWaitFor;
-  FStatePending := tsBlocked;
   Yield;
   try
@@ -642 +653 @@
   end;
   FFreeOnTerminate := True;
+  MainScheduler.Add(Self);
 end;
 
@@ -718 +730 @@
 constructor TMicroThreadScheduler.Create;
 begin
+  FEvents := TObjectList.Create;
   FMainThreadStarter := TTimer.Create(nil);
   FMainThreadStarter.Enabled := False;
@@ -742 +755 @@
   FMicroThreads.Free;
   FMicroThreadsLock.Free;
+  FEvents.Free;
   inherited Destroy;
 end;
@@ -878 +892 @@
 begin
   if not Assigned(MicroThread) then
-    raise Exception.Create('Can''t realease nil thread.');
+    raise Exception.Create('Can''t release nil thread.');
   try
     FMicroThreadsLock.Acquire;