Changeset 169

Timestamp:

Feb 11, 2011, 2:16:17 PM (14 years ago)

Author:

george

Message:

• Modified: Reducing some spare methods.

Location:

MicroThreading

Files:

• Demo/Demo.lpi (modified) (6 diffs)
• Demo/UMainForm.pas (modified) (1 diff)
• UMicroThreading.pas (modified) (11 diffs)

MicroThreading/Demo/Demo.lpi

@@ -59 +59 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <EditorIndex Value="13"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="393"/>
-        <CursorPos X="29" Y="406"/>
+        <EditorIndex Value="12"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="407"/>
+        <CursorPos X="54" Y="428"/>
         <UsageCount Value="270"/>
         <Loaded Value="True"/>
@@ -73 +73 @@
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="885"/>
-        <CursorPos X="1" Y="897"/>
+        <TopLine Value="449"/>
+        <CursorPos X="1" Y="462"/>
         <UsageCount Value="136"/>
         <Loaded Value="True"/>
@@ -241 +241 @@
         <Filename Value="../../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/packages/fcl-base/src/syncobjs.pp"/>
         <UnitName Value="syncobjs"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="11"/>
         <WindowIndex Value="0"/>
         <TopLine Value="35"/>
@@ -310 +310 @@
         <Filename Value="../UStackTrace.pas"/>
         <UnitName Value="UStackTrace"/>
-        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
         <TopLine Value="17"/>
         <CursorPos X="26" Y="122"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit31>
       <Unit32>
         <Filename Value="../../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/rtl/inc/systemh.inc"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
         <TopLine Value="974"/>
@@ -328 +326 @@
       <Unit33>
         <Filename Value="../../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/rtl/i386/i386.inc"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="10"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1135"/>
@@ -336 +334 @@
       </Unit33>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="14" HistoryIndex="13">
       <Position1>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="60" TopLine="63"/>
+        <Filename Value="../UMicroThreading.pas"/>
+        <Caret Line="854" Column="3" TopLine="847"/>
       </Position1>
       <Position2>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="17" TopLine="63"/>
+        <Filename Value="../UMicroThreading.pas"/>
+        <Caret Line="853" Column="41" TopLine="847"/>
       </Position2>
       <Position3>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="63" Column="27" TopLine="49"/>
+        <Filename Value="../UMicroThreading.pas"/>
+        <Caret Line="854" Column="1" TopLine="847"/>
       </Position3>
       <Position4>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="79" Column="32" TopLine="64"/>
+        <Filename Value="../UMicroThreading.pas"/>
+        <Caret Line="855" Column="1" TopLine="847"/>
       </Position4>
       <Position5>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="66" TopLine="61"/>
+        <Filename Value="../UMicroThreadCallStack.pas"/>
+        <Caret Line="67" Column="38" TopLine="46"/>
       </Position5>
       <Position6>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="1" TopLine="61"/>
+        <Filename Value="../UMicroThreadCallStack.pas"/>
+        <Caret Line="66" Column="19" TopLine="47"/>
       </Position6>
       <Position7>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="75" Column="1" TopLine="61"/>
+        <Filename Value="../UMicroThreadCallStack.pas"/>
+        <Caret Line="67" Column="14" TopLine="47"/>
       </Position7>
       <Position8>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="1" TopLine="61"/>
+        <Filename Value="../UMicroThreadCallStack.pas"/>
+        <Caret Line="66" Column="22" TopLine="44"/>
       </Position8>
       <Position9>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="1" TopLine="61"/>
+        <Filename Value="../UMicroThreadList.pas"/>
+        <Caret Line="138" Column="10" TopLine="121"/>
       </Position9>
       <Position10>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="75" Column="1" TopLine="61"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="428" Column="43" TopLine="411"/>
       </Position10>
       <Position11>
-        <Filename Value="../UMicroThreading.pas"/>
-        <Caret Line="854" Column="3" TopLine="847"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="116" Column="33" TopLine="103"/>
       </Position11>
       <Position12>
-        <Filename Value="../UMicroThreading.pas"/>
-        <Caret Line="853" Column="41" TopLine="847"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="305" Column="44" TopLine="284"/>
       </Position12>
       <Position13>
-        <Filename Value="../UMicroThreading.pas"/>
-        <Caret Line="854" Column="1" TopLine="847"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="399" Column="54" TopLine="378"/>
       </Position13>
       <Position14>
-        <Filename Value="../UMicroThreading.pas"/>
-        <Caret Line="855" Column="1" TopLine="847"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="428" Column="54" TopLine="407"/>
       </Position14>
