Index: tools/linux/procfs.py |
diff --git a/tools/linux/procfs.py b/tools/linux/procfs.py |
index 34510014a59f0b7e54a8f05eec84e33028354d4e..ef19b25ea57eaee63e9c2f2202567b442317d572 100755 |
--- a/tools/linux/procfs.py |
+++ b/tools/linux/procfs.py |
@@ -310,6 +310,9 @@ class ProcMaps(object): |
r'^([a-f0-9]+)-([a-f0-9]+)\s+(.)(.)(.)(.)\s+([a-f0-9]+)\s+(\S+):(\S+)\s+' |
r'(\d+)\s*(.*)$', re.IGNORECASE) |
+ EXECUTABLE_PATTERN = re.compile( |
+ r'\S+\.(so|dll|dylib|bundle)((\.\d+)+\w*(\.\d+){0,3})?') |
wensheng
2014/08/30 03:29:48
Dmprof may not support content shell as the modifi
Dai Mikurube (NOT FULLTIME)
2014/09/02 15:11:15
Please take a look in prepare_symbol_info.py. It n
|
+ |
def __init__(self): |
self._sorted_indexes = [] |
self._dictionary = {} |
@@ -373,22 +376,16 @@ class ProcMaps(object): |
@staticmethod |
def constants(entry): |
- return (entry.writable == '-' and entry.executable == '-' and re.match( |
- '\S+(\.(so|dll|dylib|bundle)|chrome)((\.\d+)+\w*(\.\d+){0,3})?', |
- entry.name)) |
+ return entry.writable == '-' and entry.executable == '-' |
@staticmethod |
def executable(entry): |
- return (entry.executable == 'x' and re.match( |
- '\S+(\.(so|dll|dylib|bundle)|chrome)((\.\d+)+\w*(\.\d+){0,3})?', |
- entry.name)) |
+ return entry.executable == 'x' |
@staticmethod |
def executable_and_constants(entry): |
- return (((entry.writable == '-' and entry.executable == '-') or |
- entry.executable == 'x') and re.match( |
- '\S+(\.(so|dll|dylib|bundle)|chrome)((\.\d+)+\w*(\.\d+){0,3})?', |
- entry.name)) |
+ return ((entry.writable == '-' and entry.executable == '-') or |
+ entry.executable == 'x') |
def _append_entry(self, entry): |
if self._sorted_indexes and self._sorted_indexes[-1] > entry.begin: |