Changeset 151 for MicroThreading/UMicroThreading.pas

Timestamp:

Jan 27, 2011, 8:05:33 AM (14 years ago)

Author:

george

Message:

• Modified: Elimination of global variables used by TMicroThreadManager Yield method.

File:

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

MicroThreading/UMicroThreading.pas

@@ -52 +52 @@
     FManager: TMicroThreadManager;
     FId: Integer;
+    procedure CallExecute;
     function GetStackUsed: Integer;
+    procedure SetScheduler(const AValue: TMicroThreadScheduler);
   public
     Name: string;
@@ -77 +79 @@
       write FFreeOnTerminate;
     property Terminated: Boolean read FTerminated;
-    property Scheduler: TMicroThreadScheduler read FScheduler;
+    property Scheduler: TMicroThreadScheduler read FScheduler
+      write SetScheduler;
     property Manager: TMicroThreadManager read FManager;
     property StackUsed: Integer read GetStackUsed;
@@ -112 +115 @@
     FExecutedCount: Integer;
     FTerminated: Boolean;
-    FTempPointer: Pointer;
     FCurrentMicroThread: TMicroThread;
     FScheduler: TMicroThreadScheduler;
@@ -177 +179 @@
 implementation
 
-var
-  StaticManagers: TObjectList; // TList<TMicroThreadManager>;
-  StaticManager: TMicroThreadManager;
-  StaticMicroThread: TMicroThread;
+//var
+//  StaticManagers: TObjectList; // TList<TMicroThreadManager>;
+//  StaticManager: TMicroThreadManager;
+//  StaticMicroThread: TMicroThread;
 
 function GetMicroThreadId: Integer;
@@ -231 +233 @@
     if FCurrentMicroThread.FState = tsRunning then
       FCurrentMicroThread.FState := tsWaiting;
-    StaticMicroThread := FCurrentMicroThread;
     asm
       // Store microthread stack
-      mov eax, StaticMicroThread
+      mov ecx, Self
+      mov eax, [ecx].TMicroThreadManager.FCurrentMicroThread
       mov edx, esp
       mov [eax].TMicroThread.FStackPointer, edx
       mov edx, ebp
       mov [eax].TMicroThread.FBasePointer, edx
-    end;
-    StaticManager := FCurrentMicroThread.FManager;
-    asm
+
       // Restore FScheduler stack
-      mov eax, StaticManager  // Self is invalid before BP restore
-      mov edx, [eax].TMicroThreadManager.FStackPointer
+      mov edx, [ecx].TMicroThreadManager.FStackPointer
       mov esp, edx
-      mov edx, [eax].TMicroThreadManager.FBasePointer
+      mov edx, [ecx].TMicroThreadManager.FBasePointer
       mov ebp, edx
     end;
@@ -270 +269 @@
       FCurrentMicroThread.FState := tsRunning;
       FCurrentMicroThread.FExecutionStartTime := CurrentTime;
-      StaticMicroThread := FCurrentMicroThread;
       asm
         // Restore microthread stack
-        mov eax, StaticMicroThread
+        mov ecx, Self
+        mov eax, [ecx].TMicroThreadManager.FCurrentMicroThread
         mov edx, [eax].TMicroThread.FStackPointer
         mov ecx, esp
@@ -281 +280 @@
         mov edx, [eax].TMicroThread.FBasePointer
         mov ebp, edx
-      end;
-      StaticMicroThread.Execute;
-      asm
+        // We want to call virtual method Execute
+        // but virtual methods can be called only statically
+        // Then static method CallExecute is calling virtual method Execute
+        call TMicroThread.CallExecute
+//      end;
+//      StaticMicroThread.Execute;
+//      asm
         pop edx
         pop ebp
@@ -320 +323 @@
       FCurrentMicroThread.FState := tsRunning;
       FCurrentMicroThread.FExecutionStartTime := CurrentTime;
-      FTempPointer := FCurrentMicroThread.FStackPointer;
       asm
         // Restore microthread stack
-        mov eax, Self
-        mov edx, [eax].TMicroThreadManager.FTempPointer
+        mov ecx, Self
+        mov eax, [ecx].TMicroThreadManager.FCurrentMicroThread
+        mov edx, [eax].TMicroThread.FStackPointer
         mov esp, edx
-      end;
-      FTempPointer := FCurrentMicroThread.FBasePointer;
-      asm
-        mov eax, Self
-        mov edx, [eax].TMicroThreadManager.FTempPointer
+        mov edx, [eax].TMicroThread.FBasePointer
         mov ebp, edx
       end;
@@ -391 +390 @@
 { TMicroThread }
 
+procedure TMicroThread.CallExecute;
+begin
+  Execute;
+end;
+
 function TMicroThread.GetStackUsed: Integer;
 begin
   Result := FStack + FStackSize - FStackPointer;
+end;
+
+procedure TMicroThread.SetScheduler(const AValue: TMicroThreadScheduler);
+begin
+  FScheduler := AValue;
 end;
 
@@ -435 +444 @@
   FStack := GetMem(FStackSize);
   FBasePointer := FStack + FStackSize;
-  FStackPointer := FBasePointer - 20;
+  FStackPointer := FBasePointer - SizeOf(Pointer);
   FExecutionTime := 0;
   FTerminated := False;
@@ -676 +685 @@
 initialization
 
-StaticManagers := TObjectList.Create;
+//StaticManagers := TObjectList.Create;
 MainScheduler := TMicroThreadScheduler.Create;
 
@@ -682 +691 @@
 
 MainScheduler.Free;
-StaticManagers.Free;
+//StaticManagers.Free;
 
 end.