atomic 0.0.5 → 0.0.6

data/Rakefile

@@ -9,6 +9,11 @@ Rake::TestTask.new :test do |t|
   t.test_files = FileList["test/**/*.rb"]
 end
 
+desc "Run benchmarks"
+task :bench do
+  exec "ruby -Ilib -Iext test/bench_atomic.rb"
+end
+
 if defined?(JRUBY_VERSION)
   require 'ant'
 

data/atomic.gemspec

@@ -2,15 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{atomic}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.authors = ["Charles Oliver Nutter", "MenTaLguY"]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.description = "An atomic reference implementation for JRuby and green or GIL-threaded impls"
   s.email = ["headius@headius.com", "mental@rydia.net"]
-  s.files = Dir['{lib,examples,test,ext}/**/*'] + Dir['{*.txt,*.gemspec,Rakefile}']
   s.homepage = "http://github.com/headius/ruby-atomic"
   s.require_paths = ["lib"]
   s.summary = "An atomic reference implementation for JRuby and green or GIL-threaded impls"
   s.test_files = Dir["test/test*.rb"]
-  s.extensions = 'ext/extconf.rb'
+  if defined?(JRUBY_VERSION)
+    s.files = Dir['{lib,examples,test}/**/*'] + Dir['{*.txt,*.gemspec,Rakefile}']
+    s.platform = 'java'
+  else
+    s.files = Dir['{lib,examples,test,ext}/**/*'] + Dir['{*.txt,*.gemspec,Rakefile}']
+    s.extensions = 'ext/extconf.rb'
+  end
 end

data/examples/bench_atomic.rb

@@ -0,0 +1,109 @@
+require 'benchmark'
+require 'atomic'
+require 'thread'
+Thread.abort_on_exception = true
+
+$go = false # for synchronizing parallel threads
+
+# number of updates on the value
+N = ARGV[1] ? ARGV[1].to_i : 100_000
+
+# number of threads for parallel test
+M = ARGV[0] ? ARGV[0].to_i : 100
+
+
+puts "*** Sequential updates ***"
+Benchmark.bm(10) do |x|
+  value = 0
+  x.report "no lock" do
+    N.times do
+      value += 1
+    end
+  end
+
+  @lock = Mutex.new
+  x.report "mutex" do
+    value = 0
+    N.times do
+      @lock.synchronize do
+        value += 1
+      end
+    end
+  end
+
+  @atom = Atomic.new(0)
+  x.report "atomic" do
+    N.times do
+      @atom.update{|x| x += 1}
+    end
+  end
+end
+
+def para_setup(num_threads, count, &block)
+  if num_threads % 2 > 0
+    raise ArgumentError, "num_threads must be a multiple of two"
+  end
+  raise ArgumentError, "need block" unless block_given?
+
+  # Keep those threads together
+  tg = ThreadGroup.new
+
+  num_threads.times do |i|
+    diff = (i % 2 == 0) ? 1 : -1
+
+    t = Thread.new do
+      nil until $go
+      count.times do
+        yield diff
+      end
+    end
+
+    tg.add(t)
+  end
+
+  # Make sure all threads are started
+  while tg.list.find{|t| t.status != "run"}
+    Thread.pass
+  end
+
+  # For good measure
+  GC.start
+
+  tg
+end
+
+def para_run(tg)
+  $go = true
+  tg.list.each{|t| t.join}
+  $go = false
+end
+
+puts "*** Parallel updates ***"
+Benchmark.bm(10) do |bm|
+  # This is not secure
+  value = 0
+  tg = para_setup(M, N/M) do |diff|
+    value += diff
+  end
+  bm.report("no lock"){ para_run(tg) }
+
+
+  value = 0
+  @lock = Mutex.new
+  tg = para_setup(M, N/M) do |diff|
+    @lock.synchronize do
+      value += diff
+    end
+  end
+  bm.report("mutex"){ para_run(tg) }
+  raise unless value == 0
+
+
+  @atom = Atomic.new(0)
+  tg = para_setup(M, N/M) do |diff|
+    @atom.update{|x| x + diff}
+  end
+  bm.report("atomic"){ para_run(tg) }
+  raise unless @atom.value == 0
+
+end

data/lib/atomic.rb

@@ -11,32 +11,44 @@ class Atomic
   def value
     @ref.get
   end
+  alias get value
   
   def value=(new_value)
     @ref.set(new_value)
     new_value
   end
+  alias set value=
 
   def swap(new_value)
     @ref.get_and_set(new_value)
   end
+  alias get_and_set swap
+  
+  def compare_and_swap(old_value, new_value)
+    @ref.compare_and_set(old_value, new_value)
+  end
+  alias compare_and_set compare_and_swap
 
   # Pass the current value to the given block, replacing it
   # with the block's result. May retry if the value changes
   # during the block's execution.
   def update
-    begin
-      try_update { |v| yield v }
-    rescue ConcurrentUpdateError
-      retry
-    end
+    true until @ref.compare_and_set(old_value = @ref.get, new_value = yield(old_value))
+    new_value
   end
+  
+  # frozen pre-allocated backtrace to speed ConcurrentUpdateError
+  CONC_UP_ERR_BACKTRACE = ['backtrace elided; set verbose to enable'].freeze
 
   def try_update
     old_value = @ref.get
     new_value = yield old_value
     unless @ref.compare_and_set(old_value, new_value)
-      raise ConcurrentUpdateError, "Update failed"
+      if $VERBOSE
+        raise ConcurrentUpdateError, "Update failed"
+      else
+        raise ConcurrentUpdateError, "Update failed", CONC_UP_ERR_BACKTRACE
+      end
     end
     new_value
   end

metadata

@@ -1,43 +1,47 @@
 --- !ruby/object:Gem::Specification 
 name: atomic
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.0.5
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
-  - Charles Oliver Nutter
-  - MenTaLguY
+- Charles Oliver Nutter
+- MenTaLguY
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -05:00
-default_executable: 
+date: 2011-09-06 00:00:00 Z
 dependencies: []
 
 description: An atomic reference implementation for JRuby and green or GIL-threaded impls
 email: 
-  - headius@headius.com
-  - mental@rydia.net
+- headius@headius.com
+- mental@rydia.net
 executables: []
 
 extensions: 
-  - ext/extconf.rb
+- ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
-  - lib/atomic.rb
-  - lib/atomic_reference.jar
-  - examples/atomic_example.rb
-  - test/test_atomic.rb
-  - ext/atomic_reference.c
-  - ext/AtomicReferenceService.java
-  - ext/extconf.rb
-  - ext/org/jruby/ext/atomic/AtomicReferenceLibrary.java
-  - README.txt
-  - atomic.gemspec
-  - Rakefile
-has_rdoc: true
+- lib/atomic.rb
+- lib/atomic_reference.jar
+- examples/atomic_example.rb
+- examples/bench_atomic.rb
+- test/test_atomic.rb
+- ext/atomic_reference.c
+- ext/AtomicReferenceService.java
+- ext/extconf.rb
+- ext/org/jruby/ext/atomic/AtomicReferenceLibrary.java
+- README.txt
+- atomic.gemspec
+- Rakefile
 homepage: http://github.com/headius/ruby-atomic
 licenses: []
 
@@ -45,25 +49,31 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An atomic reference implementation for JRuby and green or GIL-threaded impls
 test_files: 
-  - test/test_atomic.rb
+- test/test_atomic.rb