Commit 0a259732 authored by Stan Hu's avatar Stan Hu

Merge branch 'osw-use-atomic-reference-instead-atomic-fixnum' into 'master'

Use Concurrent::AtomicReference instead AtomicFixnum

Closes #41448

See merge request gitlab-org/gitlab-ce!16138
parents a5a0f3f7 a0ef9ac2
---
title: Adjust failure when starting GitLab instance on x86 systems
merge_request:
author: Mike Limansky
type: fixed
...@@ -5,7 +5,7 @@ module Gitlab ...@@ -5,7 +5,7 @@ module Gitlab
# Class for tracking timing information about method calls # Class for tracking timing information about method calls
class MethodCall class MethodCall
@@measurement_enabled_cache = Concurrent::AtomicBoolean.new(false) @@measurement_enabled_cache = Concurrent::AtomicBoolean.new(false)
@@measurement_enabled_cache_expires_at = Concurrent::AtomicFixnum.new(Time.now.to_i) @@measurement_enabled_cache_expires_at = Concurrent::AtomicReference.new(Time.now.to_i)
MUTEX = Mutex.new MUTEX = Mutex.new
BASE_LABELS = { module: nil, method: nil }.freeze BASE_LABELS = { module: nil, method: nil }.freeze
attr_reader :real_time, :cpu_time, :call_count, :labels attr_reader :real_time, :cpu_time, :call_count, :labels
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment