google_hash 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4a00aced4b559a55a20aec05d369d460b9137e
-  data.tar.gz: cf14467fd332cf5463922939c51e63362ccabcc5
+  metadata.gz: 3e2e281069867860a9b95da176c64ea6cac6edd4
+  data.tar.gz: 6fefbaa4dd867690a8c98e71a673e3a1f2ce88a0
 SHA512:
-  metadata.gz: 1d7e3c4cfb37e5f185adb0fa52cf87c016643ec86586e82251f83459e13b22a2842fe21c29f632fefb8ae935eb626f79475df31371de67885e4c64e7de2e956a
-  data.tar.gz: 06d813011b63e66e22b5fb2a1000617346f061d5f3d13551690942c2d4d17216cb8f7c970fb06970213992150213d8a356010cf092449400a59adb07137de9df
+  metadata.gz: 20451dff5baf9e8c88718646f595588825dff169762abc1cd15c45c5de12890b5299e9ce92d28c0f2bbb8cd6d4c8ae92f79ce61d89a9218b43836ba068e87441
+  data.tar.gz: 1553b2b10b4d8850050efd971d6a2f6e5367a263c98b26ba9857086bed37bb0cc362991440e697942fa37356dd366905539aeedf1c177be9931edf4f0241c186

data/ChangeLog.txt

@@ -1,3 +1,7 @@
+0.9.0
+  fix possible segfault during GC, all using this recommended to upgrade to it!
+    only affected people using RubyToInt or RubyToX
+
 0.8.9
   hopefully fix build failure OS X newer xcode releases
 

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.9.0

data/ext/.gitignore

@@ -0,0 +1,3 @@
+*.o
+*.cpp
+sparsehash-2.0.2

data/ext/clean.bat

@@ -1,6 +1,6 @@
 rm *.cpp 
 rm *.o
-rm *.so
-rm *.def
+rm -f *.so
+rm -f *.def
 rm *.bundle
 rm mkmf.log

data/ext/extconf.rb

@@ -39,7 +39,8 @@ else
 end
 
 ruby_key =  {:convert_keys_from_ruby => "", :convert_keys_to_ruby => "", :key_type => "VALUE", :english_key_type => "ruby",
-  :extra_hash_params => ", hashrb, eqrb", :unreachable_key => "current_instance"}  # TODO unreachable -> NULL instead?
+  :extra_hash_params => ", hashrb, eqrb", :unreachable_key => "(VALUE) 0", :deleted_key => "(VALUE) -1"}  
+# VALUE is a 64bit pointer as far as I can tell...so using 0 OK here since they'll never be NULL in real C land
   
 int_key = {:assert_key_type => 'T_FIXNUM', :convert_keys_from_ruby => "FIX2INT",
   :convert_keys_to_ruby => "INT2FIX", :key_type => "int", :unreachable_key => "#{unreachable_int}"}
@@ -78,6 +79,7 @@ for key in [ruby_key, int_key, bignum_as_double_key, long_key] do
 
       # create local variables so that the template can look cleaner
       unreachable_key = options[:unreachable_key]
+      deleted_key = options[:deleted_key] || "(#{options[:unreachable_key]}) - 1"
       convert_keys_from_ruby = options[:convert_keys_from_ruby]
       convert_keys_to_ruby = options[:convert_keys_to_ruby]
       key_type = options[:key_type]

data/ext/template/google_hash.cpp.erb

@@ -96,10 +96,22 @@ struct eqrb
     if(s1 == s2) {
       return true;
     }
-    
-    // this line from object.c's rb_eql 
-    // lookup 0.278 -> 0.26 
+    // the weird part here is that eqrb is used during iteration
+    // to iterate over the entire "hash space" and see which objects are
+    // "live" and which are "dead" in its iterator (as well as being used at insertion time)
+    //  during gc, it was calling in to a real ruby "==" for the "live" objects
+    // which, if they used any type of allocation -> segfault
+    // since we're only dealing with ruby VALUE's here, I think we're guaranteed that they can't be NULL
+    <% if type == 'dense' %> 
+      if (s2 == <%= unreachable_key %> || s2 == <%= deleted_key %> || s1 == <%= unreachable_key %> || s1 == <%= deleted_key %>) {
+    <% elsif type == 'sparse' %> 
+      if (s2 == <%= unreachable_key %> || s1 == <%= unreachable_key %>) {
+    <% end %>
+        return s1 == s2; // comparison with these freako keys is straight forward :)
+      }
 
+    // this line (cacheing id_eql) from object.c's rb_eql 
+    // lookup 0.278 -> 0.26 
     return RTEST(rb_funcall(s1, id_eql, 1, s2));
   }
 };
@@ -199,8 +211,8 @@ callback_alloc( VALUE klass )
     <% if type == 'dense' %> 
       // needs both empty key and deleted keys [and different] for deletes...
       cbs->hash_map->set_empty_key(<%= unreachable_key %>);
-      // in th eory could also call set_deleted_key "anytime" ...
-      cbs->hash_map->set_deleted_key((<%= unreachable_key %>)-1); // hope this is also typically unreachable from ruby land [?]
+      // in theory could also call set_deleted_key "anytime" ... but why not do it now
+      cbs->hash_map->set_deleted_key(<%= deleted_key %>);
     <% elsif type == 'sparse' %> 
        cbs->hash_map->set_deleted_key(<%= unreachable_key %>);
     <% end %>

data/spec/spec.google_hash.rb

@@ -8,6 +8,11 @@ rescue LoadError
   require 'rspec/autorun'
 end
 
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should } # silence warning
+end
+
 describe "google_hash" do
 
   before do
@@ -113,12 +118,6 @@ describe "google_hash" do
     a['abc'].should == 'def'
   end
 
-  it "should have better namespace" do
-    pending do
-      GoogleHash::Sparse
-    end
-  end
-
   it "should disallow non numeric keys" do
     lambda { @subject['33']}.should raise_error(TypeError)
   end
@@ -181,7 +180,7 @@ describe "google_hash" do
   
   it "should raise on errant values" do
     a = GoogleHashDenseIntToInt.new
-    proc { a[3] = 'abc'}.should raise_error
+    proc { a[3] = 'abc'}.should raise_error(TypeError)
   end
   
   it "should do bignum values as doubles" do
@@ -232,7 +231,7 @@ describe "google_hash" do
   end
 
   it "should do bignum to doubles et al" do
-    test_big_numbers( GoogleHashDenseDoubleToDouble.new)
+    test_big_numbers(GoogleHashDenseDoubleToDouble.new)
   end
   
   it "should allow for storing true BigNum" do
@@ -254,7 +253,18 @@ describe "google_hash" do
 	  sum.should == 7
 	end
   end
-  
+
+  it "should not call Ruby #== during GC" do
+    a = GoogleHashSparseRubyToRuby.new
+    b = Object.new
+    def b.eql?(something)
+      raise "should not call this during GC!"
+    end
+    a[b] = 3
+    GC.start # used to raise...
+    a.each{|k, v| } # just in case, this really shouldn't either
+  end
+
   it "should have nice inspect" do
     a = GoogleHashSparseIntToRuby.new
     a[3] = 4
@@ -262,7 +272,7 @@ describe "google_hash" do
     a.inspect.should == "GoogleHashSparseIntToRuby {3=>4,4=>5}"
   end
   
-  it "should skip GC when native to native" do
+  it "should skip iterating during GC when native to native" do
     pending 'caring, get from gc_bench.rb'
   end
   
@@ -277,7 +287,7 @@ describe "google_hash" do
         keys << (1<<61)
       end
       keys.each{|k|
-        it "should allow for setting the right keys #{k} #{c}" do
+        it "should allow for setting the right keys key=#{k} class=#{c} (1<<61=#{1<<61})" do
           instance = c.new
           instance[k].should == nil
           instance[k] = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_hash
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - rogerdpack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sane
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- ext/.gitignore
 - ext/clean.bat
 - ext/extconf.rb
 - ext/go.bat
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrappers to the google hash library