fsdb 0.6.1 → 0.7.0

data/test/test.rb

@@ -8,15 +8,9 @@ $stderr.sync = true
 
 Thread.abort_on_exception = true
 
-if ARGV.delete("--fcntl-lock")
-  lock_type = :fcntl_lock
-  puts "Using fcntl lock"
-  require 'fcntl_lock'
-end
-
 tmp_dir = ENV['TMPDIR'] || ENV['TMP'] || 'tmp'
 dir = File.join(tmp_dir, 'fsdb')
-$db = Database.new(dir, :lock_type => lock_type)
+$db = Database.new(dir)
 
 mk_ext_pat = proc { |a| /\.(?:#{a.join("|")})$/i }
 

metadata

@@ -1,137 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fsdb
-version: !ruby/object:Gem::Version 
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2011-12-06 00:00:00.000000000 Z
+dependencies: []
+description: ! 'A file system data base. Provides a thread-safe, process-safe Database
+  class.
 
-date: 2009-07-18 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
-description: |
-  A file system data base. Provides a thread-safe, process-safe Database class.
   Each entry is a separate file referenced by its relative path. Allows multiple
+
   file formats and serialization methods. Pure ruby and very light weight.
 
+'
 email: vjoel@users.sourceforge.net
 executables: []
-
-extensions: 
-- ext/fsdb/extconf.rb
-extra_rdoc_files: 
+extensions: []
+extra_rdoc_files:
 - History.txt
-- README.txt
-- test/err.txt
-files: 
+- README.markdown
+files:
 - History.txt
-- README.txt
+- README.markdown
 - bench/bench.rb
-- examples/client.rb
-- examples/flat.rb
-- examples/formats.rb
-- examples/fsdb-example.rb
-- examples/fsdb-examples.rb
 - examples/indexes.rb
 - examples/rbformat.rb
-- examples/server.rb
-- examples/simple.rb
+- examples/formats.rb
 - examples/yaml.rb
+- examples/client.rb
+- examples/forks.rb
+- examples/flat.rb
+- examples/simple.rb
 - examples/yaml2.rb
-- ext/fsdb/MANIFEST
-- ext/fsdb/extconf.rb
-- ext/fsdb/fcntl-lock.c
+- examples/server.rb
+- examples/fsdb-examples.rb
+- examples/fsdb-example.rb
 - lib/fsdb.rb
-- lib/fsdb/compat.rb
-- lib/fsdb/database.rb
-- lib/fsdb/delegatable.rb
-- lib/fsdb/faster-modex.rb
-- lib/fsdb/faster-mutex.rb
-- lib/fsdb/file-lock.rb
-- lib/fsdb/formats.rb
 - lib/fsdb/formats/yaml.rb
 - lib/fsdb/modex.rb
-- lib/fsdb/mutex.rb
+- lib/fsdb/read-write-object.rb
+- lib/fsdb/formats.rb
+- lib/fsdb/file-lock.rb
 - lib/fsdb/nonpersistent-attr.rb
 - lib/fsdb/persistent.rb
+- lib/fsdb/util.rb
+- lib/fsdb/delegatable.rb
 - lib/fsdb/platform.rb
-- lib/fsdb/read-write-object.rb
+- lib/fsdb/database.rb
 - lib/fsdb/server.rb
-- lib/fsdb/util.rb
-- rakefile
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
-- test/err.txt
-- test/runs.rb
-- test/test-all.rb
-- test/test-concurrency.rb
-- test/test-concurrency/init.rb
-- test/test-concurrency/test-object.rb
-- test/test-file-lock.rb
-- test/test-formats.rb
 - test/test-fsdb.rb
-- test/test-modex.rb
-- test/test-mutex.rb
+- test/test-file-lock.rb
 - test/test-util.rb
-- test/test.rb
+- test/test-modex.rb
 - test/trap.rb
-has_rdoc: true
+- test/test.rb
+- test/test-concurrency/init.rb
+- test/test-concurrency/test-object.rb
+- test/test-formats.rb
+- test/runs.rb
+- test/test-concurrency.rb
+- test/test-all.rb
 homepage: http://rubyforge.org/projects/fsdb/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.txt
-require_paths: 
+- README.markdown
+require_paths:
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fsdb
-rubygems_version: 1.3.4
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: File System Database
-test_files: 
-- test/test-formats.rb
-- test/test-concurrency.rb
-- test/test-fsdb.rb
-- test/test-modex.rb
-- test/test-mutex.rb
+test_files: []

data/ext/fsdb/MANIFEST

@@ -1 +0,0 @@
-fcntl-lock.c

data/ext/fsdb/extconf.rb

@@ -1,9 +0,0 @@
-require 'mkmf'
-
-if have_func("flock")
-  create_makefile 'fcntl_lock'
-else
-  puts "fcntl_lock option not available on this platform. Please ignore"
-  puts "the error message after running 'ruby intall.rb setup' and"
-  puts "proceed to the installation step, 'ruby install.rb install'."
-end

data/ext/fsdb/fcntl-lock.c

@@ -1,112 +0,0 @@
-// Copyright (c) 2003 Ara Howard. Ruby license, I assume?
-
-#ifdef _WIN32
-#include "missing/file.h"
-#endif
-
-#include "ruby.h"
-#include "rubyio.h"
-#include "rubysig.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#include <errno.h>
-
-extern VALUE rb_cFile;
-
-# ifndef LOCK_SH
-#  define LOCK_SH 1
-# endif
-# ifndef LOCK_EX
-#  define LOCK_EX 2
-# endif
-# ifndef LOCK_NB
-#  define LOCK_NB 4
-# endif
-# ifndef LOCK_UN
-#  define LOCK_UN 8
-# endif
-
-static int
-fcntl_lock (fd, operation)
-     int fd;
-     int operation;
-{
-  struct flock lock;
-
-  switch (operation & ~LOCK_NB)
-    {
-    case LOCK_SH:
-      lock.l_type = F_RDLCK;
-      break;
-    case LOCK_EX:
-      lock.l_type = F_WRLCK;
-      break;
-    case LOCK_UN:
-      lock.l_type = F_UNLCK;
-      break;
-    default:
-      errno = EINVAL;
-      return -1;
-    }
-  lock.l_whence = SEEK_SET;
-  lock.l_start = lock.l_len = 0L;
-  return fcntl (fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &lock);
-}
-
-
-static VALUE
-rb_file_fcntl_lock (obj, operation)
-     VALUE obj;
-     VALUE operation;
-{
-#ifndef __CHECKER__
-  OpenFile *fptr;
-  int ret;
-
-  rb_secure (2);
-  GetOpenFile (obj, fptr);
-
-  if (fptr->mode & FMODE_WRITABLE)
-    {
-      fflush (GetWriteFile (fptr));
-    }
-retry:
-  TRAP_BEG;
-  ret = fcntl_lock (fileno (fptr->f), NUM2INT (operation));
-  TRAP_END;
-  if (ret < 0)
-    {
-      switch (errno)
-	{
-	case EAGAIN:
-	case EACCES:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	case EWOULDBLOCK:
-#endif
-	  return Qfalse;
-	case EINTR:
-#if defined(ERESTART)
-	case ERESTART:
-#endif
-	  goto retry;
-	}
-      rb_sys_fail (fptr->path);
-    }
-#endif
-
-  return INT2FIX (0);
-}
-
-
-void
-Init_fcntl_lock()
-{
-    rb_define_method(rb_cFile, "fcntl_lock", rb_file_fcntl_lock, 1);
-}

data/lib/fsdb/compat.rb

@@ -1,42 +0,0 @@
-unless defined? Process.times
-  def Process.times; Time.times; end
-end
-
-unless defined? [].any?
-  module Enumerable
-    def any?
-      each {|x| return true if yield x}
-      false
-    end
-  end
-end
-
-unless defined? [].inject
-  module Enumerable
-    def inject n
-      each { |i|
-        n = yield n, i
-      }
-      n
-    end
-  end
-end
-
-unless Dir.chdir {:worked} == :worked
-  class << Dir
-    alias old_chdir chdir
-    def chdir(*args)
-      if block_given?
-        begin
-          old_dir = Dir.pwd
-          old_chdir(*args)
-          yield
-        ensure
-          old_chdir(old_dir)
-        end
-      else
-        old_chdir(*args)
-      end
-    end
-  end
-end

data/lib/fsdb/faster-modex.rb

@@ -1,223 +0,0 @@
-#!/usr/bin/env ruby
-
-### only use this if you can ensure Thread.critical is not already set!
-
-# Make sure we use the fast definition, not the thread.rb one!
-class Thread # :nodoc:
-  def self.exclusive
-    old = critical
-    self.critical = true
-    yield
-  ensure
-    self.critical = old
-  end
-end
-
-class Thread
-  def self.nonexclusive
-    old = critical
-    self.critical = false
-    yield
-  ensure
-    self.critical = old
-  end
-end
-
-module FSDB
-
-# Modex is a modal exclusion semaphore, like in syncronizer.rb.
-# The two modes are shared (SH) and exclusive (EX).
-# Modex is not nestable.
-#
-class Modex
-  SH = :SH
-  EX = :EX
-  
-  def initialize
-    @waiting  = []
-    @locked   = []
-    @mode     = nil
-    @first    = true
-  end
-
-  def try_lock mode
-    Thread.critical = true
-      thread = Thread.current
-      if @locked.include?(thread)
-        Thread.critical = false
-        raise ThreadError
-      end
-
-      if @mode == mode and mode == SH and @waiting.empty? # strict queue
-        @locked << thread
-        rslt = true
-      elsif not @mode
-        @mode = mode
-        @locked << thread
-        rslt = true
-      end
-    Thread.critical = false
-    rslt
-  end
-  
-  # the block is executed in the exclusive context
-  def lock mode
-    Thread.critical = true
-      thread = Thread.current
-      if @locked.include?(thread)
-        Thread.critical = false
-        raise ThreadError
-      end
-
-      if @mode == mode and mode == SH and @waiting.empty? # strict queue
-        @locked << thread
-      elsif not @mode
-        @mode = mode
-        @locked << thread
-      else
-        @waiting << thread << mode
-        Thread.stop
-        Thread.critical = true
-      end
-      
-      yield if block_given?
-
-#      if @mode != mode
-#        raise "@mode == #{@mode} but mode == #{mode}"
-#      end
-#
-#      if @mode == EX and @locked.size > 1
-#        raise "@mode == EX but @locked.size == #{@locked.size}"
-#      end
-
-    Thread.critical = false
-      self
-  end
-
-  # the block is executed in the exclusive context
-  def unlock
-    raise ThreadError unless @mode
-    
-    Thread.critical = true
-      yield if block_given?
-      @locked.delete Thread.current
-      wake_next_waiter if @locked.empty?
-    Thread.critical = false
-
-    self
-  end
-  
-  def synchronize mode, do_when_first = nil, do_when_last = nil, arg = nil
-    lock mode do
-      if @first
-        @first = false
-        
-        if do_when_first
-          if mode == SH
-            @mode = EX
-          end
-
-          Thread.critical = false; do_when_first[arg]; Thread.critical = true
-
-          if mode == SH
-            @mode = SH
-            wake_waiting_sharers
-          end
-        end
-      end
-    end
-    
-    yield
-    
-  ensure
-    unlock do
-      if @locked.size == 1
-        if do_when_last
-          @mode = EX
-          Thread.critical = false; do_when_last[arg]; Thread.critical = true
-        end
-        @first = true
-      end
-    end
-  end
-  
-  def remove_dead # :nodoc:
-    Thread.exclusive do
-      waiting = @waiting; @waiting = []
-      until waiting.empty?
-      
-        t = waiting.shift; m = waiting.shift
-        @waiting << t << m if t.alive?
-      end
-      
-      @locked = @locked.select {|t| t.alive?}
-      wake_next_waiter if @locked.empty?
-    end
-  end
-
-  private
-  def wake_next_waiter
-    first = @waiting.shift; @mode = @waiting.shift && EX
-    if first
-      first.wakeup
-      @locked << first
-    end
-    first
-  rescue ThreadError
-    retry
-  end
-  
-  def wake_waiting_sharers
-    while @waiting[1] == SH  # note strict queue order
-      t = @waiting.shift; @waiting.shift
-      @locked << t
-      t.wakeup
-    end
-  rescue ThreadError
-    retry
-  end
-
-  module ForkSafely
-    def fork # :nodoc:
-      super do
-        ObjectSpace.each_object(Modex) { |m| m.remove_dead }
-        yield
-      end
-    end
-  end
-end
-
-# FSDB users who fork should include ForkSafely or FSDB itself. (The reason for
-# this is that the fork may inherit some dead threads from the parent, and if
-# they hold any locks, you may get a deadlock. ForkSafely modifies fork so that
-# these dead threads are cleared. If you use modexes (outside of those in FSDB),
-# they should be FSDB::Modexes.
-module ForkSafely
-  include Modex::ForkSafely
-end
-include ForkSafely
-
-end # module FSDB
-
-
-if __FILE__ == $0
-  # Stress test is in fsdb/test/test-modex.rb. This is just to show fork usage.
-  
-  include FSDB::ForkSafely
-  
-  m = FSDB::Modex.new
-  
-  SH = FSDB::Modex::SH
-
-  Thread.new { m.synchronize(SH) { sleep 1 } }
-
-  fork do
-    m.synchronize(SH) do
-     puts "Didn't get here if you used standard mutex or fork."
-    end
-  end
-
-  m.synchronize(SH) { puts "Got here." }
-
-  Process.wait
-end