tdb 0.2.0 → 0.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.2.0.GIT
+DEF_VER=v0.3.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -4,6 +4,7 @@ RUBY = ruby
 RAKE = rake
 RSYNC = rsync
 GIT_URL = git://git.bogomips.org/ruby-tdb.git
+CGIT_URL = http://git.bogomips.org/cgit/ruby-tdb.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -65,13 +66,14 @@ ChangeLog: GIT-VERSION-FILE
 	mv $@+ $@
 
 news_atom := http://bogomips.org/ruby-tdb/NEWS.atom.xml
-cgit_atom := http://git.bogomips.org/cgit/ruby-tdb.git/atom/?h=master
+cgit_atom := $(CGIT_URL)/atom/?h=master
 atom = <link rel="alternate" title="Atom feed" href="$(1)" \
              type="application/atom+xml"/>
 
 # using rdoc 2.5.x
 doc: .document NEWS ChangeLog
-	rdoc -t "$(shell sed -ne '1s/^= //p' README)"
+	rdoc --webcvs=$(CGIT_URL)/tree/%s \
+	  -t "$(shell sed -ne '1s/^= //p' README)"
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document) doc/
 	$(RUBY) -i -p -e \

data/ext/tdb/extconf.rb

@@ -9,5 +9,7 @@ have_library('tdb') or abort 'libtdb missing'
 have_func('tdb_jenkins_hash')
 have_func('tdb_repack')
 have_const('TDB_ERR_NESTING', 'tdb.h')
+have_header('pthread.h')
+have_library('pthread')
 
 create_makefile('tdb_ext')

data/ext/tdb/hash_functions.c

@@ -0,0 +1,40 @@
+#include "rbtdb.h"
+
+#define HASH_FN(fn) \
+static VALUE fn(VALUE self,VALUE str) \
+{ \
+	TDB_DATA data; \
+	StringValue(str); \
+	data.dptr = (unsigned char *)RSTRING_PTR(str); \
+	data.dsize = RSTRING_LEN(str); \
+	return UINT2NUM(rbtdb_##fn(&data)); \
+}
+
+HASH_FN(murmur1)
+HASH_FN(murmur1_aligned)
+HASH_FN(murmur2)
+HASH_FN(murmur2a)
+HASH_FN(murmur2_neutral)
+HASH_FN(murmur2_aligned)
+HASH_FN(fnv1a)
+HASH_FN(djb2)
+HASH_FN(djb3)
+HASH_FN(jenkins_lookup3)
+
+#define HASH_M(fn) rb_define_method(mHashFunctions, "tdb_hash_"#fn, fn, 1)
+void rbtdb_init_tdb_hash_functions(void)
+{
+	VALUE cTDB = rb_const_get(rb_cObject, rb_intern("TDB"));
+	VALUE mHashFunctions = rb_define_module_under(cTDB, "HashFunctions");
+
+	HASH_M(murmur1);
+	HASH_M(murmur1_aligned);
+	HASH_M(murmur2);
+	HASH_M(murmur2a);
+	HASH_M(murmur2_neutral);
+	HASH_M(murmur2_aligned);
+	HASH_M(fnv1a);
+	HASH_M(djb2);
+	HASH_M(djb3);
+	HASH_M(jenkins_lookup3);
+}

data/ext/tdb/tdb.c

@@ -8,7 +8,10 @@
 #else
 #  include <st.h>
 #endif
+#include <pthread.h>
 
+/* this protects the global list of tdb objects maintained by libtdb */
+static pthread_mutex_t big_lock = PTHREAD_MUTEX_INITIALIZER;
 static VALUE cTDB, cERR;
 static st_table *exc_hash;
 static VALUE hashes;
@@ -116,8 +119,12 @@ static void gcfree(void *ptr)
 {
 	struct tdb_context *tdb = ptr;
 
-	if (tdb)
+	/* no error checking in GC :< */
+	if (tdb) {
+		(void)pthread_mutex_lock(&big_lock);
 		(void)tdb_close(tdb);
+		(void)pthread_mutex_unlock(&big_lock);
+	}
 }
 
 static VALUE alloc(VALUE klass)
@@ -152,8 +159,10 @@ static VALUE nogvl_open(void *ptr)
 	struct open_args *o = ptr;
 	struct tdb_context *tdb;
 
+	pthread_mutex_lock(&big_lock);
 	tdb = tdb_open_ex(o->name, o->hash_size, o->tdb_flags,
 	                  o->open_flags, o->mode, o->log_ctx, o->hash_fn);
+	pthread_mutex_unlock(&big_lock);
 
 	return (VALUE)tdb;
 }
