fsdb 0.6.1 → 0.7.0

data/lib/fsdb/faster-mutex.rb

@@ -1,138 +0,0 @@
-#!/usr/bin/env ruby
-
-### only use this if you can ensure Thread.critical is not already set!
-### it mught be worth implementing a granular atomic-add-based mutex in
-### place of Thread.critical
-
-# 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
-
-module FSDB
-
-# Mutex class based on standard thread.rb Mutex, which has some problems:
-#
-# - waiters are not a strict queue (try_lock can jump the queue, after
-#   which the queue gets *rotated*). Race condition.
-#
-# - doesn't use Thread.exclusive in enough places
-#
-# - no way to make dead threads give up the mutex, which is crucial in a fork
-#
-# Note: neither this Mutex nor the one in thread.rb is nestable.
-#
-class Mutex
-  def initialize
-    @waiting = []
-    @locked = nil
-  end
-
-  def locked?
-    @locked
-  end
-
-  def try_lock
-    Thread.critical = true
-      if not @locked
-        @locked = Thread.current
-        rslt = true
-      end
-    Thread.critical = false
-    rslt
-  end
-  
-  def lock
-    thread = Thread.current
-    Thread.critical = true
-      if @locked
-        @waiting.push thread
-        Thread.stop
-        unless @locked == thread
-          raise ThreadError, "queue was jumped"
-        end
-      else
-        @locked = thread
-      end
-    Thread.critical = false
-      self
-  end
-
-  def unlock
-    return unless @locked
-    
-    Thread.critical = true; t = wake_next_waiter; Thread.critical = false
-    
-    begin
-      t.run if t
-    rescue ThreadError
-    end
-    self
-  end
-
-  def synchronize
-    lock
-    yield
-  ensure
-    unlock
-  end
-
-  def remove_dead # :nodoc:
-    Thread.critical = true
-      @waiting = @waiting.select {|t| t.alive?}
-      wake_next_waiter if @locked and not @locked.alive?
-    Thread.critical = false
-  end
-
-  private
-  def wake_next_waiter
-    t = @waiting.shift
-    t.wakeup if t
-    @locked = t
-  rescue ThreadError
-    retry
-  end
-
-  module ForkSafely
-    def fork # :nodoc:
-      super do
-        ObjectSpace.each_object(Mutex) { |m| m.remove_dead }
-        yield
-      end
-    end
-  end
-end
-
-# FSDB users who fork should include ForkSafely or FSDB itself. If you use
-# mutexes (outside of those in FSDB), they should be FSDB::Mutexes.
-module ForkSafely
-  include Mutex::ForkSafely
-end
-include ForkSafely
-
-end # module FSDB
-
-
-if __FILE__ == $0
-  # Stress test is in fsdb/test/test-mutex.rb. This is just to show fork usage.
-  
-  include FSDB::ForkSafely
-  
-  m = FSDB::Mutex.new
-
-  Thread.new { m.synchronize { sleep 1 } }
-
-  fork do
-    m.synchronize { puts "Didn't get here if you used standard mutex or fork." }
-  end
-
-  m.synchronize { puts "Got here." }
-
-  Process.wait
-end

data/lib/fsdb/mutex.rb

@@ -1,137 +0,0 @@
-#!/usr/bin/env ruby
-
-unless defined? Thread.exclusive
-  class Thread # :nodoc:
-    def self.exclusive
-      old = critical
-      self.critical = true
-      yield
-    ensure
-      self.critical = old
-    end
-  end
-end
-
-module FSDB
-
-# Mutex class based on standard thread.rb Mutex, which has some problems:
-#
-# - waiters are not a strict queue (try_lock can jump the queue, after
-#   which the queue gets *rotated*). Race condition.
-#
-# - doesn't use Thread.exclusive in enough places
-#
-# - no way to make dead threads give up the mutex, which is crucial in a fork
-#
-# Note: neither this Mutex nor the one in thread.rb is nestable.
-#
-class Mutex
-  def initialize
-    @waiting = []
-    @locked = nil
-    @waiting.taint  # enable tainted comunication
-    self.taint
-  end
-
-  def locked?
-    @locked
-  end
-
-  def try_lock
-    Thread.exclusive do
-      if not @locked # and @waiting.empty? # not needed
-        @locked = Thread.current
-        true
-      end
-    end
-  end
-  
-  def lock
-    thread = Thread.current
-    Thread.exclusive do
-      if @locked
-        @waiting.push thread
-        Thread.stop
-        unless @locked == thread
-          raise ThreadError, "queue was jumped"
-        end
-      else
-        @locked = thread
-      end
-      self
-    end
-  end
-
-  def unlock
-    return unless @locked
-    
-    t = Thread.exclusive { wake_next_waiter }
-    
-    begin
-      t.run if t
-    rescue ThreadError
-    end
-    self
-  end
-
-  def synchronize
-    lock
-    yield
-  ensure
-    unlock
-  end
-
-  def remove_dead # :nodoc:
-    Thread.exclusive do
-      @waiting = @waiting.select {|t| t.alive?}
-      wake_next_waiter if @locked and not @locked.alive?
-      ## what if @locked thread left the resource in an inconsistent state?
-    end
-  end
-
-  private
-  def wake_next_waiter
-    t = @waiting.shift
-    t.wakeup if t
-    @locked = t
-  rescue ThreadError
-    retry
-  end
-
-  module ForkSafely
-    def fork # :nodoc:
-      super do
-        ObjectSpace.each_object(Mutex) { |m| m.remove_dead }
-        yield
-      end
-    end
-  end
-end
-
-# FSDB users who fork should include ForkSafely or FSDB itself. If you use
-# mutexes (outside of those in FSDB), they should be FSDB::Mutexes.
-module ForkSafely
-  include Mutex::ForkSafely
-end
-include ForkSafely
-
-end # module FSDB
-
-
-if __FILE__ == $0
-  # Stress test is in fsdb/test/test-mutex.rb. This is just to show fork usage.
-  
-  include FSDB::ForkSafely
-  
-  m = FSDB::Mutex.new
-
-  Thread.new { m.synchronize { sleep 1 } }
-
-  fork do
-    m.synchronize { puts "Didn't get here if you used standard mutex or fork." }
-  end
-
-  m.synchronize { puts "Got here." }
-
-  Process.wait
-end

data/rakefile

@@ -1,41 +0,0 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
-
-begin
-  require 'bones'
-  Bones.setup
-rescue LoadError
-  begin
-    load 'tasks/setup.rb'
-  rescue LoadError
-    raise RuntimeError, '### please install the "bones" gem ###'
-  end
-end
-
-ensure_in_path 'lib'
-require 'fsdb'
-
-#task :default => 'spec:run'
-
-PROJ.name = 'fsdb'
-PROJ.authors = 'Joel VanderWerf'
-PROJ.email = 'vjoel@users.sourceforge.net'
-PROJ.url = 'http://rubyforge.org/projects/fsdb/'
-PROJ.version = FSDB::VERSION
-PROJ.rubyforge.name = 'fsdb'
-PROJ.summary = "File System Database"
-PROJ.description = <<END
-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.
-END
-PROJ.changes = File.read(PROJ.history_file)[/^\w.*?(?=^\w)/m]
-PROJ.exclude << %w{ junk misc }
-
-PROJ.spec.opts << '--color'
-PROJ.test.files = Dir["test/*.rb"].select {|f| File.executable? f} ## ?
-
-task :release => ["gem:release", "doc:release"]
-
-# EOF

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/bones.rake

@@ -1,20 +0,0 @@
-
-if HAVE_BONES
-
-namespace :bones do
-
-  desc 'Show the PROJ open struct'
-  task :debug do |t|
-    atr = if t.application.top_level_tasks.length == 2
-      t.application.top_level_tasks.pop
-    end
-
-    if atr then Bones::Debug.show_attr(PROJ, atr)
-    else Bones::Debug.show PROJ end
-  end
-
-end  # namespace :bones
-
-end  # HAVE_BONES
-
-# EOF

data/tasks/gem.rake

