diff options
| author | Wei Wang <wvw@google.com> | 2020-08-06 22:26:31 -0700 |
|---|---|---|
| committer | Wei Wang <wvw@google.com> | 2020-08-06 22:35:03 -0700 |
| commit | 608ca95c4c97f1f709f352f28efa1668dd1e896f (patch) | |
| tree | 4fa9c28dddb69ec04d2f164d3f264fea8071691d /catapult/devil | |
| parent | fb769a160775b8e5db49d0cedff17c40283bcdcb (diff) | |
| download | chromium-trace-608ca95c4c97f1f709f352f28efa1668dd1e896f.tar.gz | |
Update catapult to latest version (c4d3ff474)
git log --oneline --no-merges 6dacd170b..c4d3ff474 tracing systrace
c4d3ff474 Fix systrace cgroup data
Bug: 162883505
Test: systrace
Change-Id: I48512cb243695f0da7b82972ee8720bb20da45c8
Diffstat (limited to 'catapult/devil')
| -rw-r--r-- | catapult/devil/devil/android/forwarder.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/catapult/devil/devil/android/forwarder.py b/catapult/devil/devil/android/forwarder.py index cdb7e4d5..bf4c5ca1 100644 --- a/catapult/devil/devil/android/forwarder.py +++ b/catapult/devil/devil/android/forwarder.py @@ -439,13 +439,13 @@ class Forwarder(object): # asked to kill dies sometime during pkill running. In this case, # re-running should result in pkill succeeding. logging.warning( - 'pkilling host forwarder returned -9, retrying. Output: %s', - output) + 'pkilling host forwarder returned -9, retrying through strace. ' + 'Output: %s', output) exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout( - kill_cmd, Forwarder._TIMEOUT) + ['strace', '-f', '-s', '256'] + kill_cmd, Forwarder._TIMEOUT) if exit_code in (0, 1): # pkill exits with a 0 if it was able to signal at least one process. - # pkill exits with a 1 if it wasn't able to singal a process because + # pkill exits with a 1 if it wasn't able to signal a process because # no matching process existed. We're ok with either. return |