rubysl-sync 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2351a3ab15577c7df19f0e26645761adbec86dce
-  data.tar.gz: 6e955d443a1e77a08e2136906761d98afb8925c9
+  metadata.gz: 66690cb8be8f9de0984431a7b070ec5ad6510406
+  data.tar.gz: bb6306c09d36db252e64c7397af45dd88516fc8d
 SHA512:
-  metadata.gz: 2aa0cb37b52d749dfce2f165aec61a5db5d60a3c8396262cf95400a48669729e2a7f6a7895a76c0a817360ea549df13c9e577f8b352d13dd1f9752cbceb2cbdc
-  data.tar.gz: 77fadf07d279c6d5ca22fd1f6f87229d881bdc169eec12f03c58bbe32ba2bb1492ace6812bf73af9880eb9db21bf05781c64d7b4e4f2a4d1bb029b9bb577de50
+  metadata.gz: 73d2a369784159fc2b5956eed34ffdb216f76b3932cf0bf5feb260e6f1517e38696b05ce5d75a9f992a156d300d02c7594d973a404f499bfc867e8649accd164
+  data.tar.gz: 2528e545551f3738e2eec2eb038409052ef5aa0cccb58fe243cbe5a4fa1d59bec030cd40a9d51c989a67e22dba318e1c349cc78f59f3f7b455e1b04590e37e8e

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
-env:
-  - RUBYLIB=lib
-script: bundle exec mspec
+before_install:
+  - gem update --system
+  - gem --version
+  - gem install rubysl-bundler
+script: bundle exec mspec spec
 rvm:
-  - 1.8.7
   - rbx-nightly-18mode

data/lib/rubysl/sync/sync.rb

@@ -1,9 +1,8 @@
 #
 #   sync.rb - 2 phase lock with counter
-#   	$Release Version: 1.0$
-#   	$Revision: 22457 $
-#   	$Date: 2009-02-19 08:41:12 -0800 (Thu, 19 Feb 2009) $
-#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
+#       $Release Version: 1.0$
+#       $Revision: 40825 $
+#       by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 # --
 #  Sync_m, Synchronizer_m
@@ -11,8 +10,8 @@
 #   obj.extend(Sync_m)
 #   or
 #   class Foo
-#	include Sync_m
-#	:
+#       include Sync_m
+#       :
 #   end
 #
 #   Sync_m#sync_mode
@@ -23,9 +22,8 @@
 #   Sync_m#sync_lock, lock
 #   Sync_m#sync_unlock, unlock
 #
-#   Sync, Synchronicer:
-#	include Sync_m
-#   Usage:
+#  Sync, Synchronizer:
+#  Usage:
 #   sync = Sync.new
 #
 #   Sync#mode
@@ -36,46 +34,46 @@
 #   Sync#lock(mode)     -- mode = :EX, :SH, :UN
 #   Sync#unlock
 #   Sync#synchronize(mode) {...}
-#   
+#
 #
 
 unless defined? Thread
-  fail "Thread not available for this ruby interpreter"
+  raise "Thread not available for this ruby interpreter"
 end
 
+##
+# A module that provides a two-phase lock with a counter.
+
 module Sync_m
-  RCS_ID='-$Header$-'
-  
   # lock mode
   UN = :UN
   SH = :SH
   EX = :EX
-  
+
   # exceptions
   class Err < StandardError
     def Err.Fail(*opt)
-      Thread.critical = false
       fail self, sprintf(self::Message, *opt)
     end
-    
+
     class UnknownLocker < Err
       Message = "Thread(%s) not locked."
       def UnknownLocker.Fail(th)
-	super(th.inspect)
+        super(th.inspect)
       end
     end
-    
+
     class LockModeFailer < Err
       Message = "Unknown lock mode(%s)"
       def LockModeFailer.Fail(mode)
-	if mode.id2name
-	  mode = id2name
-	end
-	super(mode)
+        if mode.id2name
+          mode = id2name
+        end
+        super(mode)
       end
     end
   end
-  
+
   def Sync_m.define_aliases(cl)
     cl.module_eval %q{
       alias locked? sync_locked?
@@ -87,30 +85,29 @@ module Sync_m
       alias synchronize sync_synchronize
     }
   end
-  
+
   def Sync_m.append_features(cl)
     super
-    unless cl.instance_of?(Module)
-      # do nothing for Modules
-      # make aliases and include the proper module.
-      define_aliases(cl)
-    end
+    # do nothing for Modules
+    # make aliases for Classes.
+    define_aliases(cl) unless cl.instance_of?(Module)
+    self
   end
-  
+
   def Sync_m.extend_object(obj)
     super
-    obj.sync_extended
+    obj.sync_extend
   end
 
