Changeset 31 for trunk

Timestamp:

Apr 30, 2016, 12:16:19 AM (9 years ago)

Author:

chronos

Message:

• Added: TFileStreamEx experimental class to support flags O_DIRECT and O_SYNC under Linux.

Location:

trunk

Files:

• CoolDisk.lpi (modified) (2 diffs)
• CoolDisk.lpr (modified) (1 diff)
• Form/UFormMain.lfm (modified) (10 diffs)
• Form/UFormMain.pas (modified) (1 diff)
• Form/UFormProject.lfm (modified) (2 diffs)
• Form/UFormProject.pas (modified) (4 diffs)
• Packages/Common/UPrefixMultiplier.pas (modified) (1 diff)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (1 diff)
• UDriveScan.pas (modified) (6 diffs)
• UFileStreamEx.pas (added)

trunk/CoolDisk.lpi

@@ -85 +85 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="11">
+    <Units Count="12">
       <Unit0>
         <Filename Value="CoolDisk.lpr"/>
@@ -145 +145 @@
         <ResourceBaseClass Value="DataModule"/>
       </Unit10>
+      <Unit11>
+        <Filename Value="UFileStreamEx.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit11>
     </Units>
   </ProjectOptions>

trunk/CoolDisk.lpr

@@ -10 +10 @@
   Forms, tachartlazaruspkg, UFormBenchmark, UProject,
   UConfig, UBlockMap, UDriveScan, Common, TemplateGenerics, UFormOperation,
-  UFormProject, UFormMain, UPhysDrive, UCore;
+  UFormProject, UFormMain, UPhysDrive, UCore, UFileStreamEx;
 
 {$R *.res}

trunk/Form/UFormMain.lfm

@@ -62 +62 @@
         Height = 24
         Top = 179
-        Width = 101
+        Width = 96
         Caption = 'Sector size:'
         ParentColor = False
@@ -86 +86 @@
         Height = 24
         Top = 208
-        Width = 119
+        Width = 113
         Caption = 'Sector count:'
         ParentColor = False
@@ -102 +102 @@
         Height = 24
         Top = 240
-        Width = 136
+        Width = 127
         Caption = 'Current sector:'
         ParentColor = False
@@ -110 +110 @@
         Height = 24
         Top = 272
-        Width = 162
+        Width = 154
         Caption = 'Damaged sectors:'
         ParentColor = False
@@ -126 +126 @@
         Height = 24
         Top = 300
-        Width = 122
+        Width = 115
         Caption = 'Elapsed time:'
         ParentColor = False
@@ -142 +142 @@
         Height = 24
         Top = 328
-        Width = 142
+        Width = 135
         Caption = 'Estimated time:'
         ParentColor = False
@@ -158 +158 @@
         Height = 24
         Top = 148
-        Width = 160
+        Width = 153
         Caption = 'Sectors per Block:'
         ParentColor = False
@@ -182 +182 @@
         Height = 24
         Top = 356
-        Width = 94
+        Width = 88
         Caption = 'I/O speed:'
         ParentColor = False
@@ -190 +190 @@
         Height = 24
         Top = 116
-        Width = 40
+        Width = 38
         Caption = 'Size:'
         ParentColor = False
@@ -314 +314 @@
         Height = 24
         Top = 16
-        Width = 107
+        Width = 100
         Caption = 'Operations:'
         ParentColor = False

trunk/Form/UFormMain.pas

@@ -520 +520 @@
       BasePrefixMultipliers, SBytes);
     LabelSectorCount.Caption := IntToStr(Project.DriveInfo.SectorCount);
-    LabelSectorSize.Caption := IntToStr(Project.DriveInfo.SectorSize) + ' ' + SBytes;
+    LabelSectorSize.Caption := PrefixMultiplier.Add(Project.DriveInfo.SectorSize, BasePrefixMultipliers, SBytes);
   end else begin
     LabelSize.Caption := '';

trunk/Form/UFormProject.lfm

@@ -9 +9 @@
   LCLVersion = '1.7'
   object SpinEditSectorSize: TSpinEdit
-    Left = 192
+    Left = 224
     Height = 34
     Top = 152
     Width = 101
-    MaxValue = 100000
-    MinValue = 1
+    MaxValue = 63
+    OnChange = SpinEditSectorSizeChange
     TabOrder = 0
     Value = 1
@@ -92 +92 @@
     ParentColor = False
   end
+  object Label5: TLabel
+    Left = 192
+    Height = 24
+    Top = 160
+    Width = 22
+    Caption = '2^'
+    ParentColor = False
+  end
+  object Label6: TLabel
+    Left = 341
+    Height = 24
+    Top = 160
+    Width = 11
+    Caption = '='
+    ParentColor = False
+  end
 end

trunk/Form/UFormProject.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Spin,
-  StdCtrls, UProject;
+  StdCtrls, UProject, Math;
 
 type
@@ -22 +22 @@
     Label3: TLabel;
     Label4: TLabel;
+    Label5: TLabel;
+    Label6: TLabel;
     LabelSectorCount: TLabel;
     SpinEditSectorSize: TSpinEdit;
