tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py - Issue 1254843002: telemetry: Fix killing the perf profiler

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py

Issue 1254843002: telemetry: Fix killing the perf profiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change GetPids instead. Created 5 years, 5 months 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

« build/android/pylib/device/device_utils.py ('K') | « tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py ('k') | tools/telemetry/telemetry/internal/platform/profiler/tcpdump_profiler.py » ('j') | tools/telemetry/telemetry/internal/platform/profiler/tcpdump_profiler.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py

diff --git a/tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py b/tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py

index 03891400daf9687890287c5129507a195e9e63ff..8a699eb513a3d2f35f848d86b1ad67ec09e7ac4c 100644

--- a/tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py

+++ b/tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py

@@ -107,7 +107,8 @@ class _SingleProcessPerfProfiler(object):

device = self._browser_backend.device

try:

binary_name = os.path.basename(self._perf_binary)

- device.KillAll(binary_name, signum=signal.SIGINT, blocking=True)

+ if device.GetPids(binary_name):

+ device.KillAll(binary_name, signum=signal.SIGINT, blocking=True)

except device_errors.CommandFailedError:

logging.warning('The perf process could not be killed on the device.')

self._proc.send_signal(signal.SIGINT)