summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 18:54:07 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-28 18:54:07 +0000
commita224c54fa4fc25f8f51c285b510cd850a2c48472 (patch)
treeacdebdb7cd9f5b645320ccf44eb00246b5b22069 /tools
parent52bb3cc633a918c1b1f05ee83604a026befd2ea3 (diff)
downloadchromium_src-a224c54fa4fc25f8f51c285b510cd850a2c48472.zip
chromium_src-a224c54fa4fc25f8f51c285b510cd850a2c48472.tar.gz
chromium_src-a224c54fa4fc25f8f51c285b510cd850a2c48472.tar.bz2
Add new (core dumped) suffix in strace logs.
This started appearing in ubuntu 12.04 for whatever version of strace it includes (4.5.20). R=cmp@chromium.org NOTRY=true BUG= Review URL: https://chromiumcodereview.appspot.com/10871094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-xtools/isolate/trace_inputs.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/isolate/trace_inputs.py b/tools/isolate/trace_inputs.py
index 05c652b..b54e936 100755
--- a/tools/isolate/trace_inputs.py
+++ b/tools/isolate/trace_inputs.py
@@ -1032,7 +1032,8 @@ class Strace(ApiBase):
RE_SIGNAL = re.compile(r'^--- SIG[A-Z]+ .+ ---')
# A process didn't handle a signal. Ignore any junk appearing before,
# because the process was forcibly killed so it won't open any new file.
- RE_KILLED = re.compile(r'^.*\+\+\+ killed by ([A-Z]+) \+\+\+$')
+ RE_KILLED = re.compile(
+ r'^.*\+\+\+ killed by ([A-Z]+)( \(core dumped\))? \+\+\+$')
# A call was canceled. Ignore any prefix.
RE_UNAVAILABLE = re.compile(r'^.*\)\s*= \? <unavailable>$')
# Happens when strace fails to even get the function name.
@@ -1141,7 +1142,7 @@ class Strace(ApiBase):
try:
match = self.RE_KILLED.match(line)
if match:
- # Converts a '+++ killied by Foo +++' trace into an exit_group().
+ # Converts a '+++ killed by Foo +++' trace into an exit_group().
self.handle_exit_group(match.group(1), None)
return