Changeset 7025

Timestamp:

Oct 12, 2001, 2:49:51 AM (24 years ago)

Author:

phaller

Message:

improvement of profiler

Location:

trunk

Files:

• include/perfview.h (modified) (2 diffs)
• src/kernel32/perfview.cpp (modified) (11 diffs)
• src/kernel32/winexepeldr.cpp (modified) (3 diffs)
• src/kernel32/wprocess.cpp (modified) (2 diffs)

trunk/include/perfview.h ¶

@@ -1 @@
-/* $Id: perfview.h,v 1.1 2001-10-11 00:59:59 phaller Exp $ */
+/* $Id: perfview.h,v 1.2 2001-10-12 00:49:51 phaller Exp $ */
 
 /*
@@ -18 +18 @@
 extern "C" {
 #endif
-
+  
+  
+// calibrate the subsystem
+void _Optlink PerfView_Initialize(void);
 
 // register a call to a function

trunk/src/kernel32/perfview.cpp ¶

@@ -1 @@
-/* $Id: perfview.cpp,v 1.1 2001-10-11 17:31:12 phaller Exp $ */
+/* $Id: perfview.cpp,v 1.2 2001-10-12 00:49:24 phaller Exp $ */
 
 /*
@@ -18 +18 @@
 
 // insert "nullified" dummies here to save space in the executable image
+void PerfView_Initialize(void) {}
 void PerfView_RegisterCall(char* pszFunctionName, 
                            unsigned long int nTicks) {}
@@ -27 +28 @@
 
 #include <ccollection.h>
-#include <win32type.h>
+#include <winbase.h>
 
 // imported from the kernel loader (initterm)
@@ -40 +41 @@
   unsigned long int nCalled;
   unsigned long int nTotalTicks;
+  unsigned long int nMinimumTicks;
+  unsigned long int nMaximumTicks;
 } PERFVIEW_FUNCTION, *PPERFVIEW_FUNCTION;
 
@@ -46 +49 @@
 static CHashtableLookup* pProfileMap = new CHashtableLookup(1021);
 static BOOL flagLock = FALSE;
+static unsigned long int tsCompensation = 0;
+
+
+// measure the measurement overhead itself
+void PerfView_Initialize(void) 
+{
+#define CALIBRATION_RUNS 100
+  
+  LARGE_INTEGER liStart;
+  LARGE_INTEGER liEnd;
+  unsigned long ulElapsed;
+  
+  // initialize this
+  tsCompensation = 0;
+  
+  for (int i = 0;
+       i < CALIBRATION_RUNS;
+       i++)
+  {
+    QueryPerformanceCounter(&liStart);
+    QueryPerformanceCounter(&liEnd);
+
+    if (liStart.LowPart > liEnd.LowPart)
+      ulElapsed = 0xFFFFFFFF - liStart.LowPart + liEnd.LowPart;
+    else
+      ulElapsed = liEnd.LowPart - liStart.LowPart;
+  
+    // save the determined amount of elapsed ticks
+    // as compensatory factor
+    tsCompensation += ulElapsed;
+  }
+
+  // now calculate back to real value
+  tsCompensation /= CALIBRATION_RUNS;
+}
+
 
 // register a call to a function
@@ -54 +93 @@
   if (flagLock)
     return;
+  
+  // subtract the measurement overhead factor.
+  // Note: this should rather be done where the times are taken,
+  // however this would spread the code just too far.
+  nTicks -= tsCompensation;
   
   // check if that particular function is registered already
@@ -64 +108 @@
     p->nCalled = 0;
     p->nTotalTicks = 0;
+    p->nMinimumTicks = 0xffffffff;
+    p->nMaximumTicks = 0;
     
     // add to the hashtable
@@ -72 +118 @@
   p->nCalled++;
   p->nTotalTicks += nTicks;
+  
+  if (nTicks < p->nMinimumTicks)
+    p->nMinimumTicks = nTicks;
+  
+  if (nTicks > p->nMaximumTicks)
+    p->nMaximumTicks = nTicks;
 }
 
@@ -134 +186 @@
   PHASHTABLEENTRY arrEntries = (PHASHTABLEENTRY)malloc( iEntries * sizeof(HASHTABLEENTRY) );
   iEntries = pProfileMap->getElementMap(arrEntries);
+  
+  fprintf(file,
+          "ODIN Performance Analysis\n"
+          "%d entries available, compensated measure overhead is %d ticks.\n\n",
+          iEntries,
+          tsCompensation);
+  
   
   // sort the list by function name
@@ -144 +203 @@
   fprintf(file,
           "Sorted by function name\n"
+          "Ticks ---- Called --- Average -- Minimum -- Maximum -- Function -----------\n");
+  for(int i = 0;
+      i < iEntries;
+      i++)
+  {
+    PPERFVIEW_FUNCTION p = (PPERFVIEW_FUNCTION)arrEntries[i].pObject;
+    fprintf(file,
+            "%10d %10d %10d %10d %10d %s\n",
+            p->nTotalTicks,
+            p->nCalled,
+            p->nTotalTicks / p->nCalled,
+            p->nMinimumTicks,
+            p->nMaximumTicks,
+            p->pszFunctionName);
+  }
+  
+  
+  // sort the list by nTotalTicks
+  qsort(arrEntries,
+        iEntries,
+        sizeof( HASHTABLEENTRY ),
+        sortHashtableEntries1);
+  
+  // write to file
+  fprintf(file,
+          "\nSorted by total call time\n"
           "Ticks ---- Called --- Average -- Function ---------------------------------\n");
-  for(int i = 0;
+  for(i = 0;
       i < iEntries;
       i++)
@@ -159 +244 @@
   
   
-  // sort the list by nTotalTicks
-  qsort(arrEntries,
-        iEntries,
-        sizeof( HASHTABLEENTRY ),
-        sortHashtableEntries1);
-  
-  // write to file
-  fprintf(file,
-          "\nSorted by total call time\n"
-          "Ticks ---- Called --- Average -- Function ---------------------------------\n");
-  for(i = 0;
-      i < iEntries;
-      i++)
-  {
-    PPERFVIEW_FUNCTION p = (PPERFVIEW_FUNCTION)arrEntries[i].pObject;
-    fprintf(file,
-            "%10d %10d %10d %s\n",
-            p->nTotalTicks,
-            p->nCalled,
-            p->nTotalTicks / p->nCalled,
-            p->pszFunctionName);
-  }
-  
-  
   // sort the list by nCalled
   qsort(arrEntries,

trunk/src/kernel32/winexepeldr.cpp ¶

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.15 2001-02-24 12:59:44 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.16 2001-10-12 00:49:23 phaller Exp $ */
 
 /*
@@ -39 +39 @@
 #define DBG_LOCALLOG    DBG_winexepeldr
 #include "dbglocal.h"
+
+
+#ifdef PROFILE
+#include <perfview.h>
+#endif /* PROFILE */
+
 
 extern char szErrorTitle[];
@@ -141 +147 @@
   }
   OS2UnsetExceptionHandler(&exceptFrame);
-
+  
+#ifdef PROFILE
+  // Note: after this point, we might start collecting performance
+  // information about the called functions.
+  PerfView_Initialize();
+#endif /* PROFILE */
+  
+  
   WinExe->start();
 

trunk/src/kernel32/wprocess.cpp ¶

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.135 2001-10-11 01:00:12 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.136 2001-10-12 00:49:23 phaller Exp $ */
 
 /*
@@ -47 +47 @@
 #define DBG_LOCALLOG    DBG_wprocess
 #include "dbglocal.h"
+
+#ifdef PROFILE
+#include <perfview.h>
+#endif /* PROFILE */
+
 
 ODINDEBUGCHANNEL(KERNEL32-WPROCESS)