Added find and lower_bound to RangeLookup.

dyninst · Oct 19, 2016 · 3c017fd · 3c017fd
1 parent 883ed46
commit 3c017fd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/symtabAPI/h/LineInformation.h b/symtabAPI/h/LineInformation.h
@@ -73,11 +73,11 @@ class SYMTAB_EXPORT LineInformation :
 
       bool getAddressRanges( const char * lineSource, unsigned int LineNo, std::vector< AddressRange > & ranges );
 
-      const_iterator begin() const;
-      const_iterator end() const;
+      virtual const_iterator begin() const;
+      virtual const_iterator end() const;
       unsigned getSize() const;
 
-      ~LineInformation();
+      virtual ~LineInformation();
 
    protected:
       /* We maintain internal copies of all the source file names.  Because

diff --git a/symtabAPI/h/RangeLookup.h b/symtabAPI/h/RangeLookup.h
@@ -102,10 +102,12 @@ class SYMTAB_EXPORT RangeLookup
 		bool getValues( Offset addressInRange, std::vector< Value *> & values );
 		bool getAddressRanges( Value v, std::vector< AddressRange > & ranges );
 
-		const_iterator begin() const;
-		const_iterator end() const;
+		virtual const_iterator begin() const;
+		virtual const_iterator end() const;
+		virtual const_iterator find(const AddressRange& ar) const;
+    	virtual const_iterator lower_bound(Offset addr) const;
 
-		~RangeLookup();
+		virtual ~RangeLookup();
 
 		// /* DEBUG */ void dump( FILE * stream );
 		// /* DEBUG */ static void testInsertionSpeed();
@@ -474,6 +476,17 @@ RangeLookup< Value, ValueRange >::~RangeLookup()
 {
 } /* end RangeLookup destructor */
 
+template< class Value, class ValueRange >
+typename RangeLookup< Value, ValueRange >::const_iterator RangeLookup< Value, ValueRange >::find(const AddressRange& ar) const
+{
+	return valuesByAddressRangeMap.find(ar);
+} /* end find() */
+
+template< class Value, class ValueRange >
+typename RangeLookup< Value, ValueRange >::const_iterator RangeLookup< Value, ValueRange >::lower_bound(Offset addr) const
+{
+	return valuesByAddressRangeMap.lower_bound(AddressRange(addr, addr));
+} /* end lower_bound() */
 
 } //  namespace SymtabAPI
 } // namespace Dyninst