diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
| commit | 5395e6175e77d3cd8800bb9f41c09d59934b502f (patch) | |
| tree | 2234488f40eb4f7aa6920fbe2ab41b1d6f53e14e /lib/gitlab/metrics/system.rb | |
| parent | 39d853f5bd9492fa8dfc8e07ec11070705d3c879 (diff) | |
| parent | c0678f2d281242601560e2646cab1aa8a349c4bb (diff) | |
| download | gitlab-ce-issue_3508.tar.gz | |
Merge branch 'master' into issue_3508issue_3508
Diffstat (limited to 'lib/gitlab/metrics/system.rb')
| -rw-r--r-- | lib/gitlab/metrics/system.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab/metrics/system.rb b/lib/gitlab/metrics/system.rb index 83371265278..a7d183b2f94 100644 --- a/lib/gitlab/metrics/system.rb +++ b/lib/gitlab/metrics/system.rb @@ -30,6 +30,17 @@ module Gitlab 0 end end + + # THREAD_CPUTIME is not supported on OS X + if Process.const_defined?(:CLOCK_THREAD_CPUTIME_ID) + def self.cpu_time + Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :millisecond) + end + else + def self.cpu_time + Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond) + end + end end end end |