@@ -1,201 +0,0 @@
-
-require 'find'
-require 'rake/packagetask'
-require 'rubygems/user_interaction'
-require 'rubygems/builder'
-
-module Bones
-class GemPackageTask < Rake::PackageTask
-  # Ruby GEM spec containing the metadata for this package.  The
-  # name, version and package_files are automatically determined
-  # from the GEM spec and don't need to be explicitly provided.
-  #
-  attr_accessor :gem_spec
-
-  # Tasks from the Bones gem directory
-  attr_reader :bones_files
-
-  # Create a GEM Package task library.  Automatically define the gem
-  # if a block is given.  If no block is supplied, then +define+
-  # needs to be called to define the task.
-  #
-  def initialize(gem_spec)
-    init(gem_spec)
-    yield self if block_given?
-    define if block_given?
-  end
-
-  # Initialization tasks without the "yield self" or define
-  # operations.
-  #
-  def init(gem)
-    super(gem.name, gem.version)
-    @gem_spec = gem
-    @package_files += gem_spec.files if gem_spec.files
-    @bones_files = []
-
-    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
-    if !test(?e, local_setup)
-      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
-    end
-  end
-
-  # Create the Rake tasks and actions specified by this
-  # GemPackageTask.  (+define+ is automatically called if a block is
-  # given to +new+).
-  #
-  def define
-    super
-    task :prereqs
-    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
-    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
-      when_writing("Creating GEM") {
-        chdir(package_dir_path) do
-          Gem::Builder.new(gem_spec).build
-          verbose(true) {
-            mv gem_file, "../#{gem_file}"
-          }
-        end
-      }
-    end
-
-    file package_dir_path => bones_files do
-      mkdir_p package_dir rescue nil
-
-      gem_spec.files = (gem_spec.files +
-          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
-
-      bones_files.each do |fn|
-        base_fn = File.join('tasks', File.basename(fn))
-        f = File.join(package_dir_path, base_fn)
-        fdir = File.dirname(f)
-        mkdir_p(fdir) if !File.exist?(fdir)
-        if File.directory?(fn)
-          mkdir_p(f)
-        else
-          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
-          safe_ln(fn, f)
-        end
-      end
-    end
-  end
-  
-  def gem_file
-    if @gem_spec.platform == Gem::Platform::RUBY
-      "#{package_name}.gem"
-    else
-      "#{package_name}-#{@gem_spec.platform}.gem"
-    end
-  end
-end  # class GemPackageTask
-end  # module Bones
-
-namespace :gem do
-
-  PROJ.gem._spec = Gem::Specification.new do |s|
-    s.name = PROJ.name
-    s.version = PROJ.version
-    s.summary = PROJ.summary
-    s.authors = Array(PROJ.authors)
-    s.email = PROJ.email
-    s.homepage = Array(PROJ.url).first
-    s.rubyforge_project = PROJ.rubyforge.name
-
-    s.description = PROJ.description
-
-    PROJ.gem.dependencies.each do |dep|
-      s.add_dependency(*dep)
-    end
-
-    PROJ.gem.development_dependencies.each do |dep|
-      s.add_development_dependency(*dep)
-    end
-
-    s.files = PROJ.gem.files
-    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
-    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
-
-    s.bindir = 'bin'
-    dirs = Dir["{#{PROJ.libs.join(',')}}"]
-    s.require_paths = dirs unless dirs.empty?
-
-    incl = Regexp.new(PROJ.rdoc.include.join('|'))
-    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
-    excl = Regexp.new(excl.join('|'))
-    rdoc_files = PROJ.gem.files.find_all do |fn|
-                   case fn
-                   when excl; false
-                   when incl; true
-                   else false end
-                 end
-    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
-    s.extra_rdoc_files = rdoc_files
-    s.has_rdoc = true
-
-    if test ?f, PROJ.test.file
-      s.test_file = PROJ.test.file
-    else
-      s.test_files = PROJ.test.files.to_a
-    end
-
-    # Do any extra stuff the user wants
-    PROJ.gem.extras.each do |msg, val|
-      case val
-      when Proc
-        val.call(s.send(msg))
-      else
-        s.send "#{msg}=", val
-      end
-    end
-  end  # Gem::Specification.new
-
-  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
-    pkg.need_tar = PROJ.gem.need_tar
-    pkg.need_zip = PROJ.gem.need_zip
-  end
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  desc 'Write the gemspec '
-  task :spec => 'gem:prereqs' do
-    File.open("#{PROJ.name}.gemspec", 'w') do |f|
-      f.write PROJ.gem._spec.to_ruby
-    end
-  end
-
-  desc 'Install the gem'
-  task :install => [:clobber, 'gem:package'] do
-    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
-
-    # use this version of the command for rubygems > 1.0.0
-    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
-  end
-
-  desc 'Uninstall the gem'
-  task :uninstall do
-    installed_list = Gem.source_index.find_name(PROJ.name)
-    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
-      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
-    end
-  end
-
-  desc 'Reinstall the gem'
-  task :reinstall => [:uninstall, :install]
-
-  desc 'Cleanup the gem'
-  task :cleanup do
-    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
-  end
-end  # namespace :gem
-
-
-desc 'Alias to gem:package'
-task :gem => 'gem:package'
-
-task :clobber => 'gem:clobber_package'
-remove_desc_for_task 'gem:clobber_package'
-
-# EOF