[pypy-svn] r71498 - in codespeed: pyspeed/codespeed pyspeed/media/images pyspeed/templates tools
tobami at codespeak.net
tobami at codespeak.net
Thu Feb 25 17:48:44 CET 2010
Author: tobami
Date: Thu Feb 25 17:48:40 2010
New Revision: 71498
Modified:
codespeed/pyspeed/codespeed/views.py
codespeed/pyspeed/media/images/gridline_units.png
codespeed/pyspeed/templates/base.html
codespeed/pyspeed/templates/overview.html
codespeed/pyspeed/templates/overview_table.html
codespeed/pyspeed/templates/timeline.html
codespeed/tools/import_from_json.py
Log:
overview table header improvements. Configuration changes based on feedback. Metatags
Modified: codespeed/pyspeed/codespeed/views.py
==============================================================================
--- codespeed/pyspeed/codespeed/views.py (original)
+++ codespeed/pyspeed/codespeed/views.py Thu Feb 25 17:48:40 2010
@@ -50,6 +50,7 @@
data = request.GET
# Configuration of default parameters
+ defaulthost = 1
defaultbenchmark = 1
if data.has_key("benchmark"):
try:
@@ -65,8 +66,8 @@
if len(selected): defaultinterpreters.append(selected[0].id)
if not len(defaultinterpreters): defaultinterpreters = [2]
- lastrevisions = [20, 50, 100]
- defaultlast = 50
+ lastrevisions = [50, 200, 1000]
+ defaultlast = 200
if data.has_key("lastrevisions"):
if data["lastrevisions"] in lastrevisions:
defaultlast = data["lastrevisions"]
@@ -163,8 +164,9 @@
data = request.GET
# Configuration of default parameters
+ defaulthost = 1
defaulttrend = 10
- trends = [5, 10, 20]
+ trends = [5, 10, 20, 100]
if data.has_key("trend"):
if data["trend"] in trends:
defaulttrend = int(request.GET["trend"])
Modified: codespeed/pyspeed/media/images/gridline_units.png
==============================================================================
Binary files. No diff available.
Modified: codespeed/pyspeed/templates/base.html
==============================================================================
--- codespeed/pyspeed/templates/base.html (original)
+++ codespeed/pyspeed/templates/base.html Thu Feb 25 17:48:40 2010
@@ -1,14 +1,15 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
-<title>{% block title %}PyPy Speed{% endblock %}</title>
+<title>{% block title %}PyPy Speed Center{% endblock %}</title>
+<meta name="description" content="A performance analysis tool for the project PyPy. It shows performance regresions and alows comparing the different Python implementations and interpreters." />
+<meta name="keywords" content="performance, test, pypy, python, interpreter, plots, charts" />
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<!-- <link href="/media/css/main2.css" rel="alternate stylesheet" type="text/css" title="default" /> -->
<!-- <link href="/media/css/main3.css" rel="alternate stylesheet" type="text/css" title="main3" /> -->
<link href="/media/css/main.css" rel="stylesheet" type="text/css" />
-
<script type="text/javascript" src="/media/js/jquery-1.4.1.min.js"></script>
<script language="javascript" type="text/javascript" src="/media/js/ued_encode.js"></script>
<script type="text/javascript" src="/media/js/codespeed.js"></script>
@@ -38,7 +39,6 @@
</div>
{% block footer %}
{% endblock %}
-<!-- <div style="clear: both;"> -->
</div>
</body>
</html>
Modified: codespeed/pyspeed/templates/overview.html
==============================================================================
--- codespeed/pyspeed/templates/overview.html (original)
+++ codespeed/pyspeed/templates/overview.html Thu Feb 25 17:48:40 2010
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% block title %}PyPy Speed Center: Overview{% endblock %}
{% block script %}
<script type="text/javascript" src="/media/js/jquery.tablesorter.min.js"></script>
<script type="text/javascript">
@@ -60,7 +61,7 @@
cache: false
});
- h = parseInt($("#content").css("height"));//get height for loading text
+ var h = parseInt($("#content").css("height"));//get height for loading text
$("#results").fadeOut("fast", function() {
$("#content").html(getLoadText("Loading...", h));
});
@@ -75,6 +76,8 @@
$("#revision").change(refreshContent);
$("input:radio[name=interpreter]").filter('[value={{ defaultinterpreter }}]').attr('checked', true);
$("input[name='interpreter']").change(refreshContent);
+ $("input:radio[name=host]").filter('[value={{ defaulthost }}]').attr('checked', true);
+ $("input[name='host']").change(refreshContent);
refreshContent();
});
@@ -98,31 +101,34 @@
<div class="boxbody">
{% for inter in interpreters %}
<input id="interpreter{{ inter.id }}" type="radio" name="interpreter" value="{{ inter.id }}" />
- <label for="interpreter{{ inter.id }}">{{ inter }}</label>
+ <label for="interpreter{{ inter.id }}">{{ inter.name }}</label>
<br>
{% endfor %}
</div>
</div>
-<div class="sidebox">
- <div class="boxhead"><h2>Host</h2></div>
- <div class="boxbody">
- <ul>
- {% for host in hostlist %} <li>{{ host }}</li>{% endfor %}
- </ul>
- </div>
-</div>
<div id="options" class="sidebox">
<div class="boxhead"><h2>Options</h2></div>
<div class="boxbody">
<ul>
- <li title="Trend since {{ defaulttrend }} tested revisions ago. Average of 3 revisions">Trend:
+ <li title="Trend since a given number of tested revisions ago. Average of 3 revisions">Trend:
<select id="trend">
- {% for trend in trends %}<option value="{{ trend }}">{{ trend }}</option><br>{% endfor %}
+ {% for trend in trends %}<option value="{{ trend }}">{{ trend }}</option>{% endfor %}
</select>
</li>
</ul>
</div>
</div>
+<div class="sidebox">
+ <div class="boxhead"><h2>Host</h2></div>
+ <div class="boxbody">
+ {% for host in hostlist %}
+ <input id="host{{ host.id }}" type="radio" name="host" value="{{ host.id }}" />
+ <label for="host{{ host.id }}">{{ host }}</label>
+ <br>
+ {% endfor %}
+ </div>
+</div>
+
</div>
<div id="configbar">Results for revision
Modified: codespeed/pyspeed/templates/overview_table.html
==============================================================================
--- codespeed/pyspeed/templates/overview_table.html (original)
+++ codespeed/pyspeed/templates/overview_table.html Thu Feb 25 17:48:40 2010
@@ -1,7 +1,7 @@
<table id="results" class="tablesorter">
<thead>
<tr>
- <th class="w">Benchmark</th><th class="w">Result (s)</th><th class="w">Current change</th><th class="w">Trend</th><th class="w">Times cpython</th><th class="bar">(logarithmic base 2)</th>
+ <th class="w">Benchmark</th><th class="w">Time (s)</th><th class="w">Current change</th><th class="w">Trend ({{ trendconfig }})</th><th class="w" title="Compared to cpython">Times cpython</th><th class="bar" title="Compared to cpython in log 2 scale"><div style="float:left;font-size:smaller;">slower</div><div style="float:left;margin-left:48px;">(log<sub>2</sub> scale)</div><div style="float:left;margin-left:60px;font-size:smaller;">faster</div></th>
</tr>
</thead>
<tbody>
Modified: codespeed/pyspeed/templates/timeline.html
==============================================================================
--- codespeed/pyspeed/templates/timeline.html (original)
+++ codespeed/pyspeed/templates/timeline.html Thu Feb 25 17:48:40 2010
@@ -1,4 +1,5 @@
{% extends "base.html" %}
+{% block title %}PyPy Speed Center: Timeline{% endblock %}
{% block script %}
<script type="text/javascript" src="/media/js/jquery-1.4.1.min.js"></script>
<!--[if IE]><script language="javascript" type="text/javascript" src="excanvas.js"></script><![endif]-->
@@ -80,6 +81,8 @@
$("input[name='interpreter']").change(refreshContent);
$("input:radio[name='benchmark']").filter('[value={{ defaultbenchmark }}]').attr('checked', true);
$("input[name='benchmark']").change(refreshContent);
+ $("input:radio[name=host]").filter('[value={{ defaulthost }}]').attr('checked', true);
+ $("input[name='host']").change(refreshContent);
refreshContent();
});
@@ -101,7 +104,7 @@
<div class="boxbody"><ul>
{% for inter in interpreters %}<li>
<input id="interpreter{{ inter.id }}" type="checkbox" name="interpreter" value="{{ inter.id }}" />
- <label for="interpreter{{ inter.id }}">{{ inter }}</label></li>
+ <label for="interpreter{{ inter.id }}">{{ inter.name }}</label></li>
{% endfor %}
</ul>
</div>
@@ -118,10 +121,12 @@
</div>
<div class="sidebox">
<div class="boxhead"><h2>Host</h2></div>
- <div class="boxbody">
- <ul>
- {% for host in hostlist %} <li>{{ host }}</li>{% endfor %}
- </ul>
+ <div class="boxbody">
+ {% for host in hostlist %}
+ <input id="host{{ host.id }}" type="radio" name="host" value="{{ host.id }}" />
+ <label for="host{{ host.id }}">{{ host }}</label>
+ <br>
+ {% endfor %}
</div>
</div>
</div>
Modified: codespeed/tools/import_from_json.py
==============================================================================
--- codespeed/tools/import_from_json.py (original)
+++ codespeed/tools/import_from_json.py Thu Feb 25 17:48:40 2010
@@ -5,9 +5,9 @@
from datetime import datetime
RESULTS_URL = 'http://buildbot.pypy.org/bench_results/'
-SPEEDURL = 'http://speed.pypy.org/'# This will be pyspeed.pypy.org/
+SPEEDURL = 'http://speed.pypy.org/'
SAVE_CPYTHON = False
-START_REV = 71392
+START_REV = 71480
def saveresult(data):
params = urllib.urlencode(data)
More information about the Pypy-commit
mailing list