thread_safe 0.1.3 → 0.2.0

data/test/test_hash.rb

@@ -9,7 +9,6 @@ class TestHash < Test::Unit::TestCase
         Thread.new do
           1000.times do |j|
             hsh[i*1000+j] = i
-            hsh.each {|k,v| k + v}
             hsh[i*1000+j]
             hsh.delete(i*1000+j)
           end
@@ -17,4 +16,4 @@ class TestHash < Test::Unit::TestCase
       end.map(&:join)
     end
   end
-end
+end

data/test/test_helper.rb

@@ -1,5 +1,31 @@
 require 'thread'
 
+if defined?(JRUBY_VERSION) && ENV['TEST_NO_UNSAFE']
+  # to be used like this: rake test TEST_NO_UNSAFE=true
+  load 'test/package.jar'
+  java_import 'thread_safe.SecurityManager'
+  manager = SecurityManager.new
+
+  # Prevent accessing internal classes
+  manager.deny java.lang.RuntimePermission.new("accessClassInPackage.sun.misc")
+  java.lang.System.setSecurityManager manager
+
+  class TestNoUnsafe < Test::Unit::TestCase
+    def test_security_manager_is_used
+      begin
+        java_import 'sun.misc.Unsafe'
+        flunk
+      rescue SecurityError
+      end
+    end
+
+    def test_no_unsafe_version_of_chmv8_is_used
+      require 'thread_safe/jruby_cache_backend' # make sure the jar has been loaded
+      assert !Java::OrgJrubyExtThread_safe::JRubyCacheBackendLibrary::JRubyCacheBackend::CAN_USE_UNSAFE_CHM
+    end
+  end
+end
+
 module ThreadSafe
   module Test
     class Latch
@@ -66,8 +92,12 @@ module ThreadSafe
 
     HASH_COLLISION_CLASSES = [HashCollisionKey, HashCollisionKey2, HashCollisionKeyNoCompare, HashCollisionKey4]
 
-    def self.HashCollisionKey(key)
-      HASH_COLLISION_CLASSES[rand(4)].new(key)
+    def self.HashCollisionKey(key, hash = key.hash % 3)
+      HASH_COLLISION_CLASSES[rand(4)].new(key, hash)
+    end
+
+    class HashCollisionKeyNonComparable < HashCollisionKey
+      undef <=>
     end
   end
-end
+end

data/test/test_synchronized_delegator.rb

@@ -2,41 +2,91 @@ require 'test/unit'
 require 'thread_safe/synchronized_delegator.rb'
 
 class TestSynchronizedDelegator < Test::Unit::TestCase
+  def setup
+    @old_abort = Thread.abort_on_exception
+    Thread.abort_on_exception = true
+  end
+
+  def teardown
+    Thread.abort_on_exception = @old_abort
+  end
+
   def test_wraps_array
-    ary = []
-    sync_ary = SynchronizedDelegator.new(ary)
+    sync_array = SynchronizedDelegator.new(array = [])
 
-    ary << 1
-    assert_equal 1, sync_ary[0]
+    array << 1
+    assert_equal 1, sync_array[0]
+
+    sync_array << 2
+    assert_equal 2, array[1]
   end
 
   def test_synchronizes_access
-    ary = []
-    sync_ary = SynchronizedDelegator.new(ary)
+    t1_continue, t2_continue = false, false
 
-    t1_continue = false
-    t2_continue = false
+    hash = Hash.new do |hash, key|
+      t2_continue = true
+      unless hash.find { |e| e[1] == key.to_s } # just to do something
+        hash[key] = key.to_s
+        Thread.pass until t1_continue
+      end
+    end
+    sync_hash = SynchronizedDelegator.new(hash)
+    sync_hash[1] = 'egy'
 
     t1 = Thread.new do
