Merge pull request #37114 from iainbeeston/patch-1

Don't use Process#clock_gettime CLOCK_PROCESS_CPUTIME_ID on Solaris

Merge pull request #37114 from iainbeeston/patch-1
Don't use Process#clock_gettime CLOCK_PROCESS_CPUTIME_ID on Solaris
9e41ee7b · y-yagi · yuuji.yaginuma · 47c1c941 · 9e41ee7b · 9e41ee7b
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

activesupport/CHANGELOG.md activesupport/CHANGELOG.md +4 -0

activesupport/lib/active_support/notifications/instrumenter.rb ...esupport/lib/active_support/notifications/instrumenter.rb +2 -1

未找到文件。
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
+*   Don't use `Process#clock_gettime(CLOCK_PROCESS_CPUTIME_ID)` on Solaris
+
+    *Iain Beeston*
+
 ## Rails 6.0.0 (August 16, 2019) ##

 *   Let `require_dependency` in `zeitwerk` mode look the autoload paths up for

--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -57,7 +57,8 @@ class Event

      def self.clock_gettime_supported? # :nodoc:
        defined?(Process::CLOCK_PROCESS_CPUTIME_ID) &&
-          !Gem.win_platform?
+          !Gem.win_platform? &&
+          !RUBY_PLATFORM.match?(/solaris/i)
      end
      private_class_method :clock_gettime_supported?