-      <Position15>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="1" TopLine="61"/>
-      </Position15>
-      <Position16>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="75" Column="1" TopLine="61"/>
-      </Position16>
-      <Position17>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="1" TopLine="61"/>
-      </Position17>
-      <Position18>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="1" TopLine="61"/>
-      </Position18>
-      <Position19>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="75" Column="50" TopLine="61"/>
-      </Position19>
-      <Position20>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="74" Column="45" TopLine="61"/>
-      </Position20>
-      <Position21>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="73" Column="29" TopLine="61"/>
-      </Position21>
-      <Position22>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="1" TopLine="61"/>
-      </Position22>
-      <Position23>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="91" Column="1" TopLine="78"/>
-      </Position23>
-      <Position24>
-        <Filename Value="../UMicroThreadCallStack.pas"/>
-        <Caret Line="67" Column="38" TopLine="46"/>
-      </Position24>
-      <Position25>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="76" Column="1" TopLine="63"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../UStackTrace.pas"/>
-        <Caret Line="78" Column="1" TopLine="63"/>
-      </Position26>
-      <Position27>
-        <Filename Value="../UMicroThreadCallStack.pas"/>
-        <Caret Line="66" Column="19" TopLine="47"/>
-      </Position27>
-      <Position28>
-        <Filename Value="../UMicroThreadCallStack.pas"/>
-        <Caret Line="67" Column="14" TopLine="47"/>
-      </Position28>
-      <Position29>
-        <Filename Value="../UMicroThreadCallStack.pas"/>
-        <Caret Line="66" Column="22" TopLine="44"/>
-      </Position29>
-      <Position30>
-        <Filename Value="../UMicroThreadList.pas"/>
-        <Caret Line="138" Column="10" TopLine="121"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>

MicroThreading/Demo/UMainForm.pas

@@ -303 +303 @@
 procedure TMainForm.CheckBox4Change(Sender: TObject);
 begin
-  CriticalSectionSleepDuration := SpinEdit4.Value;
+  CriticalSectionSleepDuration := SpinEdit6.Value;
   DoCriticalSection := CheckBox4.Checked;
 end;

MicroThreading/UMicroThreading.pas

@@ -35 +35 @@
   SReleaseNotAcquiredLock = 'Release on not acquired lock';
   SMethodNotAssigned = 'Method for microthread not assigned';
+  SCriticalSectionDecrement = 'Critical section counter decremented to negative number';
 
 
@@ -117 +118 @@
     procedure Yield;
     procedure MTSleep(Duration: TDateTime); // No conflicting name to global Sleep procedure
-    procedure WaitForCriticalSection(CriticalSection: TMicroThreadCriticalSection);
-    function WaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
     procedure WaitFor;
     procedure Terminate;
@@ -236 +235 @@
     BurstCount: Integer;
     function Add(MicroThread: TMicroThread): Integer;
-    function AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean = False): Integer;
+    function AddMethod(Method: TProcedureOfObject; WaitForFinish: Boolean = True): Integer;
     procedure Remove(MicroThread: TMicroThread; Free: Boolean = True);
     constructor Create;
@@ -278 +277 @@
 procedure MTSleep(Duration: TDateTime);
 procedure MTSynchronize(Method: TThreadMethod);
-function MTWaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
 procedure Log(Text: string);
 procedure Register;
@@ -345 +343 @@
 end;
 
-function MTWaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
-var
-  MT: TMicroThread;
-begin
-  MT := GetCurrentMicroThread;
-  if Assigned(MT) then Result := MT.WaitForEvent(Event, Duration)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
-end;
-
 var
   LogLock: TCriticalSection;
@@ -381 +370 @@
 begin
   MT := GetCurrentMicroThread;
-  if Assigned(MT) then MT.WaitForCriticalSection(Self)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
+  if Assigned(MT) then
+  try
+    MainScheduler.FMicroThreadsLock.Acquire;
+    Lock.Acquire;
+    Inc(FCounter);
+    if FCounter > 1 then begin
+      FMicroThreads.Add(MT);
+      MT.FBlockState := tbsCriticalSection;
+      MT.FStatePending := tsBlocked;
+      try
+        Lock.Release;
+        MainScheduler.FMicroThreadsLock.Release;
+        MT.Yield;
+      finally
+        MainScheduler.FMicroThreadsLock.Acquire;
+        Lock.Acquire;
+      end;
+    end;
+  finally
+    Lock.Release;
+    MainScheduler.FMicroThreadsLock.Release;
+  end else
+    raise EMicroThreadError.Create(SNotInMicroThread);
 end;
 
