higgs 0.1.5 → 0.1.6

data/test/test_thread.rb

@@ -27,16 +27,16 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     def test_start_wait
       latch = Latch.new
 
       lock = Mutex.new
       count = 0
-      th_grp = ThreadGroup.new
+      th_list = []
       COUNT_OF_THREADS.times do
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           latch.wait
           lock.synchronize{ count += 1 }
         }
@@ -47,7 +47,7 @@ module Higgs::Test
 
       latch.start
       timeout(10) {
-        for t in th_grp.list
+        for t in th_list
           t.join
         end
       }
@@ -61,16 +61,16 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     def test_count_down_wait
       latch = CountDownLatch.new(3)
 
       lock = Mutex.new
       count = 0
-      th_grp = ThreadGroup.new
+      th_list = []
       COUNT_OF_THREADS.times do
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           latch.wait
           lock.synchronize{ count += 1 }
         }
@@ -89,7 +89,7 @@ module Higgs::Test
 
       latch.count_down
       timeout(10) {
-        for t in th_grp.list
+        for t in th_list
           t.join
         end
       }
@@ -103,7 +103,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     def test_wait
       barrier = Barrier.new(COUNT_OF_THREADS)
@@ -117,17 +117,17 @@ module Higgs::Test
         }
       }
 
-      th_grp = ThreadGroup.new
+      th_list = []
       (COUNT_OF_THREADS - 1).times do
-        th_grp.add(th_new.call)
+        th_list << th_new.call
       end
 
       sleep(DELTA_T)
       assert_equal(0, lock.synchronize{ count })
 
-      th_grp.add(th_new.call)
+      th_list << th_new.call
       timeout(10) {
-        for t in th_grp.list
+        for t in th_list
           t.join
         end
       }
@@ -147,7 +147,7 @@ module Higgs::Test
     include Timeout
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     def calc
       @s = 0                    # @s's scope is over multi-threading
@@ -198,9 +198,9 @@ module Higgs::Test
       lock = Mutex.new
       count = 0
 
-      th_grp = ThreadGroup.new
+      th_list = []
       COUNT_OF_THREADS.times{|i|  # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           barrier.wait
           assert_equal(expected_result, work.result, "th#{i}")
           lock.synchronize{ count += 1 }
@@ -212,7 +212,7 @@ module Higgs::Test
 
       latch.start
       timeout(10) {
-        for t in th_grp.list
+        for t in th_list
           t.join
         end
       }
@@ -303,9 +303,9 @@ module Higgs::Test
       }
 
       barrier = Barrier.new(COUNT_OF_THREADS + 1)
-      th_grp = ThreadGroup.new
+      th_list = []
       COUNT_OF_THREADS.times{|i|# `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           barrier.wait
           assert_raise(RuntimeError, "thread: #{i}") {
             work.result
@@ -314,7 +314,7 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
     end
@@ -325,7 +325,7 @@ module Higgs::Test
     include ThreadParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     def setup
       @rw_lock = ReadWriteLock.new
@@ -352,11 +352,11 @@ module Higgs::Test
 
     def test_read_lock_multithread
       v = "foo"
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 1)
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           r_lock = @rw_lock.read_lock
           r_lock.synchronize{
             barrier.wait
@@ -368,18 +368,18 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
     end
 
     def test_write_lock_multithread
       count = 0
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 1)
 
       COUNT_OF_THREADS.times do
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           w_lock = @rw_lock.write_lock
           barrier.wait
           WORK_COUNT.times do
@@ -391,7 +391,7 @@ module Higgs::Test
       end
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
       assert_equal(COUNT_OF_THREADS * WORK_COUNT, count)
@@ -399,11 +399,11 @@ module Higgs::Test
 
     def test_read_write_lock_multithread
       count = 0
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS * 2 + 1)
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           r_lock = @rw_lock.read_lock
           r_lock.synchronize{
             barrier.wait
@@ -415,7 +415,7 @@ module Higgs::Test
       }
 
       COUNT_OF_THREADS.times do
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           w_lock = @rw_lock.write_lock
           barrier.wait
           WORK_COUNT.times do
@@ -427,7 +427,7 @@ module Higgs::Test
       end
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
       assert_equal(COUNT_OF_THREADS * WORK_COUNT, count)
