diff options
Diffstat (limited to 'bitbake/lib/toaster/orm')
-rw-r--r-- | bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py | 48 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 18 |
2 files changed, 64 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py b/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py new file mode 100644 index 0000000000..fb1196b566 --- /dev/null +++ b/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py | |||
@@ -0,0 +1,48 @@ | |||
1 | # -*- coding: utf-8 -*- | ||
2 | from __future__ import unicode_literals | ||
3 | |||
4 | from django.db import migrations, models | ||
5 | |||
6 | |||
7 | class Migration(migrations.Migration): | ||
8 | |||
9 | dependencies = [ | ||
10 | ('orm', '0004_provides'), | ||
11 | ] | ||
12 | |||
13 | operations = [ | ||
14 | migrations.RemoveField( | ||
15 | model_name='task', | ||
16 | name='cpu_usage', | ||
17 | ), | ||
18 | migrations.AddField( | ||
19 | model_name='task', | ||
20 | name='cpu_time_system', | ||
21 | field=models.DecimalField(null=True, max_digits=8, decimal_places=2), | ||
22 | ), | ||
23 | migrations.AddField( | ||
24 | model_name='task', | ||
25 | name='cpu_time_user', | ||
26 | field=models.DecimalField(null=True, max_digits=8, decimal_places=2), | ||
27 | ), | ||
28 | migrations.AddField( | ||
29 | model_name='task', | ||
30 | name='disk_io_read', | ||
31 | field=models.IntegerField(null=True), | ||
32 | ), | ||
33 | migrations.AddField( | ||
34 | model_name='task', | ||
35 | name='disk_io_write', | ||
36 | field=models.IntegerField(null=True), | ||
37 | ), | ||
38 | migrations.AddField( | ||
39 | model_name='task', | ||
40 | name='ended', | ||
41 | field=models.DateTimeField(null=True), | ||
42 | ), | ||
43 | migrations.AddField( | ||
44 | model_name='task', | ||
45 | name='started', | ||
46 | field=models.DateTimeField(null=True), | ||
47 | ), | ||
48 | ] | ||
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index f9c4fb0508..cfc6ea87c2 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -723,9 +723,23 @@ class Task(models.Model): | |||
723 | work_directory = models.FilePathField(max_length=255, blank=True) | 723 | work_directory = models.FilePathField(max_length=255, blank=True) |
724 | script_type = models.IntegerField(choices=TASK_CODING, default=CODING_NA) | 724 | script_type = models.IntegerField(choices=TASK_CODING, default=CODING_NA) |
725 | line_number = models.IntegerField(default=0) | 725 | line_number = models.IntegerField(default=0) |
726 | disk_io = models.IntegerField(null=True) | 726 | |
727 | cpu_usage = models.DecimalField(max_digits=8, decimal_places=2, null=True) | 727 | # start/end times |
728 | started = models.DateTimeField(null=True) | ||
729 | ended = models.DateTimeField(null=True) | ||
730 | |||
731 | # in seconds; this is stored to enable sorting | ||
728 | elapsed_time = models.DecimalField(max_digits=8, decimal_places=2, null=True) | 732 | elapsed_time = models.DecimalField(max_digits=8, decimal_places=2, null=True) |
733 | |||
734 | # in bytes; note that disk_io is stored to enable sorting | ||
735 | disk_io = models.IntegerField(null=True) | ||
736 | disk_io_read = models.IntegerField(null=True) | ||
737 | disk_io_write = models.IntegerField(null=True) | ||
738 | |||
739 | # in seconds | ||
740 | cpu_time_user = models.DecimalField(max_digits=8, decimal_places=2, null=True) | ||
741 | cpu_time_system = models.DecimalField(max_digits=8, decimal_places=2, null=True) | ||
742 | |||
729 | sstate_result = models.IntegerField(choices=SSTATE_RESULT, default=SSTATE_NA) | 743 | sstate_result = models.IntegerField(choices=SSTATE_RESULT, default=SSTATE_NA) |
730 | message = models.CharField(max_length=240) | 744 | message = models.CharField(max_length=240) |
731 | logfile = models.FilePathField(max_length=255, blank=True) | 745 | logfile = models.FilePathField(max_length=255, blank=True) |