diff options
| author | Sean McAllister <smcallis@google.com> | 2020-08-19 17:15:20 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 21:07:52 -0700 |
| commit | efd8836368609e094949b13dd9f980b17a38ac0d (patch) | |
| tree | 1c408aea5e2488ff04c716254715c8b60ba341b9 | |
| parent | f16a0ed58d771eb63f3fc59377d0979fb746cf04 (diff) | |
| download | zucchini-efd8836368609e094949b13dd9f980b17a38ac0d.tar.gz | |
Refactor OS_LINUX preprocessor directive for LaCrOS effort.
Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS. We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.
Bug: 1110266
Change-Id: I88dc82e3b48bd1d63189d3e57ed0f3fe3351279b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352024
Commit-Queue: Sean McAllister <smcallis@google.com>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Reviewed-by: Carlos IL <carlosil@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799690}
NOKEYCHECK=True
GitOrigin-RevId: 74bfcb4cd5469b0b9a4b265a6c5d9f92051ed973
| -rw-r--r-- | main_utils.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main_utils.cc b/main_utils.cc index 3e6ff2d..8c47c91 100644 --- a/main_utils.cc +++ b/main_utils.cc @@ -78,7 +78,7 @@ constexpr Command kCommands[] = { /******** GetPeakMemoryMetrics ********/ -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) // Linux does not have an exact mapping to the values used on Windows so use a // close approximation: // peak_virtual_memory ~= peak_page_file_usage @@ -120,7 +120,7 @@ void GetPeakMemoryMetrics(size_t* peak_virtual_memory, } } } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) #if defined(OS_WIN) // On failure the input values will be set to 0. @@ -145,17 +145,17 @@ class ScopedResourceUsageTracker { ScopedResourceUsageTracker() { start_time_ = base::TimeTicks::Now(); -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) GetPeakMemoryMetrics(&start_peak_page_file_usage_, &start_peak_working_set_size_); -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) } // Computes and prints usage. ~ScopedResourceUsageTracker() { base::TimeTicks end_time = base::TimeTicks::Now(); -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) size_t cur_peak_page_file_usage = 0; size_t cur_peak_working_set_size = 0; GetPeakMemoryMetrics(&cur_peak_page_file_usage, &cur_peak_working_set_size); @@ -171,7 +171,7 @@ class ScopedResourceUsageTracker { << (cur_peak_working_set_size - start_peak_working_set_size_) / 1024 << " KiB"; -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) LOG(INFO) << "Zucchini.TotalTime " << (end_time - start_time_).InSecondsF() << " s"; @@ -179,10 +179,10 @@ class ScopedResourceUsageTracker { private: base::TimeTicks start_time_; -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) size_t start_peak_page_file_usage_ = 0; size_t start_peak_working_set_size_ = 0; -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) }; /******** Helper functions ********/ |