@@ -394 +404 @@
       // Release one waiting micro thread
       TMicroThread(FMicroThreads[0]).FState := tsWaiting;
+      TMicroThread(FMicroThreads[0]).FStatePending := tsNone;
       FMicroThreads.Delete(0);
     end;
+    if FCounter < 0 then
+      raise EMicroThreadError.Create(SCriticalSectionDecrement);
   finally
     Lock.Release;
@@ -468 +481 @@
 begin
   MT := GetCurrentMicroThread;
-  if Assigned(MT) then Result := MT.WaitForEvent(Self, Duration)
-    else raise EMicroThreadError.Create(SNotInMicroThread);
+  if Assigned(MT) then begin
+    try
+      FMicroThreadsLock.Acquire;
+      if Signaled then begin
+        Result := wrSignaled;
+        Exit;
+      end;
+      FMicroThreads.Add(Self);
+      MT.FBlockTime := NowPrecise + Duration;
+      MT.FBlockState := tbsWaitFor;
+      MT.FStatePending := tsBlocked;
+    finally
+      FMicroThreadsLock.Release;
+    end;
+    MT.Yield;
+    if (MT.FBlockTime <> 0) and (MT.FBlockTime < NowPrecise) then
+      Result := wrTimeout else Result := wrSignaled;
+
+    try
+      FMicroThreadsLock.Acquire;
+      FMicroThreads.Remove(Self);
+    finally
+      FMicroThreadsLock.Release;
+    end
+  end else
+    raise EMicroThreadError.Create(SNotInMicroThread);
 end;
 
@@ -773 +810 @@
     // Called from another microthread
     while not ((FState = tsBlocked) and (FBlockState = tbsTerminated)) do begin
-      MTSleep(1);
+      MTSleep(1 * OneMillisecond);
     end;
   end else begin
@@ -792 +829 @@
 end;
 
-procedure TMicroThread.WaitForCriticalSection(
-  CriticalSection: TMicroThreadCriticalSection);
-begin
-  try
-    FScheduler.FMicroThreadsLock.Acquire;
-    CriticalSection.Lock.Acquire;
-    Inc(CriticalSection.FCounter);
-    if CriticalSection.FCounter > 1 then begin
-      CriticalSection.FMicroThreads.Add(Self);
-      FBlockState := tbsCriticalSection;
-      FStatePending := tsBlocked;
-      try
-        CriticalSection.Lock.Release;
-        FScheduler.FMicroThreadsLock.Release;
-        Yield;
-      finally
-        FScheduler.FMicroThreadsLock.Acquire;
-        CriticalSection.Lock.Acquire;
-      end;
-    end;
-  finally
-    CriticalSection.Lock.Release;
-    FScheduler.FMicroThreadsLock.Release;
-  end;
-end;
-
-function TMicroThread.WaitForEvent(Event: TMicroThreadEvent; Duration: TDateTime): TWaitResult;
-begin
-  try
-    Event.FMicroThreadsLock.Acquire;
-    if Event.Signaled then begin
-      Result := wrSignaled;
-      Exit;
-    end;
-    Event.FMicroThreads.Add(Self);
-    FBlockTime := NowPrecise + Duration;
-    FBlockState := tbsWaitFor;
-    FStatePending := tsBlocked;
-  finally
-    Event.FMicroThreadsLock.Release;
-  end;
-  Yield;
-  if (FBlockTime <> 0) and (FBlockTime < NowPrecise) then Result := wrTimeout
-    else Result := wrSignaled;
-
-  try
-    Event.FMicroThreadsLock.Acquire;
-    Event.FMicroThreads.Remove(Self);
-  finally
-    Event.FMicroThreadsLock.Release;
-  end;
-end;
-
 constructor TMicroThread.Create(CreateSuspended: Boolean;
   const StackSize: SizeUInt = DefaultStackSize);
@@ -851 +835 @@
   FStackSize := StackSize;
   FStack := GetMem(FStackSize);
-  FBasePointer := FStack + FStackSize - SizeOf(Pointer);
-  FStackPointer := FBasePointer - SizeOf(Pointer);
+  FBasePointer := 0; // FStack + FStackSize - SizeOf(Pointer);
+  FStackPointer := FStack + FStackSize - 2 * SizeOf(Pointer);
   FillChar(FStackPointer^, 2 * SizeOf(Pointer), 0);