@@ -274,8 +283,13 @@ static VALUE init(int argc, VALUE *argv, VALUE self)
 static VALUE nogvl_close(void *ptr)
 {
 	struct tdb_context *tdb = ptr;
+	VALUE rv;
 
-	return (VALUE)tdb_close(tdb);
+	pthread_mutex_lock(&big_lock);
+	rv = (VALUE)tdb_close(tdb);
+	pthread_mutex_unlock(&big_lock);
+
+	return rv;
 }
 
 static VALUE tdbclose(VALUE self)
@@ -737,6 +751,7 @@ void Init_tdb_ext(void)
 	/* Better hashing, but can't be opened by tdb < 1.2.6. */
 	rb_define_const(cTDB, "INCOMPATIBLE_HASH", UINT2NUM(TDB_INCOMPATIBLE_HASH));
 #endif
+	rbtdb_init_tdb_hash_functions();
 }
 
 /*

data/lib/tdb/mt.rb

@@ -12,19 +12,13 @@ module TDB::MT
     lockall trylockall unlockall
     lockall_read trylockall_read unlockall_read
     lockall_mark lockall_unmark
-    clear
+    clear each
   )
   wrap_methods << :repack if TDB.method_defined?(:repack)
   wrap_methods.each do |meth|
     eval "def #{meth}(*args); @lock.synchronize { super }; end"
   end
 
-  def each(&block)
-    @lock.synchronize do
-      super { |k,v| @lock.exclusive_unlock { yield(k,v) } }
-    end
-  end
-
   def threadsafe?
     true
   end

data/test/test_tdb_hash_functions.rb

@@ -0,0 +1,15 @@
+# -*- encoding: binary -*-
+require 'test/unit'
+$-w = true
+require 'tdb'
+
+class TestHashFunctions < Test::Unit::TestCase
+  include TDB::HashFunctions
+
+  def test_hashes
+    TDB::HASHES.each do |name,_|
+      next if :default == name
+      assert_kind_of Integer, __send__("tdb_hash_#{name}", "hello")
+    end
+  end
+end

data/test/test_tdb_mt.rb

@@ -23,7 +23,6 @@ class Test_TDB_MT < Test::Unit::TestCase
     assert ! @tdb.threadsafe?
     assert_nothing_raised { @tdb.threadsafe! }
     assert @tdb.threadsafe?
-    @tdb.each { |k,v| assert_equal v, @tdb[k] }
   end
 
   def test_init_threadsafe
@@ -39,13 +38,15 @@ class Test_TDB_MT < Test::Unit::TestCase
   end
 
   def test_thread_safe_torture_test
-    @tdb = TDB.new(nil)
+    @tmp = Tempfile.new('tdb_test')
+    File.unlink(@tmp.path)
+    @tdb = TDB.new(@tmp.path)
     assert_nothing_raised { @tdb.threadsafe! }
-    pid = fork do
-      Thread.abort_on_exception = true
+    Thread.abort_on_exception = true
+    nr = 10000
+    blob = 'foo' * 1000
+    crazy = proc do
       threads = []
-      blob = 'foo' * 1000
-      nr = 10000
       t = Thread.new do
         while true
           Thread.pass
@@ -56,13 +57,17 @@ class Test_TDB_MT < Test::Unit::TestCase
       threads << Thread.new { nr.times { |i| @tdb[i.to_s] = blob } }
       threads << Thread.new { nr.times { |i| @tdb[i.to_s] = blob } }
       threads << Thread.new { nr.times { |i| @tdb[i.to_s] = blob } }
+      threads << Thread.new { nr.times { |i| @tdb[i.to_s] = blob } }
       threads << t
-
+      sleep 1
       t.kill
       threads.each { |t| t.join }
     end
-    _, status = Process.waitpid2(pid)
-    assert status.success?, status.inspect
+    10.times { fork &crazy }
+    Process.waitall.each do |(pid,status)|
+      assert status.success?, status.inspect
+    end
+    nr.times { |i| assert_equal blob, @tdb[i.to_s] }
   end
 
   def test_check_methods

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tdb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ruby tdb hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +00:00
+date: 2010-12-14 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ files:
 - ext/tdb/djb.c
 - ext/tdb/extconf.rb
 - ext/tdb/fnv.c
+- ext/tdb/hash_functions.c
 - ext/tdb/lookup3.c
 - ext/tdb/murmur1.c
 - ext/tdb/murmur2.c
@@ -67,6 +68,7 @@ files:
 - setup.rb
 - tdb.gemspec
 - test/test_tdb.rb
+- test/test_tdb_hash_functions.rb
 - test/test_tdb_mt.rb
 has_rdoc: true
 homepage: http://bogomips.org/ruby-tdb/
@@ -106,4 +108,5 @@ specification_version: 3
 summary: Trivial Database bindings for Ruby
 test_files: 
 - test/test_tdb_mt.rb
+- test/test_tdb_hash_functions.rb
 - test/test_tdb.rb