mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43502 from Shopify/rework-process-clock-gettime-uses 

Refactor `Process.clock_gettime` uses
This commit is contained in:
Jean Boussier 2021-10-21 10:22:03 +02:00 committed by GitHub
parent 098391787a 9636b4da36
commit 571779a147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
View File

@ -527,13 +527,13 @@ module ActiveRecord
end
newly_checked_out = []
timeout_time = Concurrent.monotonic_time + (@checkout_timeout * 2)
timeout_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + (@checkout_timeout * 2)
@available.with_a_bias_for(Thread.current) do
loop do
synchronize do
return if collected_conns.size == @connections.size && @now_connecting == 0
remaining_timeout = timeout_time - Concurrent.monotonic_time
remaining_timeout = timeout_time - Process.clock_gettime(Process::CLOCK_MONOTONIC)
remaining_timeout = 0 if remaining_timeout < 0
conn = checkout_for_exclusive_access(remaining_timeout)
collected_conns << conn

4
activerecord/lib/active_record/connection_adapters/abstract/connection_pool/queue.rb
View File

@ -110,7 +110,7 @@ module ActiveRecord
def wait_poll(timeout)
@num_waiting += 1
t0 = Concurrent.monotonic_time
t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
elapsed = 0
loop do
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
@ -119,7 +119,7 @@ module ActiveRecord
return remove if any?
elapsed = Concurrent.monotonic_time - t0
elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0
if elapsed >= timeout
msg = "could not obtain a connection from the pool within %0.3f seconds (waited %0.3f seconds); all pooled connections were in use" %
[timeout, elapsed]

6
activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View File

@ -88,7 +88,7 @@ module ActiveRecord
@logger = logger
@config = config
@pool = ActiveRecord::ConnectionAdapters::NullPool.new
@idle_since = Concurrent.monotonic_time
@idle_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@visitor = arel_visitor
@statements = build_statement_pool
@lock = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
@ -242,7 +242,7 @@ module ActiveRecord
"Current thread: #{Thread.current}."
end
@idle_since = Concurrent.monotonic_time
@idle_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@owner = nil
else
raise ActiveRecordError, "Cannot expire connection, it is not currently leased."
@ -265,7 +265,7 @@ module ActiveRecord
# Seconds since this connection was returned to the pool
def seconds_idle # :nodoc:
return 0 if in_use?
Concurrent.monotonic_time - @idle_since
Process.clock_gettime(Process::CLOCK_MONOTONIC) - @idle_since
end
def unprepared_statement

4
activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
View File

@ -30,9 +30,9 @@ module ActiveRecord
def explain(arel, binds = [])
sql = "EXPLAIN #{to_sql(arel, binds)}"
start = Concurrent.monotonic_time
start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
result = exec_query(sql, "EXPLAIN", binds)
elapsed = Concurrent.monotonic_time - start
elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
MySQL::ExplainPrettyPrinter.new.pp(result, elapsed)
end

4
activerecord/lib/active_record/future_result.rb
View File

@ -102,12 +102,12 @@ module ActiveRecord
def execute_or_wait
if pending?
start = Concurrent.monotonic_time
start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
@mutex.synchronize do
if pending?
execute_query(@pool.connection)
else
@lock_wait = (Concurrent.monotonic_time - start) * 1_000
@lock_wait = (Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond) - start)
end
end
else

8
activerecord/test/cases/connection_pool_test.rb
View File

@ -211,7 +211,7 @@ module ActiveRecord
idle_conn.instance_variable_set(
:@idle_since,
Concurrent.monotonic_time - 0.01
Process.clock_gettime(Process::CLOCK_MONOTONIC) - 0.01
)
@pool.flush
@ -219,7 +219,7 @@ module ActiveRecord
idle_conn.instance_variable_set(
:@idle_since,
Concurrent.monotonic_time - 0.02
Process.clock_gettime(Process::CLOCK_MONOTONIC) - 0.02
)
@pool.flush
@ -238,7 +238,7 @@ module ActiveRecord
idle_conn.instance_variable_set(
:@idle_since,
Concurrent.monotonic_time - 1
Process.clock_gettime(Process::CLOCK_MONOTONIC) - 1
)
@pool.flush
@ -257,7 +257,7 @@ module ActiveRecord
idle_conn.instance_variable_set(
:@idle_since,
Concurrent.monotonic_time - 1000
Process.clock_gettime(Process::CLOCK_MONOTONIC) - 1000
)
@pool.flush(30)

4
activesupport/lib/active_support/cache/memory_store.rb vendored
View File

