diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-07-30 02:48:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 02:48:24 -0400 |
| commit | cfee9feee423947cf9e6d2508a85507cca6f75f3 (patch) | |
| tree | bc3e2381c4e4a79fc72ad2775c2b050826eab823 /activesupport | |
| parent | eb4f7cad2087ea9365da36938784bcb80696a9d8 (diff) | |
| parent | 0ab64b162f5d001ee095958acf6c3bf6c2fad92d (diff) | |
| download | rails-cfee9feee423947cf9e6d2508a85507cca6f75f3.tar.gz rails-cfee9feee423947cf9e6d2508a85507cca6f75f3.tar.bz2 rails-cfee9feee423947cf9e6d2508a85507cca6f75f3.zip | |
Merge pull request #33468 from bdewater/xplatform-cpu-time
Only use CLOCK_PROCESS_CPUTIME_ID if it's defined
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/notifications/instrumenter.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb index 455b7a44a6..f8344912bb 100644 --- a/activesupport/lib/active_support/notifications/instrumenter.rb +++ b/activesupport/lib/active_support/notifications/instrumenter.rb @@ -130,8 +130,14 @@ module ActiveSupport Process.clock_gettime(Process::CLOCK_MONOTONIC) end - def now_cpu - Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID) + if defined?(Process::CLOCK_PROCESS_CPUTIME_ID) + def now_cpu + Process.clock_gettime(Process::CLOCK_PROCESS_CPUTIME_ID) + end + else + def now_cpu + 0 + end end if defined?(JRUBY_VERSION) |