diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/tasks.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 353410f92a..23eb957567 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html | |||
@@ -1,4 +1,5 @@ | |||
1 | {% extends "basebuildpage.html" %} | 1 | {% extends "basebuildpage.html" %} |
2 | {% load humanize %} | ||
2 | {% load projecttags %} | 3 | {% load projecttags %} |
3 | 4 | ||
4 | {% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %} | 5 | {% block title %} {{mainheading}} - {{build.target_set.all|dictsort:"target"|join:", "}} {{build.machine}} - {{build.project.name}} - Toaster{% endblock %} |
@@ -20,13 +21,15 @@ | |||
20 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> | 21 | <li><a href="{% url 'buildtime' build.pk %}">Time</a></li> |
21 | {% endif %} | 22 | {% endif %} |
22 | {% endblock %} | 23 | {% endblock %} |
23 | {% block nav-cpuusage %} | 24 | |
24 | {% if 'CPU usage' == mainheading %} | 25 | {% block nav-cputime %} |
25 | <li class="active"><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> | 26 | {% if 'CPU time' == mainheading %} |
27 | <li class="active"><a href="{% url 'cputime' build.pk %}">CPU time</a></li> | ||
26 | {% else %} | 28 | {% else %} |
27 | <li><a href="{% url 'cpuusage' build.pk %}">CPU usage</a></li> | 29 | <li><a href="{% url 'cputime' build.pk %}">CPU time</a></li> |
28 | {% endif %} | 30 | {% endif %} |
29 | {% endblock %} | 31 | {% endblock %} |
32 | |||
30 | {% block nav-diskio %} | 33 | {% block nav-diskio %} |
31 | {% if 'Disk I/O' == mainheading %} | 34 | {% if 'Disk I/O' == mainheading %} |
32 | <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> | 35 | <li class="active"><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> |
@@ -107,11 +110,14 @@ | |||
107 | <td class="time_taken"> | 110 | <td class="time_taken"> |
108 | {{task.elapsed_time|format_none_and_zero|floatformat:2}} | 111 | {{task.elapsed_time|format_none_and_zero|floatformat:2}} |
109 | </td> | 112 | </td> |
110 | <td class="cpu_used"> | 113 | <td class="cpu_time_system"> |
111 | {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %} | 114 | {{task.cpu_time_system|format_none_and_zero|floatformat:2}} |
115 | </td> | ||
116 | <td class="cpu_time_user"> | ||
117 | {{task.cpu_time_user|format_none_and_zero|floatformat:2}} | ||
112 | </td> | 118 | </td> |
113 | <td class="disk_io"> | 119 | <td class="disk_io"> |
114 | {{task.disk_io|format_none_and_zero}} | 120 | {{task.disk_io|format_none_and_zero|intcomma}} |
115 | </td> | 121 | </td> |
116 | 122 | ||
117 | </tr> | 123 | </tr> |