pesto 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df40866b281d6ef5590098404180ca334fcbdb57
-  data.tar.gz: 8f0878c78f7cb2b10199b943ed187bea3840646c
+  metadata.gz: e51ff61ac6efa425c0c4a4697c857ccc28e6a0db
+  data.tar.gz: 8eb7bba71e8eba452ac5f3bccc94df1f97004b17
 SHA512:
-  metadata.gz: cbb914544774964b5be6d8204f78df332a9eb9512f7c70fd3b4af7dac545f85652b9725b3e18c4a9b0cf855079d410b2e6c505f436b4b5791d70bcf8d58b67b7
-  data.tar.gz: 51791f1f534e3c48c11b0faee8806d9f742aef5e4d0b7b36aff22d6298ae830930d5ae112b9dae4df71dd35c9e59f8e45a17aade2db78128bdcb0ac87ee8398f
+  metadata.gz: ff893fccea20d6ec74171778da24e97ac0ec65e4bb42be2f6e581756ed9dfc17bd2324c136ff32c22e3f109061d25c3b919834886c999e08f3ae43631f912b7c
+  data.tar.gz: c5d05678bbd4b8ee1107d35f913c0dfd34e2206d6454bfc485e07d021b78f87dff6dd459eac34faa3130f5e291ee1e81d5a829b8e446f8081db634bcfe808f70

data/.gitignore

