Changeset 142 for oup/current/Helper

Timestamp:

Mar 30, 2007, 4:08:49 AM (18 years ago)

Author:

alloc

Message:

 

File:

• oup/current/Helper/LevelDB.pas (modified) (11 diffs)

oup/current/Helper/LevelDB.pas

@@ -75 +75 @@
 
   DatFileStream, RawFileStream: TMemoryStream;
-
-// ###########################
-  datsum, linksum, rawsum: Int64;
-  freq: Int64;
-  tempticks1, tempticks2: Int64;
-// ###########################
 const
   Steps: Byte = 3;
@@ -298 +292 @@
   Application.ProcessMessages;
 
-  QueryPerformanceFrequency(freq);
-  datsum := 0;
-  linksum := 0;
-  rawsum := 0;
-
   FileTime := Time;
   for FileID := 0 to DatHeader.Files - 1 do
@@ -311 +300 @@
     if FileInfo.Size > 0 then
     begin
-      QueryPerformanceCounter(tempticks1);
-
       FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
       DatFileStream := TMemoryStream.Create;
@@ -320 +307 @@
       DatFileStream.Write(tempi, 4);
       DatFileStream.Write(LevelID, 4);
-
-      QueryPerformanceCounter(tempticks2);
-      datsum := datsum + (tempticks2 - tempticks1);
 
       DatLinks := Connection.GetDatLinks(FileID);
@@ -337 +321 @@
         end;
       end;
-
-      QueryPerformanceCounter(tempticks1);
-      linksum := linksum + (tempticks1 - tempticks2);
 
       RawLinks := Connection.GetRawList(FileID);
@@ -367 +348 @@
       DatFileStream.Seek(0, soFromBeginning);
       Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
-
-      QueryPerformanceCounter(tempticks2);
-      rawsum := rawsum + (tempticks2 - tempticks1);
     end
     else
@@ -392 +370 @@
   end;
 
-  ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
-      'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
-      'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
-   );
-
   Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
   for i := 0 to High(FilesHeader) do
@@ -451 +424 @@
   BeginTime, FileTime: Double;
   Step:       Integer;
-  LevelID:    Integer;
   TimeFormat: TFormatSettings;
 
@@ -460 +432 @@
   FileID:     Integer;
 
-  Strings:    TStrings;
   i:          Integer;
   temps:      String;
-  tempi:      Integer;
-  tempb:      Byte;
   tempdata:   TByteData;
   FileInfo:   TFileInfo;
@@ -636 +605 @@
   Application.ProcessMessages;
 
+  FileTime := Time;
   Database.StartTransaction;
   for FileID := 0 to Connection.GetFileCount - 1 do
@@ -710 +680 @@
     if ((FileID mod 10) = 0) and (FileID >= 100) then
       lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
-        (Time - BeginTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
+        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
     progress.Position := FileID;
     lbl_progress.Caption := 'Files done: ' + IntToStr(FileID) + '/' + IntToStr(progress.Max);