-      sync_ary << 1
-      sync_ary.each do
+      sync_hash[2] = 'dva'
+      sync_hash[3] # triggers t2_continue
+    end
+
+    t2 = Thread.new do
+      Thread.pass until t2_continue
+      sync_hash[4] = '42'
+    end
+
+    sleep(0.05) # sleep some to allow threads to boot
+
+    until t2.status == 'sleep' do
+      Thread.pass
+    end
+
+    assert_equal 3, hash.keys.size
+
+    t1_continue = true
+    t1.join; t2.join
+
+    assert_equal 4, sync_hash.size
+  end
+
+  def test_synchronizes_access_with_block
+    t1_continue, t2_continue = false, false
+
+    sync_array = SynchronizedDelegator.new(array = [])
+
+    t1 = Thread.new do
+      sync_array << 1
+      sync_array.each do
         t2_continue = true
         Thread.pass until t1_continue
       end
     end
 
     t2 = Thread.new do
+      # sleep(0.01)
       Thread.pass until t2_continue
-      sync_ary << 2
+      sync_array << 2
     end
-    
-    Thread.pass until t2.status == 'sleep'
-    assert_equal 1, ary.size
+
+    until t2.status == 'sleep' || t2.status == false do
+      Thread.pass
+    end
+
+    assert_equal 1, array.size
 
     t1_continue = true
-    t1.join
-    t2.join
+    t1.join; t2.join
 
-    assert_equal 2, sync_ary.size
+    assert_equal [1, 2], array
   end
+
 end

data/thread_safe.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/thread_safe/version', __FILE__)
+$:.push File.expand_path('../lib', __FILE__) unless $:.include?('lib')
+require 'thread_safe/version'
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Charles Oliver Nutter", "thedarkone"]
@@ -8,7 +9,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A collection of data structures and utilities to make thread-safe programming in Ruby easier}
   gem.homepage      = "https://github.com/headius/thread_safe"
 
-  gem.files         = `git ls-files`.split($\) | Dir['{lib,examples,test}/**/*.jar']
+  gem.files         = `git ls-files`.split($\)
+  gem.files        += ['lib/thread_safe/jruby_cache_backend.jar'] if defined?(JRUBY_VERSION)
   gem.platform      = 'java' if defined?(JRUBY_VERSION)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -17,5 +19,6 @@ Gem::Specification.new do |gem|
   gem.version       = Threadsafe::VERSION
   gem.license       = "Apache-2.0"
 
-  gem.add_dependency 'atomic'
+  gem.add_dependency 'atomic', ['>= 1.1.7', '< 2']
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thread_safe
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Charles Oliver Nutter
@@ -9,20 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Thread-safe collections and utilities for Ruby
@@ -33,16 +53,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - examples/bench_cache.rb
 - ext/org/jruby/ext/thread_safe/JRubyCacheBackendLibrary.java
+- ext/org/jruby/ext/thread_safe/jsr166e/ConcurrentHashMap.java
 - ext/org/jruby/ext/thread_safe/jsr166e/ConcurrentHashMapV8.java
 - ext/org/jruby/ext/thread_safe/jsr166e/LongAdder.java
 - ext/org/jruby/ext/thread_safe/jsr166e/Striped64.java
+- ext/org/jruby/ext/thread_safe/jsr166e/nounsafe/ConcurrentHashMapV8.java
+- ext/org/jruby/ext/thread_safe/jsr166e/nounsafe/LongAdder.java
+- ext/org/jruby/ext/thread_safe/jsr166e/nounsafe/Striped64.java
 - ext/org/jruby/ext/thread_safe/jsr166y/ThreadLocalRandom.java
 - ext/thread_safe/JrubyCacheBackendService.java
 - lib/thread_safe.rb
@@ -62,6 +87,7 @@ files:
 - lib/thread_safe/util/volatile_tuple.rb
 - lib/thread_safe/util/xor_shift_random.rb
 - lib/thread_safe/version.rb
+- test/src/thread_safe/SecurityManager.java
 - test/test_array.rb
 - test/test_cache.rb
 - test/test_cache_loops.rb
@@ -69,7 +95,6 @@ files:
 - test/test_helper.rb
 - test/test_synchronized_delegator.rb
 - thread_safe.gemspec
-- lib/thread_safe/jruby_cache_backend.jar
 homepage: https://github.com/headius/thread_safe
 licenses:
 - Apache-2.0
@@ -80,22 +105,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A collection of data structures and utilities to make thread-safe programming
   in Ruby easier
 test_files:
+- test/src/thread_safe/SecurityManager.java
 - test/test_array.rb
 - test/test_cache.rb
 - test/test_cache_loops.rb