Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: client/bin/base_sysinfo.py

Issue 6551020: Merge remote branch 'autotest-upstream/master' into try-box1 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | client/bin/base_utils.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 import os, shutil, re, glob, subprocess, logging 1 import os, shutil, re, glob, subprocess, logging
2 2
3 from autotest_lib.client.common_lib import log 3 from autotest_lib.client.common_lib import log
4 from autotest_lib.client.bin import utils, package 4 from autotest_lib.client.bin import utils, package
5 5
6 6
7 _DEFAULT_COMMANDS_TO_LOG_PER_TEST = [] 7 _DEFAULT_COMMANDS_TO_LOG_PER_TEST = []
8 _DEFAULT_COMMANDS_TO_LOG_PER_BOOT = [ 8 _DEFAULT_COMMANDS_TO_LOG_PER_BOOT = [
9 "lspci -vvn", "mount", "uptime", 9 "lspci -vvn", "gcc --version", "ld --version", "mount", "hostname",
10 "uptime",
10 ] 11 ]
11 _DEFAULT_COMMANDS_TO_LOG_BEFORE_ITERATION = [] 12 _DEFAULT_COMMANDS_TO_LOG_BEFORE_ITERATION = []
12 _DEFAULT_COMMANDS_TO_LOG_AFTER_ITERATION = [] 13 _DEFAULT_COMMANDS_TO_LOG_AFTER_ITERATION = []
13 14
14 _DEFAULT_FILES_TO_LOG_PER_TEST = [] 15 _DEFAULT_FILES_TO_LOG_PER_TEST = []
15 _DEFAULT_FILES_TO_LOG_PER_BOOT = [ 16 _DEFAULT_FILES_TO_LOG_PER_BOOT = [
16 "/proc/meminfo", "/proc/slabinfo", "/proc/version", "/proc/cpuinfo", 17 "/proc/pci", "/proc/meminfo", "/proc/slabinfo", "/proc/version",
17 "/proc/modules", "/proc/interrupts", "/proc/partitions", 18 "/proc/cpuinfo", "/proc/modules", "/proc/interrupts", "/proc/partitions",
18 ] 19 ]
19 _DEFAULT_FILES_TO_LOG_BEFORE_ITERATION = [ 20 _DEFAULT_FILES_TO_LOG_BEFORE_ITERATION = [
20 "/proc/schedstat", "/proc/meminfo", "/proc/slabinfo", "/proc/interrupts" 21 "/proc/schedstat", "/proc/meminfo", "/proc/slabinfo", "/proc/interrupts"
21 ] 22 ]
22 _DEFAULT_FILES_TO_LOG_AFTER_ITERATION = [ 23 _DEFAULT_FILES_TO_LOG_AFTER_ITERATION = [
23 "/proc/schedstat", "/proc/meminfo", "/proc/slabinfo", "/proc/interrupts" 24 "/proc/schedstat", "/proc/meminfo", "/proc/slabinfo", "/proc/interrupts"
24 ] 25 ]
25 26
26 27
27 class loggable(object): 28 class loggable(object):
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 match = re.search(r"^MemTotal:\s+(\d+) kB$", mem_data, 367 match = re.search(r"^MemTotal:\s+(\d+) kB$", mem_data,
367 re.MULTILINE) 368 re.MULTILINE)
368 if match: 369 if match:
369 keyval["sysinfo-memtotal-in-kb"] = match.group(1) 370 keyval["sysinfo-memtotal-in-kb"] = match.group(1)
370 371
371 # guess the system's total physical memory, including sys tables 372 # guess the system's total physical memory, including sys tables
372 keyval["sysinfo-phys-mbytes"] = utils.rounded_memtotal()//1024 373 keyval["sysinfo-phys-mbytes"] = utils.rounded_memtotal()//1024
373 374
374 # return what we collected 375 # return what we collected
375 return keyval 376 return keyval
OLDNEW
« no previous file with comments | « no previous file | client/bin/base_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698