diff options
author | cmtice <cmtice@google.com> | 2014-03-11 13:38:07 -0700 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-14 19:32:33 +0000 |
commit | 139092449a545d4d87c06af3a6d8f3d71e42e927 (patch) | |
tree | ede91dc3f94b8062ff60274bd57fca32cf9e8b41 /crosperf/results_cache.py | |
parent | 2317decf0e3f62297fc09a712bdf7fa253d560f3 (diff) | |
download | toolchain-utils-139092449a545d4d87c06af3a6d8f3d71e42e927.tar.gz |
Add --logging_level option to crosperf.
Add --logging_level={verbose, average, quiet} option to crosperf,
optionally reducing the amount of logging output. "verbose" gives
the same output Crosperf always gave; "quiet" gives minimal output, and
"average" is in the middle. The default for now is "verbose". Doing this
also involved adding logging levels to the command_executer, and to
image_chromeos (again, with the default being "verbose").
BUG=None
TEST=Tested all three levels of logging, with and without having to
reimage the DUT. It all worked properly.
Change-Id: Icf8c9a6831fe25202adcb624c6c7e1d1a7ac25a5
Reviewed-on: https://chrome-internal-review.googlesource.com/156883
Reviewed-by: Caroline Tice <cmtice@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf/results_cache.py')
-rw-r--r-- | crosperf/results_cache.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index 2402c2ec..fcb86ae3 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -35,13 +35,15 @@ class Result(object): perf.report, etc. The key generation is handled by the ResultsCache class. """ - def __init__(self, logger, label): + def __init__(self, logger, label, log_level): self._chromeos_root = label.chromeos_root self._logger = logger - self._ce = command_executer.GetCommandExecuter(self._logger) + self._ce = command_executer.GetCommandExecuter(self._logger, + log_level=log_level) self._temp_dir = None self.label = label self.results_dir = None + self.log_level = log_level self.perf_data_files = [] self.perf_report_files = [] @@ -386,22 +388,22 @@ class Result(object): (temp_dir, cache_dir)) @classmethod - def CreateFromRun(cls, logger, label, out, err, retval, show_all, test, - suite="pyauto"): + def CreateFromRun(cls, logger, log_level, label, out, err, retval, show_all, + test, suite="pyauto"): if suite == "telemetry": result = TelemetryResult(logger, label) else: - result = cls(logger, label) + result = cls(logger, label, log_level) result._PopulateFromRun(out, err, retval, show_all, test, suite) return result @classmethod - def CreateFromCacheHit(cls, logger, label, cache_dir, show_all, test, - suite="pyauto"): + def CreateFromCacheHit(cls, logger, log_level, label, cache_dir, + show_all, test, suite="pyauto"): if suite == "telemetry": result = TelemetryResult(logger, label) else: - result = cls(logger, label) + result = cls(logger, label, log_level) try: result._PopulateFromCacheDir(cache_dir, show_all, test, suite) @@ -498,7 +500,8 @@ class ResultsCache(object): def Init(self, chromeos_image, chromeos_root, test_name, iteration, test_args, profiler_args, machine_manager, board, cache_conditions, - logger_to_use, label, share_users, suite, show_all_results): + logger_to_use, log_level, label, share_users, suite, + show_all_results): self.chromeos_image = chromeos_image self.chromeos_root = chromeos_root self.test_name = test_name @@ -509,10 +512,12 @@ class ResultsCache(object): self.cache_conditions = cache_conditions self.machine_manager = machine_manager self._logger = logger_to_use - self._ce = command_executer.GetCommandExecuter(self._logger) + self._ce = command_executer.GetCommandExecuter(self._logger, + log_level=log_level) self.label = label self.share_users = share_users self.suite = suite + self.log_level = log_level self.show_all = show_all_results def _GetCacheDirForRead(self): @@ -556,7 +561,7 @@ class ResultsCache(object): elif self.label.image_type == "official": checksum = "*" else: - checksum = ImageChecksummer().Checksum(self.label) + checksum = ImageChecksummer().Checksum(self.label, self.log_level) if read and CacheConditions.IMAGE_PATH_MATCH not in self.cache_conditions: image_path_checksum = "*" @@ -599,6 +604,7 @@ class ResultsCache(object): self._logger.LogOutput("Trying to read from cache dir: %s" % cache_dir) result = Result.CreateFromCacheHit(self._logger, + self.log_level, self.label, cache_dir, self.show_all, |