@@ -435,10 +435,10 @@ module Higgs::Test
 
     def test_write_read_lock_multithread
       count = 0
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 2)
 
-      th_grp.add Thread.new{
+      th_list << Thread.new{
         w_lock = @rw_lock.write_lock
         w_lock.synchronize{
           barrier.wait
@@ -451,7 +451,7 @@ module Higgs::Test
       }
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           r_lock = @rw_lock.read_lock
           barrier.wait
           r_lock.synchronize{
@@ -461,7 +461,7 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
     end
@@ -469,11 +469,11 @@ module Higgs::Test
     def test_read_write_race
       count = 0
       value = true
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 2)
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           r_lock = @rw_lock.read_lock
           barrier.wait
           WORK_COUNT.times do
@@ -485,7 +485,7 @@ module Higgs::Test
         }
       }
 
-      th_grp.add Thread.new{
+      th_list << Thread.new{
         w_lock = @rw_lock.write_lock
         barrier.wait
         WORK_COUNT.times do
@@ -498,7 +498,7 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
     end
@@ -509,7 +509,7 @@ module Higgs::Test
     include ThreadParams
 
     # for ident(1)
-    CVS_ID = '$Id: test_thread.rb 686 2007-11-13 16:42:21Z toki $'
+    CVS_ID = '$Id: test_thread.rb 781 2008-07-28 15:13:27Z toki $'
 
     class Counter
       def initialize
@@ -528,11 +528,11 @@ module Higgs::Test
     end
 
     def test_transaction
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 1)
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           barrier.wait
           WORK_COUNT.times do |j|
             @pool.transaction{|c|
@@ -545,7 +545,7 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
 
@@ -560,12 +560,12 @@ module Higgs::Test
     end
 
     def test_shutdown
-      th_grp = ThreadGroup.new
+      th_list = []
       barrier = Barrier.new(COUNT_OF_THREADS + 1)
       latch = CountDownLatch.new(COUNT_OF_THREADS)
 
       COUNT_OF_THREADS.times{|i| # `i' should be local scope of thread block
-        th_grp.add Thread.new{
+        th_list << Thread.new{
           barrier.wait
           assert_raise(Pool::ShutdownException) {
             j = 0
@@ -585,7 +585,7 @@ module Higgs::Test
       barrier.wait
       latch.wait
       @pool.shutdown
-      for t in th_grp.list
+      for t in th_list
         t.join
       end
     end

data/test/test_tman.rb

@@ -15,7 +15,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 745 2008-01-20 13:28:02Z toki $'
+    CVS_ID = '$Id: test_tman.rb 781 2008-07-28 15:13:27Z toki $'
 
     def setup
       @test_dir = 'st_test'
@@ -1088,7 +1088,7 @@ module Higgs::Test
 
   class TransactionManagerTest_with_SecondaryCache < TransactionManagerTest
     # for ident(1)
-    CVS_ID = '$Id: test_tman.rb 745 2008-01-20 13:28:02Z toki $'
+    CVS_ID = '$Id: test_tman.rb 781 2008-07-28 15:13:27Z toki $'
 
     def setup
       super

data/test/test_tman_init_opts.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module Higgs::Test
   class TransactionManagerInitOptionsTest < Test::Unit::TestCase
     # for ident(1)
-    CVS_ID = '$Id: test_tman_init_opts.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_tman_init_opts.rb 781 2008-07-28 15:13:27Z toki $'
 
     include Higgs::TransactionManager::InitOptions
 

data/test/test_tman_mvcc.rb

@@ -46,20 +46,20 @@ module Higgs::Test
 
     class RunFlag
       def initialize(running)
-        #@lock = Mutex.new
+        @lock = Mutex.new
         @running = running
       end
 
       def running=(running)
-        #@lock.synchronize{
+        @lock.synchronize{
           @running = running
-        #}
+        }
       end
 
       def running?
-        #@lock.synchronize{
+        @lock.synchronize{
           @running
-        #}
+        }
       end
     end
 
@@ -202,12 +202,12 @@ module Higgs::Test
 
     def test_read_write_multithread_mvcc
       do_read = RunFlag.new(true)
-      read_th_grp = ThreadGroup.new
-      write_th_grp = ThreadGroup.new
+      th_read_list = []
+      th_write_list = []
       barrier = Barrier.new((READ_THREAD_COUNT + WRITE_THREAD_COUNT) + 1)
 
       READ_THREAD_COUNT.times{|i|
-        read_th_grp.add Thread.new{
+        th_read_list << Thread.new{
           barrier.wait
           while (do_read.running?)
             @tman.transaction(true) {|tx|
@@ -220,7 +220,7 @@ module Higgs::Test
       }
 
       WRITE_THREAD_COUNT.times{|i|
-        write_th_grp.add Thread.new{
+        th_write_list << Thread.new{
           barrier.wait
           WORK_COUNT.times do |j|
             begin
@@ -237,12 +237,12 @@ module Higgs::Test
       }
 
       barrier.wait
-      for t in write_th_grp.list
+      for t in th_write_list
         t.join
       end
 
       do_read.running = false
-      for t in read_th_grp.list
+      for t in th_read_list
         t.join
       end
 

data/test/test_utils_bman.rb

@@ -15,13 +15,15 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_utils_bman.rb 742 2008-01-13 15:55:53Z toki $'
+    CVS_ID = '$Id: test_utils_bman.rb 781 2008-07-28 15:13:27Z toki $'
 
     STORAGE_ITEMS = (ENV['STORAGE_ITEMS'] || '100').to_i
     WARM_START_ITEMS = (ENV['WARM_START_ITEMS'] || '1000').to_i
     MAX_ITEM_BYTES = (ENV['MAX_ITEM_BYTES'] || '16384').to_i
     ITEM_CHARS = ('A'..'Z').to_a + ('a'..'z').to_a
 
+    SERVICES_PORT = '17320'
+
     def setup
       srand(0)
       @from_dir = 'bman_from'
@@ -34,7 +36,7 @@ module Higgs::Test
       FileUtils.mkdir_p(@from_dir)
       FileUtils.rm_rf(@to_dir)  # for debug
       FileUtils.mkdir_p(@to_dir)
-      @remote_services_uri = 'druby://localhost:17320'
+      @remote_services_uri = "druby://localhost:#{SERVICES_PORT}"; SERVICES_PORT.succ!
       @from_st = Storage.new(@from,
                              :jlog_rotate_max => 0,
                              :logger => proc{|path|

metadata

@@ -3,14 +3,14 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: higgs
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2008-01-20 00:00:00 +09:00
+  version: 0.1.6
+date: 2008-07-29 00:00:00 +09:00
 summary: pure ruby transactional storage compatible with unix TAR format
 require_paths: 
 - lib
 email: toki@freedom.ne.jp
-homepage: 
-rubyforge_project: 
+homepage: http://higgs.rubyforge.org/
+rubyforge_project: higgs
 description: 
 autorequire: 
 default_executable: 
@@ -29,10 +29,6 @@ post_install_message:
 authors: 
 - TOKI Yoshinori
 files: 
-- misc/dbm_bench/Rakefile
-- test/Rakefile
-- Rakefile
-- misc/dbm_bench/.strc
 - lib/cgi/session/higgs.rb
 - lib/higgs/jlog.rb
 - lib/higgs/utils/bman.rb
@@ -53,6 +49,8 @@ files:
 - lib/higgs/version.rb
 - lib/higgs/utils.rb
 - lib/higgs.rb
+- misc/dbm_bench/Rakefile
+- misc/dbm_bench/.strc
 - misc/cache_bench/cache_bench.rb
 - misc/thread_bench/lock_bench.rb
 - misc/dbm_bench/dbm_seq_read.rb
@@ -61,10 +59,14 @@ files:
 - misc/dbm_bench/dbm_seq_write.rb
 - misc/dbm_bench/st_verify.rb
 - misc/dbm_bench/dbm_rnd_delete.rb
+- misc/dbm_bench/run.rb
 - misc/dbm_bench/dbm_rnd_update.rb
 - misc/io_bench/write_bench.rb
 - misc/io_bench/cksum_bench.rb
 - misc/io_bench/jlog_bench.rb
+- sample/count.rb
+- sample/dbmtest.rb
+- test/Rakefile
 - test/test_cgi_session.rb
 - test/test_utils_bman.rb
 - test/test_lock.rb
@@ -88,16 +90,6 @@ files:
 - test/test_store.rb
 - test/test_jlog.rb
 - test/test_online_backup.rb
-- mkrdoc.rb
-- sample/count.rb
-- sample/dbmtest.rb
-- rdoc.yml
-- bin/higgs_apply_jlog
-- bin/higgs_backup
-- bin/higgs_dump_index
-- bin/higgs_dump_jlog
-- bin/higgs_ping
-- bin/higgs_verify
 - ChangeLog
 - LICENSE
 - README

data/Rakefile

@@ -1,81 +0,0 @@
-# for ident(1)
-CVS_ID = '$Id: Rakefile 678 2007-11-09 16:08:34Z toki $'
-
-require 'lib/higgs/version'
-require 'rake/gempackagetask'
-require 'yaml'
-
-LIB_DIR = 'lib'
-TEST_DIR = 'test'
-RDOC_DIR = 'api'
-
-def cd_v(dir)
-  cd(dir, :verbose => true) {
-    yield
-  }
-end
-
-def load_rdoc_opts
-  YAML.load(IO.read('rdoc.yml'))
-end
-
-task :default
-
-task :test do
-  cd_v TEST_DIR do
-    sh 'rake'
-  end
-end
-
-task :rdoc do
-  rdoc_opts = load_rdoc_opts
-  sh 'rdoc', *(rdoc_opts['CommonOptions'] + rdoc_opts['CommandLineOptions']).flatten
-end
-
-task :rdoc_clean do
-  rm_rf RDOC_DIR
-end
-
-task :rdoc_upload => [ :rdoc_clean, :rdoc ] do
-  sh 'scp', '-pr', RDOC_DIR, 'rubyforge.org:/var/www/gforge-projects/higgs/.'
-end
-
-spec = Gem::Specification.new{|s|
-  s.name = 'higgs'
-  s.version = Higgs::VERSION
-  s.summary = 'pure ruby transactional storage compatible with unix TAR format'
-  s.author = 'TOKI Yoshinori'
-  s.email = 'toki@freedom.ne.jp'
-  s.executables  = %w[
-    higgs_apply_jlog
-    higgs_backup
-    higgs_dump_index
-    higgs_dump_jlog
-    higgs_ping
-    higgs_verify
-  ]
-  s.files = Dir['**/{Rakefile,.strc,*.{rb,yml}}']
-  s.files += %w[ ChangeLog LICENSE README ]
-  s.test_files = %w[ test/run.rb ]
-  s.has_rdoc = true
-  s.rdoc_options = load_rdoc_opts['CommonOptions'].flatten
-}
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar_gz = true
-end
-
-task :gem_install => [ :gem ] do
-  sh 'gem', 'install', "pkg/higgs-#{Higgs::VERSION}.gem"
-end
-
-task :clean => [ :rdoc_clean, :clobber_package ] do
-  cd_v 'misc/dbm_bench' do
-    sh 'rake', 'clean'
-  end
-end
-
-# Local Variables:
-# mode: Ruby
-# indent-tabs-mode: nil
-# End:

data/mkrdoc.rb

@@ -1,11 +0,0 @@
-#!/usr/local/bin/ruby
-
-# for ident(1)
-CVS_ID = '$Id: mkrdoc.rb 604 2007-10-02 15:28:03Z toki $'
-
-require 'fileutils'
-require 'yaml'
-
-rdoc_opts = YAML.load(IO.read('rdoc.yml'))
-FileUtils.rm_rf(rdoc_opts['CommandLineOptions'].assoc('-o')[1], :verbose => true)
-system('rdoc', *(rdoc_opts['CommonOptions'] + rdoc_opts['CommandLineOptions']).flatten)

data/rdoc.yml

@@ -1,13 +0,0 @@
-CommonOptions:
-  - -SNa
-  - [ -i, . ]
-  - [ -m, Higgs ]
-
-CommandLineOptions:
-  - [ -i, lib ]
-  - [ -x, misc ]
-  - [ -x, mkrdoc ]
-  - [ -x, pkg ]
-  - [ -x, sample ]
-  - [ -x, test ]
-  - [ -o, api ]