Changeset 6829 for trunk/src

Timestamp:

Sep 26, 2001, 5:31:05 PM (24 years ago)

Author:

phaller

Message:

added calldepth tracing

Location:

trunk/src/kernel32

Files:

• misc.cpp (modified) (2 diffs)
• thread.cpp (modified) (2 diffs)

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.41 2001-08-17 11:18:37 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.42 2001-09-26 15:31:05 phaller Exp $ */
 
 /*
@@ -336 +336 @@
   {
     va_start(argptr, tekst);
-    if(teb) {
-        teb->o.odin.logfile = (DWORD)flog;
+    if(teb) 
+    {
+      ULONG ulCallDepth;
+#ifdef DEBUG
+      ulCallDepth = teb->o.odin.dbgCallDepth;
+#else
+      ulCallDepth = 0;
+#endif
+      
+      teb->o.odin.logfile = (DWORD)flog;
+      
 #ifdef LOG_TIME
-        if(sel == 0x150b && !fIsOS2Image) {
-             fprintf(flog, "t%d: (%x) (FS=150B) ", teb->o.odin.threadId, GetTickCount());
-        }
-        else fprintf(flog, "t%d: (%x) ", teb->o.odin.threadId, GetTickCount());
-#else
-        if(sel == 0x150b && !fIsOS2Image) {
-             fprintf(flog, "t%d: (FS=150B) ", teb->o.odin.threadId);
-        }
-        else fprintf(flog, "t%d: ", teb->o.odin.threadId);
+      if(sel == 0x150b && !fIsOS2Image)
+        fprintf(flog, 
+                "t%02d (%3d): (%x) (FS=150B) ",
+                teb->o.odin.threadId,
+                ulCallDepth,
+                GetTickCount());
+      else 
+        fprintf(flog, 
+                "t%02d (%3d): (%x) ",
+                teb->o.odin.threadId, 
+                ulCallDepth,
+                GetTickCount());
+#else
+      if(sel == 0x150b && !fIsOS2Image) 
+        fprintf(flog, 
+                "t%02d (%3d): (FS=150B) ",
+                teb->o.odin.threadId,
+                ulCallDepth);
+      else 
+        fprintf(flog, 
+                "t%02d (%3d): ",
+                teb->o.odin.threadId,
+                ulCallDepth);
 #endif
     }

trunk/src/kernel32/thread.cpp

@@ -1 @@
-/* $Id: thread.cpp,v 1.31 2001-06-27 19:09:35 sandervl Exp $ */
+/* $Id: thread.cpp,v 1.32 2001-09-26 15:29:39 phaller Exp $ */
 
 /*
@@ -58 +58 @@
     return teb->o.odin.hThread;
 }
+
+// these two debugging functions allow access to a
+// calldepth counter inside the TEB block of each thread
+ULONG WIN32API dbg_GetThreadCallDepth()
+{
+#ifdef DEBUG
+  TEB *teb;
+
+  teb = GetThreadTEB();
+  if(teb == NULL)
+    return 0;
+  else
+    return teb->o.odin.dbgCallDepth;
+#else
+  return 0;
+#endif
+}
+
+
+void WIN32API dbg_IncThreadCallDepth()
+{
+#ifdef DEBUG
+  TEB *teb;
+
+  teb = GetThreadTEB();
+  if(teb != NULL)
+    teb->o.odin.dbgCallDepth++;
+#endif
+}
+
+
+void WIN32API dbg_DecThreadCallDepth()
+{
+#ifdef DEBUG
+  TEB *teb;
+
+  teb = GetThreadTEB();
+  if(teb != NULL)
+    --(teb->o.odin.dbgCallDepth);
+#endif
+}
+
+
 //******************************************************************************
 //******************************************************************************