-  def sync_extended
+  def sync_extend
     unless (defined? locked? and
-	    defined? shared? and
-	    defined? exclusive? and
-	    defined? lock and
-	    defined? unlock and
-	    defined? try_lock and
-	    defined? synchronize)
-      Sync_m.define_aliases(class<<self;self;end)
+            defined? shared? and
+            defined? exclusive? and
+            defined? lock and
+            defined? unlock and
+            defined? try_lock and
+            defined? synchronize)
+      Sync_m.define_aliases(singleton_class)
     end
     sync_initialize
   end
@@ -119,128 +116,140 @@ module Sync_m
   def sync_locked?
     sync_mode != UN
   end
-  
+
   def sync_shared?
     sync_mode == SH
   end
-  
+
   def sync_exclusive?
     sync_mode == EX
   end
-  
+
   # locking methods.
   def sync_try_lock(mode = EX)
     return unlock if mode == UN
-    
-    Thread.critical = true
-    ret = sync_try_lock_sub(mode)
-    Thread.critical = false
-    ret
+    @sync_mutex.synchronize do
+      sync_try_lock_sub(mode)
+    end
   end
-  
+
   def sync_lock(m = EX)
     return unlock if m == UN
-
-    until (Thread.critical = true; sync_try_lock_sub(m))
-      if sync_sh_locker[Thread.current]
-	sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
-	sync_sh_locker.delete(Thread.current)
-      else
-	sync_waiting.push Thread.current
+    Thread.handle_interrupt(StandardError => :on_blocking) do
+      while true
+        @sync_mutex.synchronize do
+          begin
+            if sync_try_lock_sub(m)
+              return self
+            else
+              if sync_sh_locker[Thread.current]
+                sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
+                sync_sh_locker.delete(Thread.current)
+              else
+                unless sync_waiting.include?(Thread.current) || sync_upgrade_waiting.reverse_each.any?{|w| w.first == Thread.current }
+                  sync_waiting.push Thread.current
+                end
+              end
+              @sync_mutex.sleep
+            end
+          ensure
+            sync_waiting.delete(Thread.current)
+          end
+        end
       end
-      Thread.stop
     end
-    Thread.critical = false
     self
   end
-  
+
   def sync_unlock(m = EX)
-    Thread.critical = true
-    if sync_mode == UN
-      Thread.critical = false
-      Err::UnknownLocker.Fail(Thread.current)
-    end
-    
-    m = sync_mode if m == EX and sync_mode == SH
-    
-    runnable = false
-    case m
-    when UN
-      Thread.critical = false
-      Err::UnknownLocker.Fail(Thread.current)
-      
-    when EX
-      if sync_ex_locker == Thread.current
-	if (self.sync_ex_count = sync_ex_count - 1) == 0
-	  self.sync_ex_locker = nil
-	  if sync_sh_locker.include?(Thread.current)
-	    self.sync_mode = SH
-	  else
-	    self.sync_mode = UN
-	  end
-	  runnable = true
-	end
-      else
-	Err::UnknownLocker.Fail(Thread.current)
+    wakeup_threads = []
+    @sync_mutex.synchronize do
+      if sync_mode == UN
+        Err::UnknownLocker.Fail(Thread.current)
       end
-      
-    when SH
-      if (count = sync_sh_locker[Thread.current]).nil?
-	Err::UnknownLocker.Fail(Thread.current)
-      else
-	if (sync_sh_locker[Thread.current] = count - 1) == 0 
-	  sync_sh_locker.delete(Thread.current)
-	  if sync_sh_locker.empty? and sync_ex_count == 0
-	    self.sync_mode = UN
-	    runnable = true
-	  end
-	end
+
+      m = sync_mode if m == EX and sync_mode == SH
+
+      runnable = false
+      case m
+      when UN
+        Err::UnknownLocker.Fail(Thread.current)
+
+      when EX
+        if sync_ex_locker == Thread.current
+          if (self.sync_ex_count = sync_ex_count - 1) == 0
+            self.sync_ex_locker = nil
+            if sync_sh_locker.include?(Thread.current)
+              self.sync_mode = SH
+            else
+              self.sync_mode = UN
+            end
+            runnable = true
+          end
+        else
+          Err::UnknownLocker.Fail(Thread.current)
+        end
+
+      when SH
+        if (count = sync_sh_locker[Thread.current]).nil?
+          Err::UnknownLocker.Fail(Thread.current)
+        else
+          if (sync_sh_locker[Thread.current] = count - 1) == 0
+            sync_sh_locker.delete(Thread.current)
+            if sync_sh_locker.empty? and sync_ex_count == 0
+              self.sync_mode = UN
+              runnable = true
+            end
+          end
+        end
       end
