thread 0.0.3 → 0.0.4

data/lib/thread/delay.rb

@@ -11,23 +11,32 @@
 # A delay is an object that incapsulates a block which is called upon
 # value retrieval, and its result cached.
 class Thread::Delay
+	# Create a delay with the passed block.
 	def initialize (&block)
+		@mutex = Mutex.new
+
 		@block = block
 	end
 
 	# Check if an exception has been raised.
 	def exception?
-		instance_variable_defined? :@exception
+		@mutex.synchronize {
+			instance_variable_defined? :@exception
+		}
 	end
 
 	# Return the raised exception.
 	def exception
-		@exception
+		@mutex.synchronize {
+			@exception
+		}
 	end
 
 	# Check if the delay has been called.
 	def delivered?
-		instance_variable_defined? :@value
+		@mutex.synchronize {
+			instance_variable_defined? :@value
+		}
 	end
 
 	alias realized? delivered?
@@ -42,13 +51,15 @@ class Thread::Delay
 
 		return @value if realized?
 
-		begin
-			@value = @block.call
-		rescue Exception => e
-			@exception = e
+		@mutex.synchronize {
+			begin
+				@value = @block.call
+			rescue Exception => e
+				@exception = e
 
-			raise
-		end
+				raise
+			end
+		}
 	end
 
 	alias ~ value

data/lib/thread/future.rb

@@ -8,14 +8,20 @@
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-require 'thread/promise'
+require 'thread'
 
 # A future is an object that incapsulates a block which is called in a
 # different thread, upon retrieval the caller gets blocked until the block has
 # finished running, and its result is returned and cached.
 class Thread::Future
+	Cancel = Class.new(Exception)
+
+	# Create a future with the passed block.
 	def initialize (&block)
-		Thread.new {
+		@mutex = Mutex.new
+		@cond  = ConditionVariable.new
+
+		@thread = Thread.new {
 			begin
 				deliver block.call
 			rescue Exception => e
@@ -28,47 +34,69 @@ class Thread::Future
 
 	# Check if an exception has been raised.
 	def exception?
-		instance_variable_defined? :@exception
+		@mutex.synchronize {
+			instance_variable_defined? :@exception
+		}
 	end
 
 	# Return the raised exception.
 	def exception
-		@exception
+		@mutex.synchronize {
+			@exception
+		}
 	end
 
 	# Check if the future has been called.
 	def delivered?
-		instance_variable_defined? :@value
+		@mutex.synchronize {
+			instance_variable_defined? :@value
+		}
 	end
 
 	alias realized? delivered?
 
+	# Cancel the future, {#value} will yield a Cancel exception
+	def cancel
+		return if delivered?
+
+		@mutex.synchronize {
+			@thread.raise Cancel.new('future cancelled')
+		}
+	end
+
+	# Check if the future has been cancelled
+	def cancelled?
+		@mutex.synchronize {
+			@exception.is_a? Cancel
+		}
+	end
+
 	# Get the value of the future, if it's not finished running this call will block.
 	#
 	# In case the block raises an exception, it will be raised, the exception is cached
 	# and will be raised every time you access the value.
-	def value
+	def value (timeout = nil)
 		raise @exception if exception?
 
 		return @value if delivered?
 
-		mutex.synchronize {
-			cond.wait(mutex)
+		@mutex.synchronize {
+			@cond.wait(@mutex, *timeout)
 		}
 
 		if exception?
 			raise @exception
-		else
-			@value
+		elsif delivered?
+			return @value
 		end
 	end
 
 	alias ~ value
 
 	# Do the same as {#value}, but return nil in case of exception.
-	def value!
+	def value! (timeout = nil)
 		begin
-			value
+			value(timeout)
 		rescue Exception
 			nil
 		end
@@ -80,28 +108,13 @@ private
 	def deliver (value)
 		return if delivered?
 
-		@value = value
-
-		if cond?
-			mutex.synchronize {
-				cond.broadcast
-			}
-		end
+		@mutex.synchronize {
+			@value = value
+			@cond.broadcast
+		}
 
 		self
 	end
-
-	def cond?
-		instance_variable_defined? :@cond
-	end
-
-	def cond
-		@cond ||= ConditionVariable.new
-	end
-
-	def mutex
-		@mutex ||= Mutex.new
-	end
 end
 
 module Kernel

data/lib/thread/pool.rb

@@ -50,7 +50,7 @@ class Thread::Pool
 			@running    = true
 			@started_at = Time.now
 
-			pool.__send__.wake_up_timeout
+			pool.__send__ :wake_up_timeout
 
 			begin
 				@block.call(*@arguments)

data/lib/thread/promise.rb

@@ -12,9 +12,17 @@ require 'thread'
 
 # A promise is an object that lets you wait for a value to be delivered to it.
 class Thread::Promise
+	# Create a promise.
+	def initialize
+		@mutex = Mutex.new
+		@cond  = ConditionVariable.new
+	end
+
 	# Check if a value has been delivered.
 	def delivered?
-		instance_variable_defined? :@value
+		@mutex.synchronize {
+			instance_variable_defined? :@value
+		}
 	end
 
 	alias realized? delivered?
@@ -23,13 +31,10 @@ class Thread::Promise
 	def deliver (value)
 		return if delivered?
 
-		@value = value
-
-		if cond?
-			mutex.synchronize {
-				cond.broadcast
-			}
-		end
+		@mutex.synchronize {
+			@value = value
+			@cond.broadcast
+		}
 
 		self
 	end
@@ -38,30 +43,17 @@ class Thread::Promise
 
 	# Get the value that's been delivered, if none has been delivered yet the call
 	# will block until one is delivered.
-	def value
+	def value (timeout = nil)
 		return @value if delivered?
 
-		mutex.synchronize {
-			cond.wait(mutex)
+		@mutex.synchronize {
+			@cond.wait(@mutex, *timeout)
 		}
 
-		@value
+		return @value if delivered?
 	end
 
 	alias ~ value
-
-private
-	def cond?
-		instance_variable_defined? :@cond
-	end
-
-	def cond
-		@cond ||= ConditionVariable.new
-	end
-
-	def mutex
-		@mutex ||= Mutex.new
-	end
 end
 
 module Kernel

data/thread.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name         = 'thread'
-	s.version      = '0.0.3'
+	s.version      = '0.0.4'
 	s.author       = 'meh.'
 	s.email        = 'meh@schizofreni.co'
 	s.homepage     = 'http://github.com/meh/ruby-thread'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thread
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Includes a thread pool, message passing capabilities, a recursive mutex,
   promise, future and delay.