Changeset 6 for trunk/UDriveScan.pas

Timestamp:

Mar 30, 2016, 10:50:22 PM (8 years ago)

Author:

chronos

Message:

• Modified: TBlockMap reworked to sparse map using list of value changes. Now much less memory is required to keep sector map of high capacity drives. Also drawing of map is much faster.

File:

• trunk/UDriveScan.pas (modified) (5 diffs)

trunk/UDriveScan.pas

@@ -54 +54 @@
 implementation
 
+resourcestring
+  SUnknownRunMode = 'Unknown run mode';
+
 
 { TScanThread }
@@ -82 +85 @@
 procedure TDriveScan.Start;
 begin
-  ScanThread := TScanThread.Create(True);
-  ScanThread.Scan := Self;
-  ScanThread.Start;
+  if Terminated then begin
+    Terminated := False;
+    ScanThread := TScanThread.Create(True);
+    ScanThread.Scan := Self;
+    ScanThread.Start;
+  end;
 end;
 
@@ -120 +126 @@
         if Mode = rmRead then RealSize := F.Read(Buffer[0], SectorSize)
           else if Mode = rmWrite then RealSize := F.Write(Buffer[0], SectorSize)
-          else raise Exception.Create('Unknwon run mode');
+          else raise Exception.Create(SUnknownRunMode);
       end;
     finally
@@ -144 +150 @@
 procedure TDriveScan.Stop;
 begin
-  Terminated := True;
-  ScanThread.Terminate;
-  ScanThread.WaitFor;
-  FreeAndNil(ScanThread);
+  if not Terminated then begin
+    Terminated := True;
+    ScanThread.Terminate;
+    ScanThread.WaitFor;
+    FreeAndNil(ScanThread);
+  end;
 end;
 
@@ -160 +168 @@
 destructor TDriveScan.Destroy;
 begin
+  Stop;
   FreeAndNil(BlockMap);
   FreeAndNil(Lock);