senotrusov-ruby-threading-toolkit 1.0.2 → 1.0.4

data/lib/ruby-threading-toolkit.rb

@@ -22,6 +22,7 @@ require "ruby-toolkit"
 require 'ruby-threading-toolkit/condition_variable.rb'
 require 'ruby-threading-toolkit/mutexed_accessors.rb'
 require 'ruby-threading-toolkit/smart_queue.rb'
+require 'ruby-threading-toolkit/persistent_queue.rb'
 require 'ruby-threading-toolkit/thread.rb'
 require 'ruby-threading-toolkit/thread_lock.rb'
 require 'ruby-threading-toolkit/threadsafe_sequence.rb'

data/lib/ruby-threading-toolkit/persistent_queue.rb

@@ -0,0 +1,42 @@
+
+#  Copyright 2006-2009 Stanislav Senotrusov <senotrusov@gmail.com>
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+class PersistentQueue < SmartQueue
+  attr_accessor :storage
+  
+  def restore
+    @mutex.synchronize do
+      if @storage.exist?
+        data = Marshal.restore(@storage.read)
+        @storage.delete
+
+        @regular = data[:regular] 
+        @priority = data[:priority]
+      end
+    end
+  end
+  
+  def store_and_close
+    @mutex.synchronize do
+      @storage.write Marshal.dump({:regular => @regular, :priority => @priority})
+
+      # This will simply raise exception on trying to push/pop from/to queue
+      @regular = nil
+      @priority = nil
+    end
+  end
+end
+

data/lib/ruby-threading-toolkit/smart_queue.rb

@@ -15,29 +15,20 @@
 
 
 class SmartQueue
-  def initialize(dumped = nil)
+  def initialize
     @mutex = Mutex.new
 
     @arrived = ConditionVariable.new
     @shifted = ConditionVariable.new
 
-    @persistent = false
-    
-    if dumped && (dumped = Marshal.restore(dumped))
-      @regular = dumped[:regular] 
-      @priority = dumped[:priority]
-    else
-      @regular = []
-      @priority = []
-    end
+    @regular = []
+    @priority = []
 
     @regular_limit = nil
     
     @stop_list = {}
   end
   
-  attr_accessor :persistent
-  
   def release_blocked thread
     @mutex.synchronize do
       # Cleaning up @stop_list right here, so, at maximum, it holds only one dead thread.
@@ -50,22 +41,13 @@ class SmartQueue
     end
   end
   
-  def to_storage
-    @mutex.synchronize do
-      dump = Marshal.dump({:regular => @regular, :priority => @priority})
-        @regular.clear
-        @priority.clear
-      return dump 
-    end
-  end
-
   def regular_limit= limit
     @mutex.synchronize do
       @regular_limit = limit
     end
   end
 
-  def push message
+  def regular_enqueue action, data
     @mutex.synchronize do
       @shifted.if_wait_while(@mutex) { @regular_limit && @regular.length >= @regular_limit && !@stop_list.include?(Thread.current) }
 
@@ -73,20 +55,36 @@ class SmartQueue
         @stop_list.delete(Thread.current)
       end
     
-      @regular.push message
+      @regular.__send__(action, data)
       @arrived.signal
     end
     true
   end
 
-  def priority_push message
+  def push message
+    regular_enqueue :push, message
+  end
+
+  def concat messages
+    regular_enqueue :concat, messages
+  end
+
+  def priority_enqueue action, data
     @mutex.synchronize do
-      @priority.push message
+      @priority.__send__(action, data)
       @arrived.signal
     end
     true
   end
 
+  def priority_push message
+    priority_enqueue :push, message
+  end
+
+  def priority_concat messages
+    priority_enqueue :concat, messages
+  end
+
   def shift
     @mutex.synchronize do
       @arrived.if_wait_while(@mutex) { @priority.empty? && @regular.empty? && !@stop_list.include?(Thread.current) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: senotrusov-ruby-threading-toolkit
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
 - Stanislav Senotrusov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-08-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - LICENSE
 - lib/ruby-threading-toolkit
 - lib/ruby-threading-toolkit/thread_lock.rb
+- lib/ruby-threading-toolkit/persistent_queue.rb
 - lib/ruby-threading-toolkit/threadsafe_sequence_loop.rb
 - lib/ruby-threading-toolkit/condition_variable.rb
 - lib/ruby-threading-toolkit/smart_queue.rb