mongoid-bolt 1.0.0 → 1.1.0

data/lib/mongoid-bolt.rb

@@ -4,7 +4,7 @@
 #
 module Mongoid
   class Bolt
-    const_set :Version, '1.0.0'
+    const_set :Version, '1.1.0'
 
     class << Bolt
       def version
@@ -81,6 +81,7 @@ end
             field(:hostname, :default => proc{ ::Mongoid::Bolt.hostname })
             field(:ppid, :default => proc{ ::Mongoid::Bolt.ppid })
             field(:pid, :default => proc{ ::Mongoid::Bolt.pid })
+            field(:tid, :default => proc{ ::Mongoid::Bolt.tid })
 
             attr_accessor :stolen
             alias_method :stolen?, :stolen
@@ -100,7 +101,24 @@ end
 
             def alive?
               return true unless localhost?
-              ::Mongoid::Bolt.alive?(ppid, pid)
+
+              process_alive = ::Mongoid::Bolt.process_alive?(ppid, pid)
+
+              same_process = ::Mongoid::Bolt.pid == pid
+
+              if process_alive
+                if same_process
+                  ::Mongoid::Bolt.thread_alive?(tid)
+                else
+                  false
+                end
+              else
+                false
+              end
+            end
+
+            def stale?
+              not alive?
             end
 
             def relock!
@@ -110,7 +128,8 @@ end
                 '_lock._id'      => id,
                 '_lock.hostname' => hostname,
                 '_lock.ppid'     => ppid,
-                '_lock.pid'      => pid
+                '_lock.pid'      => pid,
+                '_lock.tid'      => tid
               }
 
               update = {
@@ -118,6 +137,7 @@ end
                   '_lock.hostname'   => ::Mongoid::Bolt.hostname,
                   '_lock.ppid'       => ::Mongoid::Bolt.ppid,
                   '_lock.pid'        => ::Mongoid::Bolt.pid,
+                  '_lock.tid'        => ::Mongoid::Bolt.tid,
                   '_lock.updated_at' => Time.now.utc
                 }
               }
@@ -136,16 +156,12 @@ end
               self.stolen = !!relock!
             end
 
-            def stale?
-              localhost? and not alive?
-            end
-
             def owner?
               ::Mongoid::Bolt.identifier == identifier
             end
 
             def identifier
-              {:hostname => hostname, :ppid => ppid, :pid => pid}
+              {:hostname => hostname, :ppid => ppid, :pid => pid, :tid => tid}
             end
           end
 
@@ -159,9 +175,11 @@ end
 
         ## locking methods
         #
-          def target_class.lock!(conditions = {}, update = {})
-            conditions.to_options!
-            update.to_options!
+          def target_class.lock!(options = {})
+            options.to_options!
+
+            conditions = (options[:conditions] || {}).to_options!
+            update = (options[:update] || {}).to_options!
 
             conditions[:_lock] = nil
 
@@ -172,6 +190,10 @@ end
                 find_and_modify(update, new: true)
           end
 
+          def target_class.reserve!(options = {})
+            target_class.lock!(options = {})
+          end
+
           def lock!(conditions = {})
             conditions.to_options!
 
@@ -201,9 +223,9 @@ end
           def unlock!
             unlocked = false
 
-            if _lock
+            if _lock and _lock.owner?
               begin
-                _lock.destroy if _lock.owner?
+                _lock.destroy
                 @locked = false
                 unlocked = true
               rescue
@@ -315,7 +337,7 @@ end
     ##
     #
       def Bolt.hostname
-        Socket.gethostname
+        @hostname ||= Socket.gethostname
       end
 
       def Bolt.ppid
@@ -326,11 +348,15 @@ end
         Process.pid
       end
 
+      def Bolt.tid
+        Thread.current.object_id
+      end
+
       def Bolt.identifier
-        {:hostname => hostname, :ppid => ppid, :pid => pid}
+        {:hostname => hostname, :ppid => ppid, :pid => pid, :tid => tid}
       end
 
-      def Bolt.alive?(*pids)
+      def Bolt.process_alive?(*pids)
         pids.flatten.compact.all? do |pid|
           begin
             Process.kill(0, Integer(pid))
@@ -341,6 +367,12 @@ end
         end
       end
 
+      def Bolt.thread_alive?(*tids)
+        tids.flatten.compact.all? do |tid|
+          Thread.list.detect{|thread| thread.object_id == tid}
+        end
+      end
+
     ##
     #
       include Bolt.ability

data/mongoid-bolt.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-bolt"
-  spec.version = "1.0.0"
+  spec.version = "1.1.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-bolt"
   spec.description = "a mongoid 3/moped compatible lock implementation and mixin"

data/test/helper.rb

@@ -1,7 +1,56 @@
 # -*- encoding : utf-8 -*-
+
 require_relative 'testing'
 require_relative '../lib/mongoid-bolt.rb'
 
 Mongoid.configure do |config|
   config.connect_to('mongoid-bolt_test')
 end
+
+require 'thread'
+
+class Thread
+  class Pipe
+    class Queue < ::Queue
+      attr_accessor :thread_id
+    end
+
+    def initialize
+      @queues = [Queue.new, Queue.new]
+    end
+
+    def thread_id
+      Thread.current.object_id
+    end
+
+    def reserve_write_queue!
+      Thread.exclusive do
+        @queues.each do |queue|
+          next if queue.thread_id
+          queue.thread_id = thread_id
+          return queue
+        end
+      end
+    end
+
+    def write_queue
+      @queues.detect{|q| q.thread_id == thread_id} || reserve_write_queue!
+    end
+
+    def read_queue
+      @queues.detect{|q| q != write_queue}
+    end
+
+    def write(object)
+      write_queue.push(object)
+    end
+
+    alias_method('push', 'write')
+
+    def read
+      read_queue.pop
+    end
+
+    alias_method('pop', 'read')
+  end
+end

data/test/mongoid-bolt_test.rb

@@ -67,4 +67,33 @@ Testing Mongoid::Bolt do
     assert{ A.create.lock{ locked = true } }
     assert{ locked }
   end
+
+  test 'that two threads cannot obtain the same lock' do
+    pa = Thread::Pipe.new
+    pb = Thread::Pipe.new
+
+    lock = assert{ Bolt.for(:shared_resource) } 
+
+    a = Thread.new do
+      Thread.current.abort_on_exception = true
+
+      pa.pop
+      pa.push(lock.lock! ? :locked : :not_locked)
+      sleep
+    end
+
+    b = Thread.new do
+      Thread.current.abort_on_exception = true
+
+      pb.pop
+      pb.push(lock.lock! ? :locked : :not_locked)
+      sleep
+    end
+
+    pa.push :go
+    assert{ pa.pop == :locked }
+
+    pb.push :go
+    assert{ pb.pop != :locked }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-bolt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid