Changeset ac56fce in rtems-tools

Timestamp:

04/30/21 19:34:18 (3 years ago)

Author:

Alex White <alex.white@…>

Branches:

master

Children:

2650d70

Parents:

a88be93

git-author:

Alex White <alex.white@…> (04/30/21 19:34:18)

git-committer:

Joel Sherrill <joel@…> (06/17/21 21:00:08)

Message:

covoar: Store address-to-line info outside of DWARF

This adds the AddressToLineMapper? class and supporting classes to
assume responsibility of tracking address-to-line information.

This allows the DWARF library to properly cleanup all of its resources
and leads to significant memory savings.

Closes #4383

Files:

• rtemstoolkit/rld-dwarf.cpp (modified) (1 diff)
• rtemstoolkit/rld-dwarf.h (modified) (1 diff)
• tester/covoar/AddressToLineMapper.cc (added)
• tester/covoar/AddressToLineMapper.h (added)
• tester/covoar/ExecutableInfo.cc (modified) (2 diffs)
• tester/covoar/ExecutableInfo.h (modified) (3 diffs)
• tester/covoar/wscript (modified) (1 diff)

rtemstoolkit/rld-dwarf.cpp

@@ -1894 +1894 @@
     }
 
+    const addresses& compilation_unit::get_addresses () const
+    {
+      return addr_lines_;
+    }
+
     functions&
     compilation_unit::get_functions ()

rtemstoolkit/rld-dwarf.h

@@ -709 +709 @@
 
       /**
+       * The addresses associated with this compilation unit.
+       */
+      const addresses& get_addresses () const;
+
+      /**
        * Get the source and line for an address. If the address does not match
        * false is returned the file is set to 'unknown' and the line is set to

tester/covoar/ExecutableInfo.cc

@@ -41 +41 @@
     executable.load_symbols(symbols);
 
+    rld::dwarf::file debug;
+
     debug.begin(executable.elf());
     debug.load_debug();
     debug.load_functions();
 
-    try {
-      for (auto& cu : debug.get_cus()) {
-        for (auto& func : cu.get_functions()) {
-          if (!func.has_machine_code()) {
+    for (auto& cu : debug.get_cus()) {
+      AddressLineRange& range = mapper.makeRange(cu.pc_low(), cu.pc_high());
+      // Does not filter on desired symbols under the assumption that the test
+      // code and any support code is small relative to what is being tested.
+      for (const auto &address : cu.get_addresses()) {
+        range.addSourceLine(address);
+      }
+
+      for (auto& func : cu.get_functions()) {
+        if (!func.has_machine_code()) {
+          continue;
+        }
+
+        if (!SymbolsToAnalyze->isDesired(func.name())) {
+          continue;
+        }
+
+        if (func.is_inlined()) {
+          if (func.is_external()) {
+            // Flag it
+            std::cerr << "Function is both external and inlined: "
+                      << func.name() << std::endl;
+          }
+
+          if (func.has_entry_pc()) {
             continue;
           }
 
-          if (!SymbolsToAnalyze->isDesired(func.name())) {
+          // If the low PC address is zero, the symbol does not appear in
+          // this executable.
+          if (func.pc_low() == 0) {
             continue;
           }
-
-          if (func.is_inlined()) {
-            if (func.is_external()) {
-              // Flag it
-              std::cerr << "Function is both external and inlined: "
-                        << func.name() << std::endl;
-            }
-
-            if (func.has_entry_pc()) {
-              continue;
-            }
-
-            // If the low PC address is zero, the symbol does not appear in
-            // this executable.
-            if (func.pc_low() == 0) {
-              continue;
-            }
-          }
-
-          // We can't process a zero size function.
-          if (func.pc_high() == 0) {
-            continue;
-          }
-
-          createCoverageMap (cu.name(), func.name(),
-                              func.pc_low(), func.pc_high() - 1);
-        }
+        }
+
+        // We can't process a zero size function.
+        if (func.pc_high() == 0) {
+          continue;
+        }
+
+        createCoverageMap (cu.name(), func.name(),
+                            func.pc_low(), func.pc_high() - 1);
       }
-    } catch (...) {
-      debug.end();
-      throw;
-    }
-
-    // Can't cleanup handles until the destructor because the information is
-    // referenced elsewhere. NOTE: This could cause problems from too many open
-    // file descriptors.
+    }
   }
 
   ExecutableInfo::~ExecutableInfo()
   {
-    debug.end();
   }
 
@@ -198 +197 @@
     std::string file;
     int         lno;
-    debug.get_source (address, file, lno);
+    mapper.getSource (address, file, lno);
     std::ostringstream ss;
     ss << file << ':' << lno;

tester/covoar/ExecutableInfo.h

@@ -16 +16 @@
 #include <rld-symbols.h>
 
+#include "AddressToLineMapper.h"
 #include "CoverageMapBase.h"
 #include "SymbolTable.h"
@@ -159 +160 @@
 
     /*!
-     *  The DWARF data to the ELF executable.
-     */
-    rld::dwarf::file debug;
-
-    /*!
      *  The executable's file name.
      */
@@ -172 +168 @@
      */
     rld::symbols::table symbols;
+
+    /*!
+     *  The address-to-line mapper for this executable.
+     */
+    AddressToLineMapper mapper;
 
     /*!

tester/covoar/wscript

@@ -84 +84 @@
     bld.stlib(target = 'ccovoar',
               source = ['app_common.cc',
+                        'AddressToLineMapper.cc',
                         'CoverageFactory.cc',
                         'CoverageMap.cc',