Add byte counts, and remove doubled line returns for load timing traces.

diff --git a/Src/Common/UniFile.h b/Src/Common/UniFile.h
index cf09064..df65b39 100644 (file)
--- a/Src/Common/UniFile.h
+++ b/Src/Common/UniFile.h
@@ -40,6 +40,7 @@ public:
        virtual BOOL ReadString(CString & line) = 0;
        virtual BOOL ReadString(CString & line, CString & eol) = 0;
        virtual int GetLineNumber() const = 0;
+       virtual __int64 GetPosition() const = 0;
 
        struct txtstats
        {
@@ -84,6 +85,7 @@ public:
        virtual BOOL ReadString(CString & line);
        virtual BOOL ReadString(CString & line, CString & eol);
        virtual int GetLineNumber() const { return m_lineno; }
+       virtual __int64 GetPosition() const { return m_current - m_base; }
 
 
        virtual const txtstats & GetTxtStats() const { return m_txtstats; }

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 91ca08d..94c071d 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1079,7 +1079,7 @@ GetLineByteTimeReport(UINT lines, UINT bytes, const COleDateTime & start)
        COleDateTimeSpan duration = COleDateTime::GetCurrentTime() - start;
        CString sMinutes = locality::NumToLocaleStr((int)duration.GetTotalMinutes());
        CString str;
-       str.Format(_T("%s lines (%s byte) saved in %sm%02ds\n")
+       str.Format(_T("%s lines (%s byte) saved in %sm%02ds")
                , sLines, sBytes, sMinutes
                , duration.GetSeconds()
                );
@@ -1170,9 +1170,9 @@ int CMergeDoc::CDiffTextBuffer::LoadFromFile(LPCTSTR pszFileNameInit, PackingInf
                        // (at 100, 500, 1000, 5000, etc)
                        if (lineno == next_line_report)
                        {
-                               __int64 dwBytesRead = 99;
+                               __int64 dwBytesRead = pufile->GetPosition();
                                COleDateTimeSpan duration = COleDateTime::GetCurrentTime() - start;
-                               if (duration.GetTotalMinutes() > 1)
+                               if (duration.GetTotalMinutes() > 0)
                                {
                                        CString strace = GetLineByteTimeReport(lineno, dwBytesRead, start);
                                        TRACE(_T("%s\n"), (LPCTSTR)strace);
@@ -1185,9 +1185,9 @@ int CMergeDoc::CDiffTextBuffer::LoadFromFile(LPCTSTR pszFileNameInit, PackingInf
                // Send report of duration to trace (if it took a while)
                COleDateTime end = COleDateTime::GetCurrentTime();
                COleDateTimeSpan duration = end - start;
-               if (duration.GetTotalMinutes() > 2)
+               if (duration.GetTotalMinutes() > 0)
                {
-                       __int64 dwBytesRead = 999;
+                       __int64 dwBytesRead = pufile->GetPosition();
                        CString strace = GetLineByteTimeReport(lineno, dwBytesRead, start);
                        TRACE(_T("%s\n"), (LPCTSTR)strace);
                }

diff --git a/Src/readme.txt b/Src/readme.txt
index 07c89df..97bf75b 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,9 @@
 2003-10-24 Perry
  PATCH: [ 814832 ] Timing traces for loading file
   WinMerge: MergeDoc.cpp
+ Add byte counts, and remove doubled line returns for load timing traces.
+  WinMerge: MergeDoc.cpp
+  common: UniMemFile.h
 
 2003-10-24 Kimmo
  PATCH: [ 828283 ] Open Read-only files as such