Changeset 7326 for trunk/src

Timestamp:

Nov 13, 2001, 12:06:03 AM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• perfview.cpp (modified) (4 diffs)
• thread.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.125 2001-10-11 00:59:42 phaller Exp $
+; $Id: KERNEL32.DEF,v 1.126 2001-11-12 23:04:56 phaller Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1202 +1202 @@
     PerfView_DumpProfile                                          @3104 NONAME
     PerfView_Write                                                @3105 NONAME
+    _dbg_GetLastCallerName@0                                      @3106 NONAME
+    _dbg_ThreadPushCall@4                                         @3107 NONAME
+    _dbg_ThreadPopCall@0                                          @3108 NONAME
+

trunk/src/kernel32/perfview.cpp

@@ -1 @@
-/* $Id: perfview.cpp,v 1.3 2001-10-12 03:48:06 phaller Exp $ */
+/* $Id: perfview.cpp,v 1.4 2001-11-12 23:04:57 phaller Exp $ */
 
 /*
@@ -19 +19 @@
 // insert "nullified" dummies here to save space in the executable image
 void PerfView_Initialize(void) {}
-void PerfView_RegisterCall(char* pszFunctionName, 
+void PerfView_RegisterCall(char* pszCallerName,
+                           char* pszFunctionName, 
                            unsigned long int nTicks) {}
 
@@ -87 +88 @@
 
 // register a call to a function
-void _Optlink PerfView_RegisterCall(char* pszFunctionName, 
+void _Optlink PerfView_RegisterCall(char* pszCallerName,
+                                    char* pszFunctionName, 
                                     unsigned long int nTicks)
 {
@@ -127 +129 @@
   if (nTicks > p->nMaximumTicks)
     p->nMaximumTicks = nTicks;
+
+
+  // add call-path tracing
+  if (NULL != pszCallerName)
+  {
+    // build path name
+    char szBuf[256];
+    strcpy(szBuf, pszCallerName);
+    strcat(szBuf, "->");
+    strcat(szBuf, pszFunctionName);
+    
+    // check if that particular callpath is registered already
+    PPERFVIEW_FUNCTION p2 = (PPERFVIEW_FUNCTION)pProfileMap->getElement(szBuf);
+    if (NULL == p2)
+    {
+      // new function call
+      p2 = (PPERFVIEW_FUNCTION)malloc( sizeof( PERFVIEW_FUNCTION ) );
+      p2->pszFunctionName = strdup( szBuf );
+      p2->nCalled = 0;
+      p2->nTotalTicks = 0;
+      p2->nMinimumTicks = 0xffffffff;
+      p2->nMaximumTicks = 0;
+      
+      // add to the hashtable
+      pProfileMap->addElement(p2->pszFunctionName, p2);
+    }
+    
+    // update statistical data
+    p2->nCalled++;
+    p2->nTotalTicks += nTicks;
+    
+    if (nTicks < p2->nMinimumTicks)
+      p2->nMinimumTicks = nTicks;
+    
+    if (nTicks > p2->nMaximumTicks)
+      p2->nMaximumTicks = nTicks;
+  }
 }
 

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.33 2001-11-10 12:47:48 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.34 2001-11-12 23:04:56 phaller Exp $ */
 
 /*
@@ -90 +90 @@
 
 
+#define MAX_CALLSTACK_SIZE 128
+void WIN32API dbg_ThreadPushCall(char *pszCaller)
+{
+#ifdef DEBUG
+  TEB *teb;
+  
+  // embedded dbg_IncThreadCallDepth
+  teb = GetThreadTEB();
+  if(teb == NULL)
+    return;
+    
+  teb->o.odin.dbgCallDepth++;
+  
+  // add caller name to call stack trace
+  int iIndex = teb->o.odin.dbgCallDepth;
+  
+  // allocate callstack on demand
+  if (teb->o.odin.arrstrCallStack == NULL)
+    teb->o.odin.arrstrCallStack = (PVOID*)malloc( sizeof(LPSTR) * MAX_CALLSTACK_SIZE);
+  
+  // insert entry
+  if (iIndex < MAX_CALLSTACK_SIZE)
+    teb->o.odin.arrstrCallStack[iIndex] = (PVOID)pszCaller;
+#endif
+}
+
+
 void WIN32API dbg_DecThreadCallDepth()
 {
@@ -99 +126 @@
     --(teb->o.odin.dbgCallDepth);
 #endif
+}
+
+
+void WIN32API dbg_ThreadPopCall()
+{
+#ifdef DEBUG
+  TEB *teb;
+  
+  // embedded dbg_DecThreadCallDepth
+  teb = GetThreadTEB();
+  if(teb == NULL)
+    return;
+  
+  --(teb->o.odin.dbgCallDepth);
+  
+  // add caller name to call stack trace
+  int iIndex = teb->o.odin.dbgCallDepth;
+  
+  // insert entry
+  if (teb->o.odin.arrstrCallStack)
+    if (iIndex < MAX_CALLSTACK_SIZE)
+      teb->o.odin.arrstrCallStack[iIndex] = NULL;
+#endif
+}
+
+char* WIN32API dbg_GetLastCallerName()
+{
+  // retrieve last caller name from stack
+  TEB *teb;
+  
+  // embedded dbg_DecThreadCallDepth
+  teb = GetThreadTEB();
+  if(teb != NULL)
+  {
+    int iIndex = teb->o.odin.dbgCallDepth - 1;
+    if ( (iIndex > 0) &&
+         (iIndex < MAX_CALLSTACK_SIZE) )
+    {
+      return (char*)teb->o.odin.arrstrCallStack[iIndex];
+    }
+  }
+  
+  return NULL;
 }