| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import datetime | 5 import datetime |
| 6 import logging | 6 import logging |
| 7 import re | 7 import re |
| 8 import utils | 8 import utils |
| 9 from autotest_lib.client.bin import test | 9 from autotest_lib.client.bin import test |
| 10 from autotest_lib.client.common_lib import error | 10 from autotest_lib.client.common_lib import error |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 ('seconds_kernel_to_startup', '/tmp/uptime-pre-startup'), | 106 ('seconds_kernel_to_startup', '/tmp/uptime-pre-startup'), |
| 107 ('seconds_kernel_to_startup_done', '/tmp/uptime-post-startup'), | 107 ('seconds_kernel_to_startup_done', '/tmp/uptime-post-startup'), |
| 108 ('seconds_kernel_to_x_started', '/tmp/uptime-x-started'), | 108 ('seconds_kernel_to_x_started', '/tmp/uptime-x-started'), |
| 109 ('seconds_kernel_to_chrome_exec', '/tmp/uptime-chrome-exec'), | 109 ('seconds_kernel_to_chrome_exec', '/tmp/uptime-chrome-exec'), |
| 110 ('seconds_kernel_to_chrome_main', '/tmp/uptime-chrome-main'), | 110 ('seconds_kernel_to_chrome_main', '/tmp/uptime-chrome-main'), |
| 111 ('seconds_kernel_to_login', '/tmp/uptime-login-prompt-ready')] | 111 ('seconds_kernel_to_login', '/tmp/uptime-login-prompt-ready')] |
| 112 | 112 |
| 113 for resultname, filename in uptime_files: | 113 for resultname, filename in uptime_files: |
| 114 results[resultname] = self.__parse_uptime(filename) | 114 results[resultname] = self.__parse_uptime(filename) |
| 115 | 115 |
| 116 # Not all 'uptime-network-*-ready' files necessarily exist; |
| 117 # probably there's only one. We go through a list of |
| 118 # possibilities and pick the first one we find. We're not |
| 119 # looking for 3G here, so we're not guaranteed to find any |
| 120 # file. |
| 121 network_time_files = [ |
| 122 '/tmp/uptime-network-wifi-ready', |
| 123 '/tmp/uptime-network-ethernet-ready' ] |
| 124 |
| 125 for filename in network_time_files: |
| 126 try: |
| 127 network_time = self.__parse_uptime(filename) |
| 128 results['seconds_kernel_to_network'] = network_time |
| 129 break |
| 130 except error.TestFail: |
| 131 pass |
| 132 |
| 116 diskstat_files = [ | 133 diskstat_files = [ |
| 117 ('sectors_read_kernel_to_startup', '/tmp/disk-pre-startup'), | 134 ('sectors_read_kernel_to_startup', '/tmp/disk-pre-startup'), |
| 118 ('sectors_read_kernel_to_startup_done', '/tmp/disk-post-startup'), | 135 ('sectors_read_kernel_to_startup_done', '/tmp/disk-post-startup'), |
| 119 ('sectors_read_kernel_to_chrome_exec', '/tmp/disk-chrome-exec'), | 136 ('sectors_read_kernel_to_chrome_exec', '/tmp/disk-chrome-exec'), |
| 120 ('sectors_read_kernel_to_chrome_main', '/tmp/disk-chrome-main'), | 137 ('sectors_read_kernel_to_chrome_main', '/tmp/disk-chrome-main'), |
| 121 ('sectors_read_kernel_to_login', '/tmp/disk-login-prompt-ready')] | 138 ('sectors_read_kernel_to_login', '/tmp/disk-login-prompt-ready')] |
| 122 | 139 |
| 123 for resultname, filename in diskstat_files: | 140 for resultname, filename in diskstat_files: |
| 124 results[resultname] = self.__parse_diskstat(filename) | 141 results[resultname] = self.__parse_diskstat(filename) |
| 125 | 142 |
| 126 self.__parse_firmware_boot_time(results) | 143 self.__parse_firmware_boot_time(results) |
| 127 self.__parse_syslog(results, last_boot_was_reboot) | 144 self.__parse_syslog(results, last_boot_was_reboot) |
| 128 | 145 |
| 129 if ('seconds_firmware_boot' in results and | 146 if ('seconds_firmware_boot' in results and |
| 130 'seconds_kernel_to_login' in results): | 147 'seconds_kernel_to_login' in results): |
| 131 results['seconds_power_on_to_login'] = \ | 148 results['seconds_power_on_to_login'] = \ |
| 132 results['seconds_firmware_boot'] + \ | 149 results['seconds_firmware_boot'] + \ |
| 133 results['seconds_kernel_to_login'] | 150 results['seconds_kernel_to_login'] |
| 134 | 151 |
| 135 self.write_perf_keyval(results) | 152 self.write_perf_keyval(results) |
| OLD | NEW |