-    end
-    
-    if runnable
-      if sync_upgrade_waiting.size > 0
-	for k, v in sync_upgrade_waiting
-	  sync_sh_locker[k] = v
-	end
-	wait = sync_upgrade_waiting
-	self.sync_upgrade_waiting = []
-	Thread.critical = false
-	
-	for w, v in wait
-	  w.run
-	end
-      else
-	wait = sync_waiting
-	self.sync_waiting = []
-	Thread.critical = false
-	for w in wait
-	  w.run
-	end
+
+      if runnable
+        if sync_upgrade_waiting.size > 0
+          th, count = sync_upgrade_waiting.shift
+          sync_sh_locker[th] = count
+          th.wakeup
+          wakeup_threads.push th
+        else
+          wait = sync_waiting
+          self.sync_waiting = []
+          for th in wait
+            th.wakeup
+            wakeup_threads.push th
+          end
+        end
       end
     end
-    
-    Thread.critical = false
+    for th in wakeup_threads
+      th.run
+    end
     self
   end
-  
+
   def sync_synchronize(mode = EX)
-    begin
+    Thread.handle_interrupt(StandardError => :on_blocking) do
       sync_lock(mode)
-      yield
-    ensure
-      sync_unlock
+      begin
+        yield
+      ensure
+        sync_unlock
+      end
     end
   end
 
-  attr :sync_mode, true
-    
-  attr :sync_waiting, true
-  attr :sync_upgrade_waiting, true
-  attr :sync_sh_locker, true
-  attr :sync_ex_locker, true
-  attr :sync_ex_count, true
-    
+  attr_accessor :sync_mode
+
+  attr_accessor :sync_waiting
+  attr_accessor :sync_upgrade_waiting
+  attr_accessor :sync_sh_locker
+  attr_accessor :sync_ex_locker
+  attr_accessor :sync_ex_count
+
+  def sync_inspect
+    sync_iv = instance_variables.select{|iv| /^@sync_/ =~ iv.id2name}.collect{|iv| iv.id2name + '=' + instance_eval(iv.id2name).inspect}.join(",")
+    print "<#{self.class}.extend Sync_m: #{inspect}, <Sync_m: #{sync_iv}>"
+  end
+
   private
 
   def sync_initialize
@@ -250,63 +259,70 @@ module Sync_m
     @sync_sh_locker = Hash.new
     @sync_ex_locker = nil
     @sync_ex_count = 0
+
+    @sync_mutex = Mutex.new
   end
 
   def initialize(*args)
-    sync_initialize
     super
+    sync_initialize
   end
-    
+
   def sync_try_lock_sub(m)
     case m
     when SH
       case sync_mode
       when UN
-	self.sync_mode = m
-	sync_sh_locker[Thread.current] = 1
-	ret = true
+        self.sync_mode = m
+        sync_sh_locker[Thread.current] = 1
+        ret = true
       when SH
-	count = 0 unless count = sync_sh_locker[Thread.current]
-	sync_sh_locker[Thread.current] = count + 1
-	ret = true
+        count = 0 unless count = sync_sh_locker[Thread.current]
+        sync_sh_locker[Thread.current] = count + 1
+        ret = true
       when EX
-	# in EX mode, lock will upgrade to EX lock
-	if sync_ex_locker == Thread.current
-	  self.sync_ex_count = sync_ex_count + 1
-	  ret = true
-	else
-	  ret = false
-	end
+        # in EX mode, lock will upgrade to EX lock
+        if sync_ex_locker == Thread.current
+          self.sync_ex_count = sync_ex_count + 1
+          ret = true
+        else
+          ret = false
+        end
       end
     when EX
       if sync_mode == UN or
-	sync_mode == SH && sync_sh_locker.size == 1 && sync_sh_locker.include?(Thread.current) 
-	self.sync_mode = m
-	self.sync_ex_locker = Thread.current
-	self.sync_ex_count = 1
-	ret = true
+          sync_mode == SH && sync_sh_locker.size == 1 && sync_sh_locker.include?(Thread.current)
+        self.sync_mode = m
+        self.sync_ex_locker = Thread.current
+        self.sync_ex_count = 1
+        ret = true
       elsif sync_mode == EX && sync_ex_locker == Thread.current
-	self.sync_ex_count = sync_ex_count + 1
-	ret = true
+        self.sync_ex_count = sync_ex_count + 1
+        ret = true
       else
-	ret = false
+        ret = false
       end
     else
-      Thread.critical = false
       Err::LockModeFailer.Fail mode
     end
     return ret
   end
 end
+
+##
+# An alias for Sync_m from sync.rb
+
 Synchronizer_m = Sync_m
 
+##
+# A class that provides two-phase lock with a counter.  See Sync_m for
+# details.
+
 class Sync
-  #Sync_m.extend_class self
   include Sync_m
-    
-  def initialize
-    super
-  end
-    
 end
+
+##
+# An alias for Sync from sync.rb.  See Sync_m for details.
+
 Synchronizer = Sync

data/lib/rubysl/sync/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Sync
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-sync.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
+  spec.add_development_dependency "rubysl-prettyprint", "~> 2.0"
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: mspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rubysl-prettyprint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: Ruby standard library sync.
 email:
 - brixen@gmail.com
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -94,19 +94,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby standard library sync.
 test_files: []
-has_rdoc: