Changeset 140 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 24, 2011, 8:39:52 AM (14 years ago)

Author:

george

Message:

• Fixed: Execution time measurement.
• Modified: MicroThread state list changed to virtual list.

File:

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

MicroThreading/UMicroThreading.pas

@@ -1 +1 @@
 unit UMicroThreading;
 
-{$mode objfpc}{$H+}
+{$mode Delphi}{$H+}
 {$asmmode intel}
 
@@ -7 +7 @@
 
 uses
-  Classes, SysUtils, Contnrs, SyncObjs, DateUtils,
-  BaseUnix, UnixUtil, Unix;
+  {$IFDEF Windows}Windows,{$ENDIF}
+  {$IFDEF Linux}BaseUnix, UnixUtil, Unix,{$ENDIF}
+  Classes, SysUtils, Contnrs, SyncObjs, DateUtils, Dialogs;
 
 type
@@ -15 +16 @@
 
   TStartEvent = procedure(MicroThread: TMicroThread) of object;
-
-  TCallerAddr = packed record
-    case Boolean of
-      True: (A: TStartEvent;);
-      False: (B, C: Pointer;);
-  end;
 
   TMicroThreadState = (tsReady, tsRunning, tsWaiting, tsBlocked, tsSuspended,
@@ -68 +63 @@
     FSelected: TMicroThread;
     FTempPointer: Pointer;
+    FFrequency: Int64;
+    FExecuteCount: Integer;
+    FExecutedCount: Integer;
     function GetMicroThreadCount: Integer;
     procedure Yield(MicroThread: TMicroThread);
@@ -73 +71 @@
     MicroThreads: TObjectList; // TList<TMicroThread>
     Lock: TCriticalSection;
+    function GetNow: TDateTime;
     function Add(Name: string; Method: TStartEvent): TMicroThread;
     constructor Create;
     destructor Destroy; override;
-    procedure Start;
+    function Execute(Count: Integer): Integer;
     property MicroThreadCount: Integer read GetMicroThreadCount;
     property FreeMicroThreadOnFinish: Boolean read FFreeMicroThreadOnFinish
@@ -89 +88 @@
 
 
-function SystemTicks: Int64;
-{$IFDEF Windows}
-begin
-  QueryPerformanceCounter(Result);
-  //Result := Int64(TimeStampToMSecs(DateTimeToTimeStamp(Now)) * 1000) // an alternative Win32 timebase
-{$ELSE}
-var t : timeval;
-begin
-  fpgettimeofday(@t,nil);
-   // Build a 64 bit microsecond tick from the seconds and microsecond longints
-  Result := (Int64(t.tv_sec) * 1000000) + t.tv_usec;
-{$ENDIF}
-end;
-
-
 { TMicroThread }
 
@@ -113 +97 @@
 procedure TMicroThread.Sleep(Duration: TDateTime);
 begin
-  FWakeUpTime := Now + Duration;
+  FWakeUpTime := Scheduler.GetNow + Duration;
   State := tsSleeping;
   Yield;
@@ -124 +108 @@
   FBasePointer := FStack + FStackSize;
   FStackPointer := FBasePointer - 20;
+  FExecutionTime := 0;
 end;
 
@@ -132 +117 @@
 end;
 
+
 { TMicroThreadScheduler }
+
+function TMicroThreadScheduler.GetNow: TDateTime;
+var
+  {$IFDEF Linux}T: TimeVal;{$ENDIF}
+  {$IFDEF Windows}TimerValue: Int64;{$ENDIF}
+begin
+  {$IFDEF Windows}
+  QueryPerformanceCounter(TimerValue);
+  //Result := Int64(TimeStampToMSecs(DateTimeToTimeStamp(Now)) * 1000) // an alternative Win32 timebase
+  Result := TimerValue / FFrequency;
+  {$ENDIF}
+  {$IFDEF Linux}
+  fpgettimeofday(@t, nil);
+   // Build a 64 bit microsecond tick from the seconds and microsecond longints
+  Result := (Int64(t.tv_sec) * 1000000) + t.tv_usec;
+  {$ENDIF}
+
+  Result := (Trunc(Now / OneSecond) + Frac(Result)) * OneSecond;
+end;
 
 function TMicroThreadScheduler.Add(Name: string; Method: TStartEvent
@@ -154 +159 @@
   ThreadPool := TThreadPool.Create;
   FFreeMicroThreadOnFinish := True;
+  {$IFDEF Windows}
+  QueryPerformanceFrequency(FFrequency);
+  {$ENDIF}
+  RoundRobinIndex := -1;
 end;
 
@@ -164 +173 @@
 end;
 
-procedure TMicroThreadScheduler.Start;
-begin
-  RoundRobinIndex := -1;
+function TMicroThreadScheduler.Execute(Count: Integer): Integer;
+begin
+  FExecuteCount := Count;
+  FExecutedCount := 0;
   Yield(nil);
+  Result := FExecutedCount;
 end;
 
@@ -177 +188 @@
 var
   I: Integer;
-begin
+  Time: TDateTime;
+begin
+  Time := GetNow;
   if Assigned(MicroThread) then begin
-    MicroThread.FExecutionEndTime := Now;
+    MicroThread.FExecutionEndTime := Time;
     MicroThread.FExecutionTime := MicroThread.FExecutionTime +
       (MicroThread.FExecutionEndTime - MicroThread.FExecutionStartTime);
@@ -215 +228 @@
       // WakeUp sleeping threads
       if (TMicroThread(MicroThreads[RoundRobinIndex]).State = tsSleeping) and
-        (TMicroThread(MicroThreads[RoundRobinIndex]).FWakeupTime < Now) then
+        (TMicroThread(MicroThreads[RoundRobinIndex]).FWakeupTime < Time) then
           TMicroThread(MicroThreads[RoundRobinIndex]).State := tsWaiting else
       begin
@@ -232 +245 @@
   end;
 
-  if Assigned(FSelected) then begin
+  if Assigned(FSelected) and (FExecutedCount < FExecuteCount) then begin
+    Inc(FExecutedCount);
     asm
       // Store scheduler stack
@@ -243 +257 @@
     if FSelected.State = tsReady then begin
       FSelected.State := tsRunning;
-      FSelected.FExecutionStartTime := Now;
+      FSelected.FExecutionStartTime := Time;
       FTempPointer := FSelected.FStackPointer;
       asm
@@ -269 +283 @@
         mov ebp, edx
       end;
+      FSelected.FExecutionEndTime := Time;
+      FSelected.FExecutionTime := FSelected.FExecutionTime +
+       (FSelected.FExecutionEndTime - FSelected.FExecutionStartTime);
       if FFreeMicroThreadOnFinish then begin
         // Microthread is finished, remove it from queue
@@ -282 +299 @@
       // Execute selected thread
       FSelected.State := tsRunning;
-      FSelected.FExecutionStartTime := Now;
+      FSelected.FExecutionStartTime := Time;
       FTempPointer := FSelected.FStackPointer;
       asm