<!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>[179583] trunk/Websites/perf.webkit.org</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/179583">179583</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-03 17:17:44 -0800 (Tue, 03 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>/api/runs.php should have main function
https://bugs.webkit.org/show_bug.cgi?id=141220
Reviewed by Benjamin Poulain.
Wrapped the code inside main function for clarity.
* public/api/runs.php:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapirunsphp">trunk/Websites/perf.webkit.org/public/api/runs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (179582 => 179583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2015-02-04 00:57:55 UTC (rev 179582)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2015-02-04 01:17:44 UTC (rev 179583)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-02-03 Ryosuke Niwa <rniwa@webkit.org>
+
+ /api/runs.php should have main function
+ https://bugs.webkit.org/show_bug.cgi?id=141220
+
+ Reviewed by Benjamin Poulain.
+
+ Wrapped the code inside main function for clarity.
+
+ * public/api/runs.php:
+
</ins><span class="cx"> 2015-01-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix. "eta" isn't set on a in-progress build on a newly added builder.
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapirunsphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/runs.php (179582 => 179583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/runs.php 2015-02-04 00:57:55 UTC (rev 179582)
+++ trunk/Websites/perf.webkit.org/public/api/runs.php 2015-02-04 01:17:44 UTC (rev 179583)
</span><span class="lines">@@ -2,37 +2,6 @@
</span><span class="cx">
</span><span class="cx"> require('../include/json-header.php');
</span><span class="cx">
</span><del>-$paths = array_key_exists('PATH_INFO', $_SERVER) ? explode('/', trim($_SERVER['PATH_INFO'], '/')) : array();
-
-if (count($paths) != 1)
- exit_with_error('InvalidRequest');
-
-$parts = explode('-', $paths[0]);
-if (count($parts) != 2)
- exit_with_error('InvalidRequest');
-
-$db = new Database;
-if (!$db->connect())
- exit_with_error('DatabaseConnectionFailure');
-
-// FIXME: We should support revalication as well as caching results in the server side.
-$maxage = config('jsonCacheMaxAge');
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $maxage) . ' GMT');
-header("Cache-Control: maxage=$maxage");
-
-$platform_id = intval($parts[0]);
-$metric_id = intval($parts[1]);
-$config_rows = $db->query_and_fetch_all('SELECT config_id, config_type, config_platform, config_metric
- FROM test_configurations WHERE config_metric = $1 AND config_platform = $2', array($metric_id, $platform_id));
-if (!$config_rows)
- exit_with_error('ConfigurationNotFound');
-
-$repository_id_to_name = array();
-if ($repository_table = $db->fetch_table('repositories')) {
- foreach ($repository_table as $repository)
- $repository_id_to_name[$repository['repository_id']] = $repository['repository_name'];
-}
-
</del><span class="cx"> function fetch_runs_for_config($db, $config) {
</span><span class="cx"> $raw_runs = $db->query_and_fetch_all('
</span><span class="cx"> SELECT test_runs.*, builds.*, array_agg((commit_repository, commit_revision, commit_time)) AS revisions
</span><span class="lines">@@ -81,12 +50,45 @@
</span><span class="cx"> 'builder' => $run['build_builder']);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$results = array();
-foreach ($config_rows as $config) {
- if ($runs = fetch_runs_for_config($db, $config))
- $results[$config['config_type']] = $runs;
</del><ins>+function main($path) {
+ if (count($path) != 1)
+ exit_with_error('InvalidRequest');
+
+ $parts = explode('-', $path[0]);
+ if (count($parts) != 2)
+ exit_with_error('InvalidRequest');
+
+ $db = new Database;
+ if (!$db->connect())
+ exit_with_error('DatabaseConnectionFailure');
+
+ // FIXME: We should support revalication as well as caching results in the server side.
+ $maxage = config('jsonCacheMaxAge');
+ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $maxage) . ' GMT');
+ header("Cache-Control: maxage=$maxage");
+
+ $platform_id = intval($parts[0]);
+ $metric_id = intval($parts[1]);
+ $config_rows = $db->query_and_fetch_all('SELECT config_id, config_type, config_platform, config_metric
+ FROM test_configurations WHERE config_metric = $1 AND config_platform = $2', array($metric_id, $platform_id));
+ if (!$config_rows)
+ exit_with_error('ConfigurationNotFound');
+
+ $repository_id_to_name = array();
+ if ($repository_table = $db->fetch_table('repositories')) {
+ foreach ($repository_table as $repository)
+ $repository_id_to_name[$repository['repository_id']] = $repository['repository_name'];
+ }
+
+ $results = array();
+ foreach ($config_rows as $config) {
+ if ($runs = fetch_runs_for_config($db, $config))
+ $results[$config['config_type']] = $runs;
+ }
+
+ exit_with_success($results);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-exit_with_success($results);
</del><ins>+main(array_key_exists('PATH_INFO', $_SERVER) ? explode('/', trim($_SERVER['PATH_INFO'], '/')) : array());
</ins><span class="cx">
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>