<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[244730] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/244730">244730</a></dd>
<dt>Author</dt> <dd>slewis@apple.com</dd>
<dt>Date</dt> <dd>2019-04-29 02:14:43 -0700 (Mon, 29 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>run-benchmarks should have an intial prep and restore env call for tasks that are too expensive to do for every iteration
https://bugs.webkit.org/show_bug.cgi?id=197339

Reviewed by Dewei Zhu.

Add two new functions prepare_inital_env and restore_env_after_all_testing around the entire
test run for setup steps that are too expensive to do every iteration.

* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner._run_benchmark):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
(BrowserDriver):
(BrowserDriver.prepare_initial_env):
(BrowserDriver.restore_env_after_all_testing):
* Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
(LinuxBrowserDriver.prepare_initial_env):
(LinuxBrowserDriver.restore_env_after_all_testing):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.prepare_initial_env):
(OSXBrowserDriver.restore_env_after_all_testing):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverlinux_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (244729 => 244730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-29 08:36:32 UTC (rev 244729)
+++ trunk/Tools/ChangeLog       2019-04-29 09:14:43 UTC (rev 244730)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-04-26  Stephanie Lewis  <slewis@apple.com>
+
+        run-benchmarks should have an intial prep and restore env call for tasks that are too expensive to do for every iteration
+        https://bugs.webkit.org/show_bug.cgi?id=197339
+
+        Reviewed by Dewei Zhu.
+
+        Add two new functions prepare_inital_env and restore_env_after_all_testing around the entire
+        test run for setup steps that are too expensive to do every iteration.
+
+        * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+        (BenchmarkRunner._run_benchmark):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+        (BrowserDriver):
+        (BrowserDriver.prepare_initial_env):
+        (BrowserDriver.restore_env_after_all_testing):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
+        (LinuxBrowserDriver.prepare_initial_env):
+        (LinuxBrowserDriver.restore_env_after_all_testing):
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+        (OSXBrowserDriver.prepare_initial_env):
+        (OSXBrowserDriver.restore_env_after_all_testing):
+
</ins><span class="cx"> 2019-04-28  Andy Estes  <aestes@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix the watchOS engineering build.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (244729 => 244730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py        2019-04-29 08:36:32 UTC (rev 244729)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py   2019-04-29 09:14:43 UTC (rev 244730)
</span><span class="lines">@@ -77,32 +77,36 @@
</span><span class="cx">     def _run_benchmark(self, count, web_root):
</span><span class="cx">         results = []
</span><span class="cx">         debug_outputs = []
</span><del>-        for iteration in xrange(1, count + 1):
-            _log.info('Start the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
-            try:
-                self._browser_driver.prepare_env(self._config)
</del><ins>+        try:
+            self._browser_driver.prepare_initial_env(self._config)
+            for iteration in xrange(1, count + 1):
+                _log.info('Start the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
+                try:
+                    self._browser_driver.prepare_env(self._config)
</ins><span class="cx"> 
</span><del>-                if 'entry_point' in self._plan:
-                    result = self._run_one_test(web_root, self._plan['entry_point'])
-                    debug_outputs.append(result.pop('debugOutput', None))
-                    assert(result)
-                    results.append(result)
-                elif 'test_files' in self._plan:
-                    run_result = {}
-                    for test in self._plan['test_files']:
-                        result = self._run_one_test(web_root, test)
</del><ins>+                    if 'entry_point' in self._plan:
+                        result = self._run_one_test(web_root, self._plan['entry_point'])
+                        debug_outputs.append(result.pop('debugOutput', None))
</ins><span class="cx">                         assert(result)
</span><del>-                        run_result = self._merge(run_result, result)
-                        debug_outputs.append(result.pop('debugOutput', None))
</del><ins>+                        results.append(result)
+                    elif 'test_files' in self._plan:
+                        run_result = {}
+                        for test in self._plan['test_files']:
+                            result = self._run_one_test(web_root, test)
+                            assert(result)
+                            run_result = self._merge(run_result, result)
+                            debug_outputs.append(result.pop('debugOutput', None))
</ins><span class="cx"> 
</span><del>-                    results.append(run_result)
-                else:
-                    raise Exception('Plan does not contain entry_point or test_files')
</del><ins>+                        results.append(run_result)
+                    else:
+                        raise Exception('Plan does not contain entry_point or test_files')
</ins><span class="cx"> 
</span><del>-            finally:
-                self._browser_driver.restore_env()
</del><ins>+                finally:
+                    self._browser_driver.restore_env()
</ins><span class="cx"> 
</span><del>-            _log.info('End the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
</del><ins>+                _log.info('End the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
+        finally:
+            self._browser_driver.restore_env_after_all_testing()
</ins><span class="cx"> 
</span><span class="cx">         results = self._wrap(results)
</span><span class="cx">         output_file = self._output_file if self._output_file else self._plan['output_file']
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (244729 => 244730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py   2019-04-29 08:36:32 UTC (rev 244729)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py      2019-04-29 09:14:43 UTC (rev 244730)
</span><span class="lines">@@ -15,6 +15,10 @@
</span><span class="cx">         pass
</span><span class="cx"> 
</span><span class="cx">     @abstractmethod
</span><ins>+    def prepare_initial_env(self, config):
+        pass
+
+    @abstractmethod
</ins><span class="cx">     def launch_url(self, url, options, browser_build_path=None, browser_path=None):
</span><span class="cx">         pass
</span><span class="cx"> 
</span><span class="lines">@@ -34,6 +38,10 @@
</span><span class="cx">     def restore_env(self):
</span><span class="cx">         pass
</span><span class="cx"> 
</span><ins>+    @abstractmethod
+    def restore_env_after_all_testing(self):
+        pass
+
</ins><span class="cx">     @property
</span><span class="cx">     def webdriver_binary_path(self):
</span><span class="cx">         return get_driver_binary_path(self.browser_name)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverlinux_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py (244729 => 244730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py     2019-04-29 08:36:32 UTC (rev 244729)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py        2019-04-29 09:14:43 UTC (rev 244730)
</span><span class="lines">@@ -58,9 +58,15 @@
</span><span class="cx">         self._test_environ = dict(os.environ)
</span><span class="cx">         self._test_environ['HOME'] = self._temp_profiledir
</span><span class="cx"> 
</span><ins>+    def prepare_initial_env(self, config):
+        pass
+
</ins><span class="cx">     def restore_env(self):
</span><span class="cx">         force_remove(self._temp_profiledir)
</span><span class="cx"> 
</span><ins>+    def restore_env_after_all_testing(self):
+        pass
+
</ins><span class="cx">     def close_browsers(self):
</span><span class="cx">         if self._browser_process:
</span><span class="cx">             if self._browser_process.poll() is None:  # still running
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (244729 => 244730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py       2019-04-29 08:36:32 UTC (rev 244729)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py  2019-04-29 09:14:43 UTC (rev 244730)
</span><span class="lines">@@ -16,6 +16,9 @@
</span><span class="cx">     platform = 'osx'
</span><span class="cx">     bundle_id = None
</span><span class="cx"> 
</span><ins>+    def prepare_initial_env(self, config):
+        pass
+
</ins><span class="cx">     def prepare_env(self, config):
</span><span class="cx">         self.close_browsers()
</span><span class="cx">         from Quartz import CGWarpMouseCursorPosition
</span><span class="lines">@@ -29,6 +32,9 @@
</span><span class="cx">             write_defaults('com.apple.dock', 'launchanim', True)
</span><span class="cx">             self._terminate_processes('Dock', 'com.apple.dock')
</span><span class="cx"> 
</span><ins>+    def restore_env_after_all_testing(self):
+        pass
+
</ins><span class="cx">     def close_browsers(self):
</span><span class="cx">         self._terminate_processes(self.process_name, self.bundle_id)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>