diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 23:28:23 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 23:28:23 +0000 |
| commit | e9bb0560185f6a3c33528dd1991c29d63e65d1e0 (patch) | |
| tree | b306c13e7ca3293538256f45528bc574ad73210d | |
| parent | e3d0f8259048334843da7afa7563582fb23280bd (diff) | |
| download | chromium_src-e9bb0560185f6a3c33528dd1991c29d63e65d1e0.zip chromium_src-e9bb0560185f6a3c33528dd1991c29d63e65d1e0.tar.gz chromium_src-e9bb0560185f6a3c33528dd1991c29d63e65d1e0.tar.bz2 | |
[Telemetry] Terminate browsers more aggressively.
This is safe to do when we're sure the profile will never be reused
and speeds up telemetry_unittests by about 7%.
BUG=388256
Review URL: https://codereview.chromium.org/476903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289720 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py index 2222403..b1ab679 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py +++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py @@ -317,8 +317,8 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): def Close(self): super(DesktopBrowserBackend, self).Close() - # First, try to politely shutdown. - if self.IsBrowserRunning(): + # Shutdown politely if the profile may be used again. + if self._output_profile_path and self.IsBrowserRunning(): self._proc.terminate() try: util.WaitFor(lambda: not self.IsBrowserRunning(), timeout=5) @@ -326,7 +326,7 @@ class DesktopBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): except util.TimeoutException: logging.warning('Failed to gracefully shutdown. Proceeding to kill.') - # If it didn't comply, get more aggressive. + # Shutdown aggressively if the above failed or if the profile is temporary. if self.IsBrowserRunning(): self._proc.kill() |