@@ -0,0 +1,50 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: .
+  specs:
+    pesto (0.0.7)
+      connection_pool (~> 2.2)
+      hiredis (~> 0.6)
+      redis (~> 3.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    connection_pool (2.2.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    fakeredis (0.6.0)
+      redis (~> 3.2)
+    hiredis (0.6.1)
+    json (2.1.0)
+    redis (3.3.3)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeredis (~> 0.6)
+  pesto!
+  rspec (~> 3.6)
+  simplecov (~> 0.14)
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -0,0 +1 @@
+# pesto 

data/examples/aggressive.rb

@@ -0,0 +1,62 @@
+require 'connection_pool'
+require 'hiredis'
+require 'redis'
+require 'securerandom'
+require_relative '../lib/pesto.rb'
+
+$use_sleep = false
+$key_num = 20
+$concurrency = 10
+
+def lock(ctx, pfx, pid = 0)
+  pl = Pesto::Lock.new({ :pool => ctx[:pool], :verbose => true })
+  keys = []
+
+  for i in 0..$key_num
+    keys << "pesto:#{pfx}:#{i}"
+  end
+
+  keys.shuffle!
+
+  d1 = Time.now
+
+  locked = pl.lock(keys, timeout_lock: 0.05, interval_check: 0.005 )
+
+  if locked == 1
+    pl.unlock(keys)
+    puts "[#{pid}] lock acquired/dismissed (took: #{(Time.now - d1) * 1000}ms)"
+  else
+    puts "[#{pid}] lock failed"
+  end
+end
+
+pfx = SecureRandom.hex(10)
+children = []
+
+def killall(pids)
+  pids.each do |pid|
+    Process.kill 9, pid
+  end
+  Process.exit
+end
+
+Signal.trap('INT')  { killall(children) }
+Signal.trap('TERM')  { killall(children) }
+
+for pid in 0..$concurrency
+  puts "[#{pid}] fork"
+  children << fork do
+    redis = ConnectionPool.new(size: 5, :timeout => 10) { Redis.new(:driver => :hiredis) }
+    while true do
+      lock({ :pool => redis }, pfx, pid)
+      if use_sweep
+        delay = rand(1000).to_f / 10000.0
+        sleep delay
+      end
+    end
+  end
+end
+
+while true do
+  sleep 1
+end

data/lib/pesto/lock.rb

@@ -0,0 +1,122 @@
+module Pesto
+  class Lock
+
+    def initialize(ctx = {}, opts = {})
+      @ctx = ctx
+
+      raise 'ERR_REDIS_NOTFOUND' if @ctx[:pool].nil?
+
+      @conf = {
+        :lock_expire => true,
+        :timeout_lock_expire => 5,
+        :timeout_lock => 1,
+        :interval_check => 0.05
+      }.merge(opts)
+    end
+
+    def conf
+      @conf
+    end
+
+    def cp
+      @ctx[:pool]
+    end
+
+    def merge_options o = {}, *filter
+      c = conf.merge(o)
+      c.delete_if{|k,v| !filter.include?(k) } unless filter.empty?
+      c
+    end
+
+    def lock _names, _opts = {}
+      opts = merge_options _opts, :timeout_lock_expire, :timeout_lock, :interval_check
+
+      names = (_names.is_a?(String) ? [_names] : _names).uniq
+      opts[:timeout_lock_expire] = opts[:timeout_lock_expire].to_i
+      opts[:timeout_lock_expire] += opts[:timeout_lock] * names.size
+
+      t_start = Time.now
+
+      while true
+        res, locks, stop = get_locks names
+
+        expire names, opts if !stop && conf[:lock_expire]
+
+        break if stop || (Time.now - t_start) > opts[:timeout_lock]
+
+        unlock locks
+        sleep opts[:interval_check]
+      end
+
+      stop ? 1 : 0
+    end
+
+    def expire names, opts={}
+      cp.with do |rc|
+        rc.pipelined do
+          names.each do |n|
+            rc.expire lock_hash(n), opts[:timeout_lock_expire].to_i
+          end
+        end
+      end
+    end
+
+    def get_locks names
+      locked = 0
+      locks = []
+      res = []
+
+      cp.with do |rc|
+        res = rc.pipelined do
+          names.each do |n|
+            rc.setnx lock_hash(n), 1
+          end
+        end
+
+        names.each_with_index do |n, ix|
+          next unless res[ix]
+          locked += 1
+          locks.push n
+        end
+      end
+
+      return [res, locks, locked == names.size]
+    end
+
+    def locki name = 'global', opts = {}
+      lock name, opts.merge(timeout_lock: 0)
+    end
+
+    def lockx name = 'global', opts = {}, err = 'ERR_LOCKING'
+      locked = lock(name, opts)
+      return 1 if locked == 1
+
+      raise "#{err} (#{name})"
+    end
+
+    def unlock _names = []
+      _names = [_names] if _names.is_a?(String)
+      names = _names.uniq
+      res = []
+
+      cp.with do |rc|
+        res = rc.pipelined do
+          names.each do |n|
+            rc.del(lock_hash(n))
+          end
+        end
+      end
+
+      val = res.reduce(0){|sum,n| sum+n}
+
+      val > 0 ? 1 : 0
+    end
+
+    private
+
+    def lock_hash name
+      "pesto:lock:#{name}"
+    end
+
+  end
+end

data/lib/pesto/version.rb

@@ -0,0 +1,3 @@
+module Pesto
+  VERSION = "0.0.8"
+end

data/lib/pesto.rb

@@ -1,132 +1,4 @@
-module Pesto
-  class Lock
-
-    def initialize(ctx = {}, opts = {})
-      @ctx = ctx
-      
-      raise 'ERR_REDIS_NOTFOUND' if @ctx[:redis].nil?
-
-      @conf = {
-        :lock_expire => true,
-        :timeout_lock_expire => 5,
-        :timeout_lock => 1,
-        :interval_check => 0.05
-      }.merge(opts)
-    end
-
-    def rc
-      @ctx[:redis]
-    end
-
-    def lock(_names, _opts = {})
-      opts = {}.merge(
-        @conf.select{ |k| [
-          :timeout_lock_expire, :timeout_lock,
-          :interval_check
-        ].include?(k) 
-        }
-      ).merge(_opts || {})
-     
-      _names = [_names] if _names.is_a?(String)
-      names = _names.uniq
-      
-      opts[:timeout_lock_expire] = (opts[:timeout_lock_expire] + (opts[:timeout_lock] * names.size)).to_i
-               
-      t_start = Time.now
-      locked = 0
-
-      while true 
-        locked = 0
-
-        lock_req = nil
-        rc.with do |rc|
-          lock_req = rc.pipelined do 
-            names.each do |n|
-              chash = lock_hash(n)
-              rc.setnx chash, 1
-            end
-          end
-        end
-
-        locks = []
-
-        if lock_req
-          names.each_with_index do |n, ix|
-            l = lock_req[ix]
-            next if !l
-            locked += 1
-            locks << n
-          end
-        end
-
-        if locked == names.size
-          locked = 1
-
-          if @conf[:lock_expire]
-            rc.with do |rc|
-              rc.pipelined do 
-                names.each do |n|
-                  chash = lock_hash(n)
-                  rc.expire chash, opts[:timeout_lock_expire]
-                end
-              end
-            end
-          end
-        else
-          locked = 0
-        end
-
-        break if locked == 1 || (Time.now - t_start) > opts[:timeout_lock]
-
-        unlock(locks)
-        sleep opts[:interval_check]
-      end
-
-      locked == 0 ? 0 : 1
-    end
-
-    def locki(name = 'global', _opts = {})
-      opts = (_opts || {}).merge({ :timeout_lock => 0 })
-      lock(name, opts)
-    end
-
-    def lockx(name = 'global', opts = {}, err = 'ERR_LOCKING')
-      locked = lock(name, opts)
-      if locked == 1
-        return 1
-      end
-      raise "#{err} (#{name})"
-    end
-
-    def unlock(_names)
-      _names = [_names] if _names.is_a?(String)
-      names = _names.uniq
-
-      unlock_req = nil
-      rc.with do |rc|
-        unlock_req = rc.pipelined do
-          names.each do |n|
-            rc.del(lock_hash(n))
-          end
-        end
-      end
-
-      val = 0
-      
-      if unlock_req
-        unlock_req.each do |v| 
-          val += v
-        end
-      end
-
-      val > 0 ? 1 : 0
-    end
-
-    private
-
-    def lock_hash(name)
-      "pesto:lock:#{name}"
-    end
-
-  end
-end
+require 'hiredis'
+require 'redis'
+require 'connection_pool'
+require 'pesto/lock'

data/pesto.gemspec

@@ -0,0 +1,23 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'pesto/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'pesto'
+  s.version     = Pesto::VERSION
+  s.summary     = 'dlock'
+  s.description     = 'distributed locking with deadlock prevention'
+  s.authors     = ['bfx devs']
+  s.email       = 'info@bitfinex.com'
+  s.homepage    = 'https://www.bitfinex.com'
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "hiredis", "~> 0.6"
+  s.add_runtime_dependency "redis", "~> 3.3"
+  s.add_runtime_dependency "connection_pool", "~> 2.2"
+
+  s.add_development_dependency "rspec", "~> 3.6"
+  s.add_development_dependency "fakeredis", "~> 0.6"
+  s.add_development_dependency "simplecov", "~> 0.14"
+end

metadata

@@ -1,22 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: pesto
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - bfx devs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
-dependencies: []
+date: 2017-05-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: distributed locking with deadlock prevention
-email: paolo@bitfinex.com
+email: info@bitfinex.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
+- Gemfile
+- Gemfile.lock
+- README.md
+- examples/aggressive.rb
 - lib/pesto.rb
+- lib/pesto/lock.rb
+- lib/pesto/version.rb
+- pesto.gemspec
 homepage: https://www.bitfinex.com
 licenses: []
 metadata: {}
@@ -39,5 +132,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: distributed locking with deadlock prevention
+summary: dlock
 test_files: []