Changeset 9 for branches/ByteArray/Devices/Storage.pas

Timestamp:

Aug 6, 2024, 10:31:16 PM (2 months ago)

Author:

chronos

Message:

• Modified: Optimized DeviceMapper read/write handlers calls without case statement.
• Modified: Use TInt as base data type which can be redefined to different higher integer type. For start it is Int64.

Location:

branches/ByteArray

Files:

• . (modified) (1 prop)
• Devices/Storage.pas (modified) (4 diffs)

branches/ByteArray/Devices/Storage.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, Channel, BigInt;
+  Classes, SysUtils, Device, Channel, Int;
 
 type
@@ -19 +19 @@
     FFile: TFileStream;
     Position: Integer;
-    function ReadByte(Address: TBigInt): Byte;
-    function Read(Address: TBigInt; Size: TBigIntSize): TBigInt;
-    procedure Write(Address: TBigInt; Size: TBigIntSize; Value: TBigInt);
-    function GetAddressCount: Integer; override;
-    procedure SetChannel(Channel: TChannel); override;
+    function ReadByte(Address: TInt): Byte;
+    function ReadData(Size: TIntSize): TInt;
+    function ReadPosition(Size: TIntSize): TInt;
+    function ReadSize(Size: TIntSize): TInt;
+    procedure WriteData(Size: TIntSize; Value: TInt);
+    procedure WritePosition(Size: TIntSize; Value: TInt);
+    procedure WriteSize(Size: TIntSize; Value: TInt);
+    function GetHandlers: THandlers; override;
     constructor Create;
     destructor Destroy; override;
@@ -56 +59 @@
 end;
 
-function TStorage.ReadByte(Address: TBigInt): Byte;
+function TStorage.ReadByte(Address: TInt): Byte;
 begin
   Result := 0;
@@ -63 +66 @@
 end;
 
-function TStorage.Read(Address: TBigInt; Size: TBigIntSize): TBigInt;
-var
-  Buffer: array of Byte;
+function TStorage.ReadData(Size: TIntSize): TInt;
 begin
-  case Integer(Address) of
-    0: begin
-      SetLength(Buffer, Size);
-      FFile.Position := Position;
-      FFile.Read(Buffer[0], Size);
-      Result.SetByteArray(Buffer, Size);
-      Inc(Position, Size);
-    end;
-    1: Result := Position;
-    2: Result := FFile.Size;
-  end;
+  FFile.Position := Position;
+  FFile.Read(Result, Size);
+  Inc(Position, Size);
 end;
 
-procedure TStorage.Write(Address: TBigInt; Size: TBigIntSize; Value: TBigInt);
-var
-  Buffer: array of Byte;
+function TStorage.ReadPosition(Size: TIntSize): TInt;
 begin
-  case Integer(Address) of
-    0: begin
-      SetLength(Buffer, Size);
-      Value.GetByteArray(Buffer, Size);
-      FFile.Position := Position;
-      FFile.Write(Buffer[1], Size);
-      Inc(Position, Size);
-    end;
-    1: Position := Value;
-    2: FFile.Size := Value;
-  end;
+  Result := Position;
 end;
 
-function TStorage.GetAddressCount: Integer;
+function TStorage.ReadSize(Size: TIntSize): TInt;
 begin
-  Result := 3;
+  Result := FFile.Size;
 end;
 
-procedure TStorage.SetChannel(Channel: TChannel);
+procedure TStorage.WriteData(Size: TIntSize; Value: TInt);
 begin
-  Channel.Read := Read;
-  Channel.Write := Write;
+  FFile.Position := Position;
+  FFile.Write(Value, Size);
+  Inc(Position, Size);
+end;
+
+procedure TStorage.WritePosition(Size: TIntSize; Value: TInt);
+begin
+  Position := Value;
+end;
+
+procedure TStorage.WriteSize(Size: TIntSize; Value: TInt);
+begin
+  FFile.Size := Value;
+end;
+function TStorage.GetHandlers: THandlers;
+begin
+  Result := THandlers.Create;
+  Result.ReadHandlers.Add(ReadData);
+  Result.ReadHandlers.Add(ReadPosition);
+  Result.ReadHandlers.Add(ReadSize);
+  Result.WriteHandlers.Add(WriteData);
+  Result.WriteHandlers.Add(WritePosition);
+  Result.WriteHandlers.Add(WriteSize);
 end;