+    procedure SpinEditSectorSizeChange(Sender: TObject);
   private
+    procedure UpdateSectorSize;
   public
     procedure Load(Project: TProject);
@@ -42 +46 @@
 { TFormProject }
 
+procedure TFormProject.SpinEditSectorSizeChange(Sender: TObject);
+begin
+  UpdateSectorSize;
+end;
+
+procedure TFormProject.UpdateSectorSize;
+begin
+  Label6.Caption := '= ' + IntToStr(Trunc(IntPower(2, SpinEditSectorSize.Value))) + ' bytes';
+end;
+
 procedure TFormProject.Load(Project: TProject);
 begin
   Core.DriveList.LoadToStrings(ComboBoxDrive.Items);
   EditName.Text := Project.Name;
-  SpinEditSectorSize.Value := Project.DriveInfo.SectorSize;
+  SpinEditSectorSize.Value := Trunc(Log2(Project.DriveInfo.SectorSize));
   ComboBoxDrive.ItemIndex := Core.DriveList.IndexOf(Core.DriveList.FindByModel(Project.DriveInfo.Model));
+  UpdateSectorSize;
 end;
 
@@ -53 +68 @@
 begin
   Project.Name := EditName.Text;
-  Project.DriveInfo.SectorSize := SpinEditSectorSize.Value;
+  Project.DriveInfo.SectorSize := Trunc(IntPower(2, SpinEditSectorSize.Value));
 end;
 

trunk/Packages/Common/UPrefixMultiplier.pas

@@ -39 +39 @@
     (ShortText: 'n'; FullText: 'nano'; Value: 1e-9),
     (ShortText: 'u'; FullText: 'mikro'; Value: 1e-6),
-    (ShortText: 'm'; FullText: 'mili'; Value: 1e-3),
+    (ShortText: 'm'; FullText: 'mili'; Value: 1-3),
     (ShortText: ''; FullText: ''; Value: 1e0),
     (ShortText: 'k'; FullText: 'kilo'; Value: 1e3),

trunk/UCore.lfm

@@ -18 +18 @@
   end
   object XMLConfig1: TXMLConfig
-    Filename = 'config.xml'
     StartEmpty = False
     RootName = 'CONFIG'

trunk/UCore.pas

@@ -40 +40 @@
   Project := nil;
   XMLConfig1.Filename := 'config.xml';
+  Randomize;
 end;
 

trunk/UDriveScan.pas

@@ -125 +125 @@
 implementation
 
+uses
+  UFileStreamEx;
+
 resourcestring
   SUnknownRunMode = 'Unknown run mode';
@@ -177 +180 @@
 function TTestStream.Write(const Buffer; Count: Longint): Longint;
 begin
+  Result := 0;
 end;
 
 function TTestStream.Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
 begin
+  Result := 0;
 end;
 
@@ -293 +298 @@
   F: TStream;
   RealSize: Integer;
-  Buffer: array of Byte;
+  Buffer: Pointer;
+  BufferAligned: Pointer;
   I: Integer;
+  Alignment: Integer;
 begin
   try
@@ -301 +308 @@
     if ConfigTest then F := TTestStream.Create
     else begin
+      //if Mode = rmRead then F := TFileStreamEx.Create(DriveName, fmOpenRead, [ffDirect])
+      //  else if Mode = rmWrite then F := TFileStreamEx.Create(DriveName, fmOpenReadWrite, [ffDirect]);
       if Mode = rmRead then F := TFileStream.Create(DriveName, fmOpenRead)
         else if Mode = rmWrite then F := TFileStream.Create(DriveName, fmOpenReadWrite);
     end;
     try
-      SetLength(Buffer, SectorSize);
+      Alignment := SectorSize;
+      Buffer := GetMem(SectorSize + Alignment);
+      BufferAligned := Pointer(Int64(Buffer) - (Int64(Buffer) and (Alignment - 1)) + Alignment);
       if Mode = rmWrite then begin
         if not WritePatternRandom then
-          FillChar(Buffer[0], Length(Buffer), WritePattern)
-          else for I := 0 to Length(Buffer) - 1 do
-            Buffer[I] := Random(256);
+          FillChar(BufferAligned^, SectorSize, WritePattern)
+          else for I := 0 to SectorSize - 1 do
+            PByte(Int64(BufferAligned) + I)^ := Random(256);
       end;
       while FSectorCurrent < SectorEnd do begin
@@ -317 +328 @@
           DoChange;
           F.Position := FSectorCurrent * SectorSize;
-          if Mode = rmRead then RealSize := F.Read(Buffer[0], SectorSize)
-            else if Mode = rmWrite then RealSize := F.Write(Buffer[0], SectorSize)
+          if Mode = rmRead then RealSize := F.Read(BufferAligned^, SectorSize)
+            else if Mode = rmWrite then RealSize := F.Write(BufferAligned^, SectorSize)
             else raise Exception.Create(SUnknownRunMode);
         finally
@@ -333 +344 @@
         if Terminated then Break;
       end;
+      FreeMem(Buffer);
     finally
       F.Free;