1 Commits

Author SHA1 Message Date
Nick Elser
a23282dcc6 don't go around allocating empty strings willy-nilly 2015-05-07 00:16:28 -07:00
6 changed files with 19 additions and 9 deletions

View File

@@ -1,3 +1,7 @@
## 0.3.1
- Slight memory leak fix.
## 0.3.0 ## 0.3.0
- Dramatically simplify the interface by forcing clients to specify the key & resources at lock initialization instead of every method call. - Dramatically simplify the interface by forcing clients to specify the key & resources at lock initialization instead of every method call.

View File

@@ -34,7 +34,7 @@ end
# The resources argument is the number of resources the semaphore will allow to lock (defaulting to one - a mutex) # The resources argument is the number of resources the semaphore will allow to lock (defaulting to one - a mutex)
suo = Suo::Client::Memcached.new("bar_resource", client: some_dalli_client, resources: 2) suo = Suo::Client::Memcached.new("bar_resource", client: some_dalli_client, resources: 2)
Thread.new { suo.lock{ puts "One"; sleep 2 } } Thread.new { suo.lock { puts "One"; sleep 2 } }
Thread.new { suo.lock { puts "Two"; sleep 2 } } Thread.new { suo.lock { puts "Two"; sleep 2 } }
Thread.new { suo.lock { puts "Three" } } Thread.new { suo.lock { puts "Three" } }
@@ -46,7 +46,7 @@ suo = Suo::Client::Memcached.new("protected_key", client: some_dalli_client, acq
# manually locking/unlocking # manually locking/unlocking
# the return value from lock without a block is a unique token valid only for the current lock # the return value from lock without a block is a unique token valid only for the current lock
# which must be unlocked manually # which must be unlocked manually
token = suo token = suo.lock
foo.baz! foo.baz!
suo.unlock(token) suo.unlock(token)
@@ -77,7 +77,7 @@ end
## History ## History
View the [changelog](https://github.com/nickelser/suo/blob/master/CHANGELOG.md) View the [changelog](https://github.com/nickelser/suo/blob/master/CHANGELOG.md).
## Contributing ## Contributing

View File

@@ -8,17 +8,21 @@ module Suo
resources: 1 resources: 1
}.freeze }.freeze
BLANK_STR = "".freeze
attr_accessor :client, :key, :resources, :options attr_accessor :client, :key, :resources, :options
include MonitorMixin include MonitorMixin
def initialize(key, options = {}) def initialize(key, options = {})
fail "Client required" unless options[:client] fail "Client required" unless options[:client]
@options = DEFAULT_OPTIONS.merge(options) @options = DEFAULT_OPTIONS.merge(options)
@retry_count = (@options[:acquisition_timeout] / @options[:acquisition_delay].to_f).ceil @retry_count = (@options[:acquisition_timeout] / @options[:acquisition_delay].to_f).ceil
@client = @options[:client] @client = @options[:client]
@resources = @options[:resources].to_i @resources = @options[:resources].to_i
@key = key @key = key
super() # initialize Monitor mixin for thread safety super() # initialize Monitor mixin for thread safety
end end
@@ -124,7 +128,7 @@ module Suo
fail NotImplementedError fail NotImplementedError
end end
def initial_set(val = "") # rubocop:disable Lint/UnusedMethodArgument def initial_set(val = BLANK_STR) # rubocop:disable Lint/UnusedMethodArgument
fail NotImplementedError fail NotImplementedError
end end
@@ -158,7 +162,7 @@ module Suo
end end
def deserialize_locks(val) def deserialize_locks(val)
unpacked = (val.nil? || val == "") ? [] : MessagePack.unpack(val) unpacked = (val.nil? || val == BLANK_STR) ? [] : MessagePack.unpack(val)
unpacked.map do |time, token| unpacked.map do |time, token|
[Time.at(time), token] [Time.at(time), token]

View File

@@ -20,7 +20,7 @@ module Suo
@client.set_cas(@key, newval, cas) @client.set_cas(@key, newval, cas)
end end
def initial_set(val = "") def initial_set(val = BLANK_STR)
@client.set(@key, val) @client.set(@key, val)
end end
end end

View File

@@ -1,6 +1,8 @@
module Suo module Suo
module Client module Client
class Redis < Base class Redis < Base
OK_STR = "OK".freeze
def initialize(key, options = {}) def initialize(key, options = {})
options[:client] ||= ::Redis.new(options[:connection] || {}) options[:client] ||= ::Redis.new(options[:connection] || {})
super super
@@ -21,7 +23,7 @@ module Suo
multi.set(@key, newval) multi.set(@key, newval)
end end
ret && ret[0] == "OK" ret && ret[0] == OK_STR
end end
def synchronize def synchronize
@@ -32,7 +34,7 @@ module Suo
@client.unwatch @client.unwatch
end end
def initial_set(val = "") def initial_set(val = BLANK_STR)
@client.set(@key, val) @client.set(@key, val)
end end
end end

View File

@@ -1,3 +1,3 @@
module Suo module Suo
VERSION = "0.3.0" VERSION = "0.3.1"
end end