Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(531)

Unified Diff: tools/find_runtime_symbols/proc_maps.py

Issue 11299095: Add a first test for tools/find_runtime_symbols. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/find_runtime_symbols/prepare_symbol_info.py ('k') | tools/find_runtime_symbols/static_symbols.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/find_runtime_symbols/proc_maps.py
diff --git a/tools/find_runtime_symbols/proc_maps.py b/tools/find_runtime_symbols/proc_maps.py
index 4b082c33b37283d4455d4df8daf64e719255f9a2..55198a84a092764a55d8b81651550f86693f1ce3 100644
--- a/tools/find_runtime_symbols/proc_maps.py
+++ b/tools/find_runtime_symbols/proc_maps.py
@@ -3,12 +3,11 @@
# found in the LICENSE file.
import re
-import sys
_MAPS_PATTERN = re.compile(
'^([a-f0-9]+)-([a-f0-9]+)\s+(.)(.)(.)(.)\s+([a-f0-9]+)\s+(\S+):(\S+)\s+'
- '(\d+)\s+(\S+)$', re.IGNORECASE)
+ '(\d+)\s*(.*)$', re.IGNORECASE)
class ProcMapsEntry(object):
@@ -29,6 +28,21 @@ class ProcMapsEntry(object):
self.inode = inode
self.name = name
+ def as_dict(self):
+ return {
+ 'begin': self.begin,
+ 'end': self.end,
+ 'readable': self.readable,
+ 'writable': self.writable,
+ 'executable': self.executable,
+ 'private': self.private,
+ 'offset': self.offset,
+ 'major': self.major,
+ 'minor': self.minor,
+ 'inode': self.inode,
+ 'name': self.name,
+ }
M-A Ruel 2012/11/21 09:09:01 align at return, e.g. -4.
Dai Mikurube (NOT FULLTIME) 2012/11/21 09:14:41 Done.
+
class ProcMaps(object):
"""A class representing contents in /proc/.../maps."""
@@ -38,12 +52,6 @@ class ProcMaps(object):
self._dictionary = {}
self._sorted = True
- def append(self, entry):
- if self._sorted_indexes and self._sorted_indexes[-1] > entry.begin:
- self._sorted = False
- self._sorted_indexes.append(entry.begin)
- self._dictionary[entry.begin] = entry
-
def iter(self, condition):
if not self._sorted:
self._sorted_indexes.sort()
@@ -65,7 +73,7 @@ class ProcMaps(object):
for line in f:
matched = _MAPS_PATTERN.match(line)
if matched:
- table.append(ProcMapsEntry(
+ table._append(ProcMapsEntry( # pylint: disable=W0212
int(matched.group(1), 16), # begin
int(matched.group(2), 16), # end
matched.group(3), # readable
@@ -99,3 +107,9 @@ class ProcMaps(object):
entry.executable == 'x') and re.match(
'\S+(\.(so|dll|dylib|bundle)|chrome)((\.\d+)+\w*(\.\d+){0,3})?',
entry.name))
+
+ def _append(self, entry):
+ if self._sorted_indexes and self._sorted_indexes[-1] > entry.begin:
+ self._sorted = False
+ self._sorted_indexes.append(entry.begin)
+ self._dictionary[entry.begin] = entry
« no previous file with comments | « tools/find_runtime_symbols/prepare_symbol_info.py ('k') | tools/find_runtime_symbols/static_symbols.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698