Changeset 170 for MicroThreading/UMicroThreading.pas

Timestamp:

Feb 21, 2011, 2:00:03 PM (14 years ago)

Author:

george

Message:

• Added: Support for logging critical section lifetime.
• Fixed: Wrong MicroThread registraction in WaitFor internal list.

File:

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

MicroThreading/UMicroThreading.pas

@@ -53 +53 @@
   TMicroThreadCriticalSection = class
   private
+    FId: Integer;
     FMicroThreads: TObjectList;
-    Lock: TCriticalSection;
+    //Lock: TCriticalSection;
     FCounter: Integer;
   public
@@ -61 +62 @@
     constructor Create;
     destructor Destroy; override;
+    property Id: Integer read FId;
   end;
 
@@ -208 +210 @@
     FThreadPoolSize: Integer;
     FRoundRobinIndex: Integer;
-    FLastId: Integer;
+    FMicroThreadLastId: Integer;
+    FCriticalSectionLastId: Integer;
     FMainThreadTerminated: Boolean;
     FMicroThreads: TObjectList; // TList<TMicroThread>
@@ -232 +235 @@
     procedure MainThreadStart(Sender: TObject);
     procedure MainThreadTick(Data: PtrInt);
+    function GetCriticalSectionId: Integer;
   public
     BurstCount: Integer;
     function Add(MicroThread: TMicroThread): Integer;
-    function AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean = True): Integer;
+    function AddMethod(Method: TProcedureOfObject;
+      WaitForFinish: Boolean = True; ThreadName: string = ''): Integer;
     procedure Remove(MicroThread: TMicroThread; Free: Boolean = True);
     constructor Create;
@@ -282 +287 @@
 const
   LogFileName: string = 'Log.txt';
+  LogEnabled: Boolean = False;
 
 implementation
@@ -350 +356 @@
   LogFile: TextFile;
 begin
+  if LogEnabled then
   try
     LogLock.Acquire;
@@ -373 +380 @@
   try
     MainScheduler.FMicroThreadsLock.Acquire;
-    Lock.Acquire;
+    {$IFDEF DebugCriticalSection}
+    Log('CriticalSection(' + IntToStr(FId) + ') Acquire start, MicroThread: ' + IntToStr(MT.Id) + '(' + MT.Name + ')');
+    {$ENDIF}
+    //Lock.Acquire;
     Inc(FCounter);
+    {$IFDEF DebugCriticalSection}
+    Log('CriticalSection(' + IntToStr(FId) + ') Acquire Counter: ' + IntToStr(FCounter));
+    {$ENDIF}
     if FCounter > 1 then begin
       FMicroThreads.Add(MT);
@@ -380 +393 @@
       MT.FStatePending := tsBlocked;
       try
-        Lock.Release;
+        //Lock.Release;
         MainScheduler.FMicroThreadsLock.Release;
         MT.Yield;
       finally
         MainScheduler.FMicroThreadsLock.Acquire;
-        Lock.Acquire;
+        //Lock.Acquire;
       end;
     end;
   finally
-    Lock.Release;
+    {$IFDEF DebugCriticalSection}
+    Log('CriticalSection(' + IntToStr(FId) + ') Acquire end: Id:' + IntToStr(MT.Id) + ' Name:' + MT.Name);
+    {$ENDIF}
+    //Lock.Release;
     MainScheduler.FMicroThreadsLock.Release;
   end else
@@ -396 +412 @@
 
 procedure TMicroThreadCriticalSection.Release;
+var
+  MT: TMicroThread;
 begin
   try
     MainScheduler.FMicroThreadsLock.Acquire;
-    Lock.Acquire;
+    {$IFDEF DebugCriticalSection}
+    MT := GetCurrentMicroThread;
+    if Assigned(MT) then
+      Log('CriticalSection(' + IntToStr(FId) + ') Release start: Id:' + IntToStr(MT.Id) + ' Name:' + MT.Name)
+      else Log('CriticalSection(' + IntToStr(FId) + ') Release start: no microthread');
+    {$ENDIF}
+    //Lock.Acquire;
     Dec(FCounter);
+    {$IFDEF DebugCriticalSection}
+    Log('CriticalSection(' + IntToStr(FId) + ') Release Counter: ' + IntToStr(FCounter));
+    {$ENDIF}
     if FMicroThreads.Count > 0 then begin
       // Release one waiting micro thread
@@ -410 +437 @@
       raise EMicroThreadError.Create(SCriticalSectionDecrement);
   finally
-    Lock.Release;
+    {$IFDEF DebugCriticalSection}
+    Log('CriticalSection(' + IntToStr(FId) + ') Release end: Id:' + IntToStr(MT.Id) + ' Name:' + MT.Name);
+    {$ENDIF}
+    //Lock.Release;
     MainScheduler.FMicroThreadsLock.Release;
   end;
@@ -417 +447 @@
 constructor TMicroThreadCriticalSection.Create;
 begin
-  Lock := TCriticalSection.Create;
+  //Lock := TCriticalSection.Create;
   FMicroThreads := TObjectList.Create;
   FMicroThreads.OwnsObjects := False;
+  FId := MainScheduler.GetCriticalSectionId;
 end;
 
@@ -426 +457 @@
   try
     MainScheduler.FMicroThreadsLock.Acquire;
-    Lock.Acquire;
+    //Lock.Acquire;
 
     while FMicroThreads.Count > 0 do begin
@@ -434 +465 @@
     end;
   finally
-    Lock.Release;
+    //Lock.Release;
     MainScheduler.FMicroThreadsLock.Release;
   end;
   FMicroThreads.Free;
-  Lock.Free;
+  //Lock.Free;
   inherited Destroy;
 end;
@@ -488 +519 @@
         Exit;
       end;
-      FMicroThreads.Add(Self);
+      FMicroThreads.Add(MT);
       MT.FBlockTime := NowPrecise + Duration;
       MT.FBlockState := tbsWaitFor;
@@ -798 +829 @@
 procedure TMicroThread.Yield;
 begin
-//  if not Assigned(FManager) then
-//    raise EMicroThreadError.Create(SManagerReferenceLost);
+  if not Assigned(FManager) then
+    raise EMicroThreadError.Create(SManagerReferenceLost);
   if FStatePending = tsNone then
     FStatePending := tsWaiting;
@@ -896 +927 @@
   try
     FMicroThreadsLock.Acquire;
-    Inc(FLastId);
+    Inc(FMicroThreadLastId);
+    MicroThread.FId := FMicroThreadLastId;
     MicroThread.FScheduler := Self;
-    MicroThread.FId := FLastId;
     Result := FMicroThreads.Add(MicroThread);
   finally
@@ -905 +936 @@
 end;
 
-function TMicroThreadScheduler.AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean): Integer;
+function TMicroThreadScheduler.AddMethod(Method: TProcedureOfObject;
+  WaitForFinish: Boolean = True; ThreadName: string = ''): Integer;
 var
   NewMicroThread: TMicroThreadSimple;
@@ -912 +944 @@
   try
     NewMicroThread := TMicroThreadSimple.Create(True);
+    NewMicroThread.Name := ThreadName;
     NewMicroThread.Method := Method;
     NewMicroThread.FScheduler := Self;
@@ -1083 +1116 @@
 //  end;
   FMainThreadOutsideStart := NowPrecise;
+end;
+
+function TMicroThreadScheduler.GetCriticalSectionId: Integer;
+begin
+  Inc(FCriticalSectionLastId);
+  Result := FCriticalSectionLastId;
 end;