diff options
author | David Reyna <David.Reyna@windriver.com> | 2014-02-14 14:58:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-09 12:23:58 -0700 |
commit | 438578e2997f718f4ab2f50f309364edb6e3b4f8 (patch) | |
tree | 11c0c21949ec5ea80cc0fa42289c502c657d6ebb /bitbake/lib/toaster/toastergui/templates/tasks.html | |
parent | 93aa4aba74843aff06434d03c4003a86439678c2 (diff) | |
download | ast2050-yocto-poky-438578e2997f718f4ab2f50f309364edb6e3b4f8.zip ast2050-yocto-poky-438578e2997f718f4ab2f50f309364edb6e3b4f8.tar.gz |
bitbake: toaster: extend Tasks to include Time, Disk IO, and CPU Usage
Update the All Tasks page to also cover the Time, Disk I/O, and
CPU Usage pages. Add filter count header support, and fix minor column
enablements.
[YOCTO #4387]
(Bitbake rev: 7e78836ebbddf0240094fd79a18cb057d6c4f322)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/tasks.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/tasks.html | 93 |
1 files changed, 47 insertions, 46 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 3479e7e..7dc2c38 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -1,60 +1,61 @@ {% extends "basebuildpage.html" %} {% load projecttags %} {% block localbreadcrumb %} -<li>All tasks</li> +<li>{{title}}</li> {% endblock %} {% block buildinfomain %} <div class="span10"> <div class="page-header"> -<h1> Tasks </h1> +<h1> + {% if request.GET.filter or request.GET.search and objects.count > 0 %} + {{objects.paginator.count}} task{{objects.paginator.count|pluralize}} found + {%elif objects.paginator.count == 0%} + No tasks + {%else%} + {{title}} + {%endif%} + </h1> </div> {% include "basetable_top.html" %} - - {% if not objects %} - <p>No tasks were executed in this build!</p> - {% else %} - {% for task in objects %} - <tr {{ task|task_color }} > - <td class="order"> - <a href="{%url "task" build.pk task.pk%} ">{{task.order}}</a> - </td> - <td class="recipe_name" > - <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.name}}</a> - </td> - <td class="recipe_version"> - <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> - </td> - <td class="task_name"> - <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> - </td> - <td class="executed"> - <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> - </td> - <td class="outcome"> - <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> - </td> - <td class="cache_attempt"> - <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> - </td> - <td class="time_taken"> - {{task.elapsed_time|format_none_and_zero}} - </td> - <td class="cpu_used"> - {{task.cpu_usage|format_none_and_zero}} - </td> - <td class="disk_io"> - {{task.disk_io|format_none_and_zero}} - </td> - <td class="task_log"> - {{task.logfile}} - </td> - </tr> - - {% endfor %} - - {% endif %} + {% for task in objects %} + <tr {{ task|task_color }} > + <td class="order"> + <a href="{%url "task" build.pk task.pk%} ">{{task.order}}</a> + </td> + <td class="recipe_name" > + <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.name}}</a> + </td> + <td class="recipe_version"> + <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a> + </td> + <td class="task_name"> + <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a> + </td> + <td class="executed"> + <a href="{%url "task" build.pk task.pk%} ">{{task.get_executed_display}}</a> + </td> + <td class="outcome"> + <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a> + </td> + <td class="cache_attempt"> + <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a> + </td> + <td class="time_taken"> + {{task.elapsed_time|format_none_and_zero|floatformat:2}} + </td> + <td class="cpu_used"> + {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %} + </td> + <td class="disk_io"> + {{task.disk_io|format_none_and_zero}} + </td> + <td class="task_log"> + {{task.logfile}} + </td> + </tr> + {% endfor %} {% include "basetable_bottom.html" %} </div> |