@ -89,13 +89,13 @@ module ActiveSupport
return if pruning?
@pruning = true
begin
start_time = Concurrent.monotonic_time
start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
cleanup
instrument(:prune, target_size, from: @cache_size) do
keys = synchronize { @data.keys }
keys.each do |key|
delete_entry(key, **options)
return if @cache_size <= target_size || (max_time && Concurrent.monotonic_time - start_time > max_time)
return if @cache_size <= target_size || (max_time && Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time > max_time)
end
end
ensure

4
activesupport/lib/active_support/notifications/fanout.rb
View File

@ -236,13 +236,13 @@ module ActiveSupport
def start(name, id, payload)
timestack = Thread.current[:_timestack_monotonic] ||= []
timestack.push Concurrent.monotonic_time
timestack.push Process.clock_gettime(Process::CLOCK_MONOTONIC)
end
def finish(name, id, payload)
timestack = Thread.current[:_timestack_monotonic]
started = timestack.pop
@delegate.call(name, started, Concurrent.monotonic_time, id, payload)
@delegate.call(name, started, Process.clock_gettime(Process::CLOCK_MONOTONIC), id, payload)
end
end

26
activesupport/lib/active_support/notifications/instrumenter.rb
View File

@ -62,12 +62,12 @@ module ActiveSupport
def initialize(name, start, ending, transaction_id, payload)
@name = name
@payload = payload.dup
@time = start
@time = start ? start.to_f * 1_000.0 : start
@transaction_id = transaction_id
@end = ending
@end = ending ? ending.to_f * 1_000.0 : ending
@children = []
@cpu_time_start = 0
@cpu_time_finish = 0
@cpu_time_start = 0.0
@cpu_time_finish = 0.0
@allocation_count_start = 0
@allocation_count_finish = 0
end
@ -102,7 +102,7 @@ module ActiveSupport
# Returns the CPU time (in milliseconds) passed since the call to
# +start!+ and the call to +finish!+
def cpu_time
(@cpu_time_finish - @cpu_time_start) * 1000
@cpu_time_finish - @cpu_time_start
end
# Returns the idle time time (in milliseconds) passed since the call to
@ -130,7 +130,7 @@ module ActiveSupport
#
# @event.duration # => 1000.138
def duration
1000.0 * (self.end - time)
self.end - time
end
def <<(event)
@ -143,28 +143,30 @@ module ActiveSupport
private
def now
Concurrent.monotonic_time
Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_millisecond)
end
begin
Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID)
Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :float_millisecond)
def now_cpu
Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID)
Process.clock_gettime(Process::CLOCK_THREAD_CPUTIME_ID, :float_millisecond)
end
rescue
def now_cpu
0
0.0
end
end
if defined?(JRUBY_VERSION)
begin
GC.stat(:total_allocated_objects)
rescue ArgumentError # Likely on JRuby
def now_allocations
0
end
else
def now_allocations
GC.stat :total_allocated_objects
GC.stat(:total_allocated_objects)
end
end
end

11
activesupport/test/notifications_test.rb
View File

@ -434,12 +434,11 @@ module Notifications
class EventTest < TestCase
def test_events_are_initialized_with_details
time = Time.now
time = Time.now.to_f
event = event(:foo, time, time + 0.01, random_id, {})
assert_equal :foo, event.name
assert_equal time, event.time
assert_in_delta 10.0, event.duration, 0.00001
assert_in_delta 10.0, event.duration, 0.0001
end
def test_event_cpu_time_does_not_raise_error_when_start_or_finished_not_called
@ -450,14 +449,14 @@ module Notifications
end
def test_events_consumes_information_given_as_payload
event = event(:foo, Concurrent.monotonic_time, Concurrent.monotonic_time + 1, random_id, payload: :bar)
event = event(:foo, Process.clock_gettime(Process::CLOCK_MONOTONIC), Process.clock_gettime(Process::CLOCK_MONOTONIC) + 1, random_id, payload: :bar)
assert_equal Hash[payload: :bar], event.payload
end
def test_event_is_parent_based_on_children
time = Concurrent.monotonic_time
time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
parent = event(:foo, Concurrent.monotonic_time, Concurrent.monotonic_time + 100, random_id, {})
parent = event(:foo, Process.clock_gettime(Process::CLOCK_MONOTONIC), Process.clock_gettime(Process::CLOCK_MONOTONIC) + 100, random_id, {})
child = event(:foo, time, time + 10, random_id, {})
not_child = event(:foo, time, time + 100, random_id, {})