Fixed an ETL timing issue

microsoft · Sep 28, 2021 · 69c493e · 69c493e
1 parent 3832d8c
commit 69c493e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/SQLCheck/.vs/SQLCheck/v15/Server/sqlite3/storage.ide-shm b/SQLCheck/.vs/SQLCheck/v15/Server/sqlite3/storage.ide-shm
diff --git a/SQLCheck/.vs/SQLCheck/v15/Server/sqlite3/storage.ide-wal b/SQLCheck/.vs/SQLCheck/v15/Server/sqlite3/storage.ide-wal
diff --git a/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/.suo b/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/.suo
diff --git a/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-shm b/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-shm
diff --git a/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-wal b/SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-wal
diff --git a/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs b/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs
@@ -58,14 +58,11 @@ public ETLFileReader(string FilePath)
             m_handle = TraceEventInterop.OpenTraceFile(ref m_logFile);
 
             m_sessionStartTime = DateTime.FromFileTime(m_logFile.LogfileHeader.StartTime);
-            m_sessionEndTime = DateTime.FromFileTime(m_logFile.LogfileHeader.EndTime);
             Program.logDiagnostic("There were " + m_logFile.EventsLost + " events lost.");
             m_QPCFreq = m_logFile.LogfileHeader.PerfFreq;
 
             if (m_QPCFreq == 0) m_QPCFreq = Stopwatch.Frequency;
 
-            Debug.Assert(m_sessionStartTime.Ticks != 0 && m_sessionEndTime.Ticks != 0 && m_sessionStartTime < m_sessionEndTime);
-
             // We ask for raw timestamps, but the log file may have used system time as its raw timestamp.
             // SystemTime is like a QPC time that happens 10M times a second (100ns).  
             // ReservedFlags is actually the ClockType 0 = Raw, 1 = QPC, 2 = SystemTimne 3 = CpuTick (we don't support)

diff --git a/SQL_Network_Analyzer/SQLNA/Parser.cs b/SQL_Network_Analyzer/SQLNA/Parser.cs
@@ -120,7 +120,10 @@ public static long GetInitialTick(string filePath)
                 if (filePath.ToLower().EndsWith(".etl"))  // ETL files have no magic number. Must be done by file name.
                 {
                     er = new ETLFileReader(filePath);
-                    initialTick = er.GetStartTime().Ticks;
+                    // initialTick = er.GetStartTime().Ticks;
+                    er.Init();
+                    Frame frame = er.Read();
+                    if (frame != null) initialTick = frame.ticks;   // extract tick information
                     if (Program.filterFormat == "A") Program.filterFormat = "N";   // format for "AUTO" format mode based on file type
                 }
                 else

diff --git a/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs b/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1862.0")]
-[assembly: AssemblyFileVersion("1.5.1862.0")]
+[assembly: AssemblyVersion("1.5.1864.0")]
+[assembly: AssemblyFileVersion("1.5.1864.0")]