Added interface for line info find-with-hint.

Fixed dwarfWalker bug where we doubled up on compensating for one-based indexing. dwarfWalker now uses/fills a Module's stringtable directly. StringTables now streamable for debugging. Inlines use string table entries for filenames.
dyninst · Oct 19, 2016 · 5a8fac5 · 5a8fac5
1 parent 8697646
commit 5a8fac5
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 76 deletions.
diff --git a/common/src/debug_common.h b/common/src/debug_common.h
@@ -34,7 +34,7 @@
 #include <string>
 #include "util.h"
 
-extern int common_debug_dwarf;
+COMMON_EXPORT extern int common_debug_dwarf;
 extern int common_debug_addrtranslate;
 
 #if defined(__GNUC__)

diff --git a/symtabAPI/h/Function.h b/symtabAPI/h/Function.h
@@ -198,8 +198,9 @@ class SYMTAB_EXPORT InlinedFunction : public FunctionBase
    virtual std::string getName() const;
    virtual Offset getOffset() const;
    virtual unsigned getSize() const;
+    void setFile(std::string filename);
   private:
-   const char* callsite_file;
+   int callsite_file_number;
    Dyninst::Offset callsite_line;
    std::string name_;
    Module* module_;

diff --git a/symtabAPI/h/LineInformation.h b/symtabAPI/h/LineInformation.h
@@ -86,19 +86,13 @@ class SYMTAB_EXPORT LineInformation :
       const_iterator begin() const;
       const_iterator end() const;
       const_iterator find(Offset addressInRange) const;
+      const_iterator find(Offset addressInRange, const_iterator hint) const;
 
       unsigned getSize() const;
 
       virtual ~LineInformation();
-
+        StringTablePtr strings_;
    protected:
-      /* We maintain internal copies of all the source file names.  Because
-         both directions of the mapping include pointers to these names,
-         maintain a separate list of them, and only ever deallocate those
-         (in the destructor).  Note that it speeds and simplifies things
-         to have the string pointers be the same. */
-
-      StringTablePtr strings_;
 public:
     StringTablePtr getStrings() ;
 

diff --git a/symtabAPI/h/Module.h b/symtabAPI/h/Module.h
@@ -96,6 +96,12 @@ class SYMTAB_EXPORT Statement
             return addr == startAddr();
         }
         return (startAddr() <= addr) && (addr < endAddr());
+    }
+    bool operator<(Offset addr) const {
+        return startAddr() <= addr;
+    }
+    bool operator>(Offset addr) const {
+        return !((*this) < addr || (*this == addr));
     }
 	~Statement() {}
 
@@ -229,7 +235,7 @@ typedef Statement LineNoTuple;
 
 	void setDebugInfo(Module::DebugInfoT info);
     void finalizeRanges();
-		private:
+    private:
    Dyninst::SymtabAPI::LineInformation* lineInfo_;
    typeCollection* typeInfo_;
 	std::vector<Module::DebugInfoT> info_;
@@ -241,6 +247,12 @@ typedef Statement LineNoTuple;
    Offset addr_;                      // starting address of module
    Symtab *exec_;
     std::set<AddressRange > ranges;
+
+    StringTablePtr strings_;
+        public:
+            StringTablePtr & getStrings() ;
+
+        private:
             bool ranges_finalized;
 
             void finalizeOneRange(Address ext_s, Address ext_e) const;

diff --git a/symtabAPI/h/StringTable.h b/symtabAPI/h/StringTable.h
@@ -32,6 +32,24 @@ namespace Dyninst {
                 > StringTable;
 
         typedef boost::shared_ptr<StringTable> StringTablePtr;
+        template <typename os>
+        os& operator<<(os& s, StringTableEntry e)
+        {
+            s << e.str;
+            return s;
+        }
+
+        template <typename os>
+        os& operator<<(os& stream, const StringTable& tbl)
+        {
+            for(int i = 0; i < tbl.size(); ++i)
+            {
+                stream << tbl[i] << " @ " << i << std::endl;
+            }
+            return stream;
+        }
+
+
 
     }
 }

diff --git a/symtabAPI/src/Function.C b/symtabAPI/src/Function.C
@@ -209,10 +209,11 @@ bool FunctionBase::setFramePtr(vector<VariableLocation> *locs)
 
 std::pair<std::string, Dyninst::Offset> InlinedFunction::getCallsite()
 {
-    if(callsite_file) {
-        return make_pair(callsite_file, callsite_line);
+    std::string callsite_file = "<unknown>";
+    if(callsite_file_number > 0 && callsite_file_number < module_->getStrings()->size()) {
+        callsite_file = (*module_->getStrings())[callsite_file_number].str;
     }
-    return make_pair("<UNKNOWN FILE>", callsite_line);
+    return make_pair(callsite_file, callsite_line);
 }
 
 void FunctionBase::expandLocation(const VariableLocation &loc,
@@ -431,7 +432,7 @@ bool FunctionBase::operator==(const FunctionBase &f)
 
 InlinedFunction::InlinedFunction(FunctionBase *parent) :
     FunctionBase(),
-    callsite_file(NULL),
+    callsite_file_number(0),
     callsite_line(0),
     module_(parent->getModule())
 {
@@ -476,6 +477,15 @@ unsigned InlinedFunction::getSize() const
     return functionSize_;//inline_parent->getSize();
 }
 
+void InlinedFunction::setFile(string filename) {
+    StringTablePtr strs = module_->getStrings();
+    // This looks gross, but here's what it does:
+    // Get index 1 (unique by name). Insert the filename on that index (which defaults to push_back if empty).
+    // Returns an <iterator, bool>; get the iterator (we don't care if it's new). Project to random access (index 0).
+    // Difference from begin == array index in string table.
+    callsite_file_number = strs->project<0>(strs->get<1>().insert(filename).first) - strs->begin();
+}
+
 Module* Function::getModule() const {
     return module_;
 }
diff --git a/symtabAPI/src/LineInformation.C b/symtabAPI/src/LineInformation.C
@@ -217,5 +217,15 @@ void LineInformation::setStrings(StringTablePtr strings_) {
     LineInformation::strings_ = strings_;
 }
 
+LineInformation::const_iterator LineInformation::find(Offset addressInRange, const_iterator hint) const {
+    while(hint != end())
+    {
+        if((**hint) == addressInRange) return hint;
+        if((**hint) > addressInRange) break;
+        ++hint;
+    }
+    return find(addressInRange);
+}
+
 /* end LineInformation destructor */
 
diff --git a/symtabAPI/src/Module.C b/symtabAPI/src/Module.C
@@ -193,6 +193,8 @@ LineInformation *Module::parseLineInformation() {
     if (!lineInfo_)
     {
         lineInfo_ = new LineInformation;
+        // share our string table
+        lineInfo_->setStrings(strings_);
     }
     // Parse any CUs that have been added to our list
     if(!info_.empty()) {
@@ -321,7 +323,8 @@ Module::Module(supportedLanguages lang, Offset adr,
    language_(lang),
    addr_(adr),
    exec_(img),
-   ranges_finalized(false)
+   ranges_finalized(false),
+   strings_(new StringTable)
 {
    fileName_ = extract_pathname_tail(fullNm);
 }
@@ -334,7 +337,8 @@ Module::Module() :
    language_(lang_Unknown),
    addr_(0),
    exec_(NULL),
-    ranges_finalized(false)
+    ranges_finalized(false),
+   strings_(new StringTable)
 {
 }
 
@@ -348,7 +352,8 @@ Module::Module(const Module &mod) :
    addr_(mod.addr_),
    exec_(mod.exec_),
    info_(mod.info_),
-   ranges_finalized(mod.ranges_finalized)
+   ranges_finalized(mod.ranges_finalized),
+   strings_(mod.strings_)
 
 {
 }
@@ -524,3 +529,8 @@ void Module::finalizeOneRange(Address ext_s, Address ext_e) const {
 void Module::setDebugInfo(Module::DebugInfoT info) {
     info_.push_back(info);
 }
+
+StringTablePtr & Module::getStrings() {
+    return strings_;
+}
+
diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C
@@ -4485,8 +4485,6 @@ void Object::parseTypeInfo()
     if(!typeInfo) return;
     DwarfWalker walker(associated_symtab, *typeInfo);
     walker.parse();
-    freeList.push_back(walker.getFreeList());
-//    freeList = walker.getFreeList();
 #if defined(TIMED_PARSE)
     struct timeval endtime;
   gettimeofday(&endtime, NULL);