Skip to content

Commit cab6395

Browse files
committed
Shorten the lock and condition ivar names
1 parent df217b2 commit cab6395

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/concurrent/synchronization/monitor_object.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ module Concurrent
22
module Synchronization
33
class MonitorObject < MutexObject
44
def initialize(*args, &block)
5-
@__lock__do_not_use_directly = ::Monitor.new
6-
@__condition__do_not_use_directly = @__lock__do_not_use_directly.new_cond
5+
@__lock__ = ::Monitor.new
6+
@__condition__ = @__lock__.new_cond
77
synchronize { ns_initialize(*args, &block) }
88
end
99

1010
private
1111

1212
def synchronize
13-
@__lock__do_not_use_directly.synchronize { yield }
13+
@__lock__.synchronize { yield }
1414
end
1515

1616
def ns_wait(timeout = nil)
17-
@__condition__do_not_use_directly.wait timeout
17+
@__condition__.wait timeout
1818
self
1919
end
2020
end

lib/concurrent/synchronization/mutex_object.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@ module Concurrent
22
module Synchronization
33
class MutexObject < AbstractObject
44
def initialize(*args, &block)
5-
@__lock__do_not_use_directly = ::Mutex.new
6-
@__condition__do_not_use_directly = ::ConditionVariable.new
5+
@__lock__ = ::Mutex.new
6+
@__condition__ = ::ConditionVariable.new
77
synchronize { ns_initialize(*args, &block) }
88
end
99

1010
private
1111

1212
def synchronize
13-
if @__lock__do_not_use_directly.owned?
13+
if @__lock__.owned?
1414
yield
1515
else
16-
@__lock__do_not_use_directly.synchronize { yield }
16+
@__lock__.synchronize { yield }
1717
end
1818
end
1919

2020
def ns_signal
21-
@__condition__do_not_use_directly.signal
21+
@__condition__.signal
2222
self
2323
end
2424

2525
def ns_broadcast
26-
@__condition__do_not_use_directly.broadcast
26+
@__condition__.broadcast
2727
self
2828
end
2929

3030
def ns_wait(timeout = nil)
31-
@__condition__do_not_use_directly.wait @__lock__do_not_use_directly, timeout
31+
@__condition__.wait @__lock__, timeout
3232
self
3333
end
3434

0 commit comments

Comments
 (0)