Changeset 145 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 25, 2011, 8:51:57 PM (13 years ago)

Author:

george

Message:

• Modified: Yield method of micro thread manager now does'n accept micro thread as parameter and instead get current running micro thread from own field CurrentMicroThread.
• Fixed: Calculating high precision time on linux.

File:

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

MicroThreading/UMicroThreading.pas

@@ -96 +96 @@
     FStackPointer: Pointer;
     FBasePointer: Pointer;
-    FSelected: TMicroThread;
     FExecuteCount: Integer;
     FExecutedCount: Integer;
@@ -105 +104 @@
     Scheduler: TMicroThreadScheduler;
     CurrentMicroThread: TMicroThread;
-    procedure Yield(MicroThread: TMicroThread);
+    procedure Yield;
     constructor Create;
     destructor Destroy; override;
@@ -154 +153 @@
   StaticMicroThread: TMicroThread;
 
-  function GetMicroThreadId: Integer;
-  var
-    I: Integer;
-    CurrentStack: Pointer;
-  begin
-    asm
-      mov CurrentStack, sp
-    end;
-    with MainScheduler do begin
-      try
-        Lock.Acquire;
-        I := 0;
-        while (I < MicroThreads.Count) and
-          not ((CurrentStack >= TMicroThread(MicroThreads[I]).FStack) and
-          (CurrentStack <= (TMicroThread(MicroThreads[I]).FStack +
-          TMicroThread(MicroThreads[I]).FStackSize))) do Inc(I);
-        if I < MicroThreads.Count then begin
-          Result := TMicroThread(MicroThreads[I]).Id;
-        end else Result := -1;
-      finally
-        Lock.Release;
-      end;
-    end;
-  end;
+function GetMicroThreadId: Integer;
+var
+  I: Integer;
+  CurrentStack: Pointer;
+begin
+  asm
+    mov CurrentStack, sp
+  end;
+  with MainScheduler do begin
+    try
+      Lock.Acquire;
+      I := 0;
+      while (I < MicroThreads.Count) and
+        not ((CurrentStack >= TMicroThread(MicroThreads[I]).FStack) and
+        (CurrentStack <= (TMicroThread(MicroThreads[I]).FStack +
+        TMicroThread(MicroThreads[I]).FStackSize))) do Inc(I);
+      if I < MicroThreads.Count then begin
+        Result := TMicroThread(MicroThreads[I]).Id;
+      end else Result := -1;
+    finally
+      Lock.Release;
+    end;
+  end;
+end;
 
 { TMicroThreadManager }
@@ -187 +186 @@
   FExecuteCount := Count;
   FExecutedCount := 0;
-  Yield(nil);
+  Yield;
   Result := FExecutedCount;
 end;
 
-procedure TMicroThreadManager.Yield(MicroThread: TMicroThread);
+procedure TMicroThreadManager.Yield;
 var
   I: Integer;
@@ -197 +196 @@
 begin
   Time := Scheduler.GetNow;
-  if Assigned(MicroThread) then begin
-    MicroThread.Manager := nil;
-    MicroThread.FExecutionEndTime := Time;
-    MicroThread.FExecutionTime := MicroThread.FExecutionTime +
-      (MicroThread.FExecutionEndTime - MicroThread.FExecutionStartTime);
-    if MicroThread.State = tsRunning then
-      MicroThread.State := tsWaiting;
+  if Assigned(CurrentMicroThread) then begin
+    CurrentMicroThread.FExecutionEndTime := Time;
+    CurrentMicroThread.FExecutionTime := CurrentMicroThread.FExecutionTime +
+      (CurrentMicroThread.FExecutionEndTime - CurrentMicroThread.FExecutionStartTime);
+    if CurrentMicroThread.State = tsRunning then
+      CurrentMicroThread.State := tsWaiting;
+    StaticMicroThread := CurrentMicroThread;
     asm
       // Store microthread stack
-      mov eax, MicroThread
+      mov eax, StaticMicroThread
       mov edx, esp
       mov [eax].TMicroThread.FStackPointer, edx
@@ -212 +211 @@
       mov [eax].TMicroThread.FBasePointer, edx
     end;
-    StaticManager := MicroThread.Manager;
+    StaticManager := CurrentMicroThread.Manager;
     asm
       // Restore scheduler stack
@@ -221 +220 @@
       mov ebp, edx
     end;
+    CurrentMicroThread.Manager := nil;
     CurrentMicroThread := nil;
   end;
 
-  FSelected := Scheduler.GetNextMicroThread;
-
-  if Assigned(FSelected) and (FExecutedCount < FExecuteCount) then begin
-    FSelected.Manager := Self;
+  CurrentMicroThread := Scheduler.GetNextMicroThread;
+
+  if Assigned(CurrentMicroThread) and (FExecutedCount < FExecuteCount) then begin
+    CurrentMicroThread.Manager := Self;
     Inc(FExecutedCount);
-    CurrentMicroThread := FSelected;
     asm
       // Store scheduler stack
@@ -238 +237 @@
       mov [eax].TMicroThreadManager.FBasePointer, edx
     end;
-    if not FSelected.FExecuted then begin
-      FSelected.FExecuted := True;
-      FSelected.State := tsRunning;
-      FSelected.FExecutionStartTime := Time;
-      FTempPointer := FSelected.FStackPointer;
+    if not CurrentMicroThread.FExecuted then begin
+      CurrentMicroThread.FExecuted := True;
+      CurrentMicroThread.State := tsRunning;
+      CurrentMicroThread.FExecutionStartTime := Time;
+      StaticMicroThread := CurrentMicroThread;
       asm
         // Restore microthread stack
-        mov eax, Self
-        mov edx, [eax].TMicroThreadManager.FTempPointer
+        mov eax, StaticMicroThread
+        mov edx, [eax].TMicroThread.FStackPointer
         mov esp, edx
-      end;
-      StaticMicroThread := FSelected; // BP will be change and Self pointer will be invalid
-      FTempPointer := FSelected.FBasePointer;
-      asm
-        mov eax, Self
-        mov edx, [eax].TMicroThreadManager.FTempPointer
+        mov edx, [eax].TMicroThread.FBasePointer
         mov ebp, edx
       end;
@@ -267 +261 @@
         mov ebp, edx
       end;
-      FSelected.Manager := nil;
-      FSelected.FExecutionEndTime := Time;
-      FSelected.FExecutionTime := FSelected.FExecutionTime +
-       (FSelected.FExecutionEndTime - FSelected.FExecutionStartTime);
-      FSelected.FFinished := True;
-      if FSelected.FFreeOnTerminate then begin
-        FSelected.Free;
-      end;;
+      CurrentMicroThread.Manager := nil;
+      CurrentMicroThread.FExecutionEndTime := Time;
+      CurrentMicroThread.FExecutionTime := CurrentMicroThread.FExecutionTime +
+       (CurrentMicroThread.FExecutionEndTime - CurrentMicroThread.FExecutionStartTime);
+      CurrentMicroThread.FFinished := True;
+      if CurrentMicroThread.FFreeOnTerminate then begin
+        CurrentMicroThread.Free;
+      end;
+      CurrentMicroThread := nil;
     end else
-    if FSelected.State = tsWaiting then begin
+    if CurrentMicroThread.State = tsWaiting then begin
       // Execute selected thread
-      FSelected.State := tsRunning;
-      FSelected.FExecutionStartTime := Time;
-      FTempPointer := FSelected.FStackPointer;
+      CurrentMicroThread.State := tsRunning;
+      CurrentMicroThread.FExecutionStartTime := Time;
+      FTempPointer := CurrentMicroThread.FStackPointer;
       asm
         // Restore microthread stack
@@ -287 +282 @@
         mov esp, edx
       end;
-      FTempPointer := FSelected.FBasePointer;
+      FTempPointer := CurrentMicroThread.FBasePointer;
       asm
         mov eax, Self
@@ -294 +289 @@
       end;
     end;
+  end else begin
+    CurrentMicroThread := nil;
   end;
 end;
@@ -299 +296 @@
 constructor TMicroThreadManager.Create;
 begin
-
+  CurrentMicroThread := nil;
 end;
 
@@ -343 +340 @@
 procedure TMicroThread.Yield;
 begin
-  Manager.Yield(Self);
+  Manager.Yield;
 end;
 
@@ -430 +427 @@
   fpgettimeofday(@t, nil);
    // Build a 64 bit microsecond tick from the seconds and microsecond longints
-  Result := (Int64(t.tv_sec) * 1000000) + t.tv_usec;
+  Result := t.tv_sec + t.tv_usec / 1000000;
   {$ENDIF}