Changeset 7427 for trunk/src

Timestamp:

Nov 22, 2001, 2:35:42 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/odinprof

Files:

• profiler.cpp (modified) (8 diffs)
• symfile.cpp (modified) (3 diffs)
• symfile.h (modified) (2 diffs)

trunk/src/odinprof/profiler.cpp

@@ -1 @@
-/* $Id: profiler.cpp,v 1.2 2001-11-22 11:34:43 phaller Exp $ */
+/* $Id: profiler.cpp,v 1.3 2001-11-22 13:35:42 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -710 +710 @@
   {
     PPROFILEENTRY p = (PPROFILEENTRY)arrEntries[i].pObject;
-    if (p->ulCalls > 1)
     fprintf(file,
             "%10d %10d %10d %10d %10d %s(%s)\n",
@@ -738 +737 @@
   {
     PPROFILEENTRY p = (PPROFILEENTRY)arrEntries[i].pObject;
-    if (p->ulCalls > 1)
     fprintf(file,
             "%10d %10d %10d %s(%s)\n",
@@ -764 +762 @@
   {
     PPROFILEENTRY p = (PPROFILEENTRY)arrEntries[i].pObject;
-    if (p->ulCalls > 1)
     fprintf(file,
             "%10d %10d %10d %s(%s)\n",
@@ -790 +787 @@
   {
     PPROFILEENTRY p = (PPROFILEENTRY)arrEntries[i].pObject;
-    if (p->ulCalls > 1)
     fprintf(file,
             "%10d %10d %10d %s(%s)\n",
@@ -810 +806 @@
   // write to file
   fprintf(file,
-          "Functions / symbols sorted by address\n"
+          "\nFunctions / symbols sorted by address\n"
           "Address ----- Function / Symbol -------------------------------------------\n");
   for(i = 0;
@@ -817 +813 @@
   {
     PPROFILEENTRY p = (PPROFILEENTRY)arrEntries[i].pObject;
-    if (p->ulCalls > 1)
     fprintf(file,
             "#%08xh %-9s %s\n",
@@ -825 +820 @@
   }
   
+  // at last print the sym map
+  pSymPool->printSYMs(file);
 
   ProfilerEnable(flagLock);

trunk/src/odinprof/symfile.cpp

@@ -1 @@
-/* $Id: symfile.cpp,v 1.2 2001-11-22 11:34:43 phaller Exp $ */
+/* $Id: symfile.cpp,v 1.3 2001-11-22 13:35:42 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -395 +395 @@
   if (NULL == pSym)
   {
-    CHAR szFilename[260];
+    DosEnterCritSec();
     
-    // 1 - locate the file
-    APIRET rc = searchModule(pszModule, szFilename, sizeof(szFilename));
+    // try again since someone else could have loaded the map already
+    pSym = (LXSymbolFile*)pHashModules->getElement(pszModule);
+    if (NULL == pSym)
+    {
+      CHAR szFilename[260];
+      
+      // 1 - locate the file
+      APIRET rc = searchModule(pszModule, szFilename, sizeof(szFilename));
+      
+      // create new entry
+      pSym = new LXSymbolFile(pszModule, szFilename);
+      
+      // parse the file
+      if (rc == NO_ERROR)
+        pSym->parseFile();
+      else
+        pSym->setErrorMessage("file not found");
+      
+      // add to the hashtable
+      PSZ pszCopyOfModuleName = strdup(pszModule);
+      pHashModules->addElement(pszCopyOfModuleName, pSym);
+    }
     
-    // create new entry
-    pSym = new LXSymbolFile(pszModule, szFilename);
-    
-    // parse the file
-    if (rc == NO_ERROR)
-      pSym->parseFile();
-    else
-      pSym->setErrorMessage("file not found");
-    
-    // add to the hashtable
-    pHashModules->addElement(pszModule, pSym);
+    DosExitCritSec();
   }
   
@@ -457 +467 @@
 }
 
+
+static int _Optlink sortHashtableSYMs(const void *arg1,const void *arg2)
+{
+  PHASHTABLEENTRY pHTE1 = (PHASHTABLEENTRY)arg1;
+  PHASHTABLEENTRY pHTE2 = (PHASHTABLEENTRY)arg2;
+  
+  LXSymbolFile* p1 = (LXSymbolFile*)pHTE1->pObject;
+  LXSymbolFile* p2 = (LXSymbolFile*)pHTE2->pObject;
+  
+  return stricmp(p1->getName(), p2->getName());
+}
+
+
+void SymbolFilePool::printSYMs(FILE *file)
+{
+  int iEntries = pHashModules->getNumberOfElements();
+  
+  // get a list of all entries of the hashtable
+  PHASHTABLEENTRY arrEntries = (PHASHTABLEENTRY)malloc( iEntries * sizeof(HASHTABLEENTRY) );
+  iEntries = pHashModules->getElementMap(arrEntries);
+  
+  fprintf(file,
+          "\nSymbolic debug information maps (%d maps)\n",
+          iEntries);
+  
+  // sort the list by name
+  qsort(arrEntries,
+        iEntries,
+        sizeof( HASHTABLEENTRY ),
+        sortHashtableSYMs);
+  
+  // write to file
+  fprintf(file,
+          "Module ---- Status --------------------------------------------------------\n");
+  for(int i = 0;
+      i < iEntries;
+      i++)
+  {
+    LXSymbolFile* p = (LXSymbolFile*)arrEntries[i].pObject;
+    fprintf(file,
+            "%-10s %s (%s)\n",
+            p->getName(),
+            p->getFileName(),
+            (p->getErrorMessage() != NULL) ? p->getErrorMessage() : "");
+  }
+}

trunk/src/odinprof/symfile.h

@@ -1 @@
-/* $Id: symfile.h,v 1.2 2001-11-22 11:34:44 phaller Exp $ */
+/* $Id: symfile.h,v 1.3 2001-11-22 13:35:42 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -164 +164 @@
                          ULONG  ulNameBufferLength,
                          PULONG pulSymbolOffset);
+    void   printSYMs(FILE *file);
 
   protected: