Changeset 315 for trunk/Packages/Common/Pool.pas

Timestamp:

Jun 19, 2024, 11:15:44 PM (4 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.

File:

• trunk/Packages/Common/Pool.pas (moved) (moved from trunk/Packages/Common/UPool.pas ) (10 diffs)

trunk/Packages/Common/Pool.pas

@@ -1 @@
-unit UPool;
-
-{$mode Delphi}{$H+}
+unit Pool;
 
 interface
 
 uses
-  Classes, SysUtils, syncobjs, fgl, UThreading;
+  Classes, SysUtils, syncobjs, Generics.Collections, Threading;
 
 type
@@ -22 +20 @@
     function NewItemObject: TObject; virtual;
   public
-    Items: TFPGObjectList<TObject>;
-    FreeItems: TFPGObjectList<TObject>;
+    Items: TObjectList<TObject>;
+    FreeItems: TObjectList<TObject>;
     function Acquire: TObject; virtual;
     procedure Release(Item: TObject); virtual;
@@ -59 +57 @@
   try
     Lock.Acquire;
-    inherited SetTotalCount(AValue);
+    inherited;
   finally
     Lock.Release;
@@ -69 +67 @@
   try
     Lock.Acquire;
-    Result := inherited GetUsedCount;
+    Result := inherited;
   finally
     Lock.Release;
@@ -90 +88 @@
       end;
     end;
-    Result := inherited Acquire;
+    Result := inherited;
   finally
     Lock.Release;
@@ -100 +98 @@
   try
     Lock.Acquire;
-    inherited Release(Item);
+    inherited;
   finally
     Lock.Release;
@@ -108 +106 @@
 constructor TThreadedPool.Create;
 begin
-  inherited Create;
+  inherited;
   Lock := TCriticalSection.Create;
 end;
@@ -115 +113 @@
 begin
   TotalCount := 0;
-  Lock.Free;
-  inherited Destroy;
+  FreeAndNil(Lock);
+  inherited;
 end;
 
@@ -185 +183 @@
 begin
   inherited;
-  Items := TFPGObjectList<TObject>.Create;
-  FreeItems := TFPGObjectList<TObject>.Create;
-  FreeItems.FreeObjects := False;
+  Items := TObjectList<TObject>.Create;
+  FreeItems := TObjectList<TObject>.Create;
+  FreeItems.OwnsObjects := False;
   FReleaseEvent := TEvent.Create(nil, False, False, '');
 end;
@@ -201 +199 @@
 
 end.
-