rufus-scheduler 1.0.13 → 1.0.14

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 1.0.14    released 2009/05/01
+
+- bug   #25746 : at/every/in scheduling stress issue.
+                 Fixed by Klaas Jan Wierenga
+
+
 == rufus-scheduler - 1.0.13    released 2009/02/02
 
 - todo  #23779 : removed lib/openwfe/ and restructured to lib/rufus/scheduler/

data/CREDITS.txt

@@ -3,6 +3,7 @@
 
 == Contributors
 
+- Klaas Jan Wierenga, at/every/in stress tests, stress patch
 - TobyH (http://github.com/tobyh), faster and cleaner CronLine#next_time
 - Ryan Sonnek (http://github.com/wireframe), gemspec
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2008, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2009, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.txt

@@ -17,6 +17,8 @@ http://rubyforge.org/frs/?group_id=4812
 
 == usage
 
+(the rdoc is at http://rufus.rubyforge.org/rufus-scheduler/)
+
 some examples :
 
     require 'rubygems'
@@ -65,7 +67,7 @@ Apart from scheduling, There are also two interesting methods in this gem, they
     Rufus.to_time_string 7 * 24 * 3600        # => '1w'
 
 
-Something about the rufus-scheduler, threads and ActiveRecord connections :
+Something about the rufus-scheduler, threads and ActiveRecord connections (warning : I'm mostly clueless about Rails) :
 
 http://jmettraux.wordpress.com/2008/09/14/the-scheduler-and-the-active_record/
 

data/lib/rufus/scheduler/cronline.rb

@@ -1,6 +1,5 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 module Rufus
 
@@ -166,124 +161,124 @@ module Rufus
 
     private
 
-      #--
-      # adjust values to Ruby
+    #--
+    # adjust values to Ruby
+    #
+    #def adjust_arrays()
+    #  @hours = @hours.collect { |h|
+    #    if h == 24
+    #      0
+    #    else
+    #      h
+    #    end
+    #  } if @hours
+    #  @weekdays = @weekdays.collect { |wd|
+    #    wd - 1
+    #  } if @weekdays
+    #end
+      #
+      # dead code, keeping it as a reminder
+    #++
+
+    WDS = %w[ sun mon tue wed thu fri sat ]
       #
-      #def adjust_arrays()
-      #  @hours = @hours.collect { |h|
-      #    if h == 24
-      #      0
-      #    else
-      #      h
-      #    end
-      #  } if @hours
-      #  @weekdays = @weekdays.collect { |wd|
-      #    wd - 1
-      #  } if @weekdays
-      #end
-        #
-        # dead code, keeping it as a reminder
-      #++
-
-      WDS = [ "sun", "mon", "tue", "wed", "thu", "fri", "sat" ]
-        #
-        # used by parse_weekday()
-
-      def parse_weekdays (item)
-
-        item = item.downcase
-
-        WDS.each_with_index do |day, index|
-          item = item.gsub day, "#{index}"
-        end
+      # used by parse_weekday()
 
-        r = parse_item item, 0, 7
+    def parse_weekdays (item)
 
-        return r unless r.is_a?(Array)
+      item = item.downcase
 
-        r.collect { |e| e == 7 ? 0 : e }.uniq
+      WDS.each_with_index do |day, index|
+        item = item.gsub day, "#{index}"
       end
 
-      def parse_item (item, min, max)
+      r = parse_item item, 0, 7
 
-        return nil \
-          if item == "*"
-        return parse_list(item, min, max) \
-          if item.index(",")
-        return parse_range(item, min, max) \
-          if item.index("*") or item.index("-")
+      return r unless r.is_a?(Array)
 
-        i = Integer(item)
+      r.collect { |e| e == 7 ? 0 : e }.uniq
+    end
 
-        i = min if i < min
-        i = max if i > max
+    def parse_item (item, min, max)
 
-        [ i ]
-      end
+      return nil \
+        if item == "*"
+      return parse_list(item, min, max) \
+        if item.index(",")
+      return parse_range(item, min, max) \
+        if item.index("*") or item.index("-")
 
-      def parse_list (item, min, max)
+      i = Integer(item)
 
-        items = item.split(",")
+      i = min if i < min
+      i = max if i > max
 
-        items.inject([]) { |r, i| r.push(parse_range(i, min, max)) }.flatten
-      end
+      [ i ]
+    end
 
-      def parse_range (item, min, max)
+    def parse_list (item, min, max)
 
-        i = item.index("-")
-        j = item.index("/")
+      items = item.split(",")
 
-        return item.to_i if (not i and not j)
+      items.inject([]) { |r, i| r.push(parse_range(i, min, max)) }.flatten
+    end
+
+    def parse_range (item, min, max)
 
-        inc = 1
+      i = item.index("-")
+      j = item.index("/")
 
-        inc = Integer(item[j+1..-1]) if j
+      return item.to_i if (not i and not j)
 
-        istart = -1
-        iend = -1
+      inc = 1
 
-        if i
+      inc = Integer(item[j+1..-1]) if j
 
-          istart = Integer(item[0..i-1])
+      istart = -1
+      iend = -1
 
-          if j
-            iend = Integer(item[i+1..j])
-          else
-            iend = Integer(item[i+1..-1])
-          end
+      if i
 
-        else # case */x
+        istart = Integer(item[0..i-1])
 
-          istart = min
-          iend = max
+        if j
+          iend = Integer(item[i+1..j])
+        else
+          iend = Integer(item[i+1..-1])
         end
 
-        istart = min if istart < min
-        iend = max if iend > max
+      else # case */x
 
-        result = []
+        istart = min
+        iend = max
+      end
 
-        value = istart
-        loop do
+      istart = min if istart < min
+      iend = max if iend > max
 
-          result << value
-          value = value + inc
-          break if value > iend
-        end
+      result = []
 
-        result
-      end
+      value = istart
+      loop do
 
-      def sub_match? value, values
-        values.nil? || values.include?(value)
+        result << value
+        value = value + inc
+        break if value > iend
       end
 
-      def date_match? date
-        return false unless sub_match? date.day,   @days
-        return false unless sub_match? date.month, @months
-        return false unless sub_match? date.wday,  @weekdays
-        true
-      end
+      result
+    end
+
+    def sub_match? value, values
+      values.nil? || values.include?(value)
+    end
+
+    def date_match? date
+      return false unless sub_match? date.day,   @days
+      return false unless sub_match? date.month, @months
+      return false unless sub_match? date.wday,  @weekdays
+      true
+    end
   end
 
 end

data/lib/rufus/scheduler/jobs.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 module Rufus
 

data/lib/rufus/scheduler/otime.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2005-2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Hecho en Costa Rica.
+#++
 
-#
-# "hecho en Costa Rica"
-#
-# john.mettraux@openwfe.org
-#
 
 require 'date'
 #require 'parsedate'
@@ -80,9 +75,9 @@ module Rufus
   #
   # Returns a Ruby time
   #
-  def Rufus.to_ruby_time (iso_date)
+  def Rufus.to_ruby_time (sdate)
 
-    DateTime.parse(iso_date)
+    DateTime.parse(sdate)
   end
 
   #def Rufus.parse_date (date)
@@ -162,17 +157,17 @@ module Rufus
     alias_method :parse_duration_string, :parse_time_string
   end
 
-  #
+  #--
   # Returns true if the character c is a digit
   #
   # (probably better served by a regex)
   #
-  def Rufus.is_digit? (c)
-
-    return false if not c.kind_of?(String)
-    return false if c.length > 1
-    (c >= '0' and c <= '9')
-  end
+  #def Rufus.is_digit? (c)
+  #  return false if not c.kind_of?(String)
+  #  return false if c.length > 1
+  #  (c >= '0' and c <= '9')
+  #end
+  #++
 
   #
   # conversion methods between Date[Time] and Time
@@ -352,24 +347,24 @@ module Rufus
 
   protected
 
-    DURATIONS2M = [
-      [ 'y', 365 * 24 * 3600 ],
-      [ 'M', 30 * 24 * 3600 ],
-      [ 'w', 7 * 24 * 3600 ],
-      [ 'd', 24 * 3600 ],
-      [ 'h', 3600 ],
-      [ 'm', 60 ],
-      [ 's', 1 ]
-    ]
-    DURATIONS2 = DURATIONS2M.dup
-    DURATIONS2.delete_at(1)
-
-    DURATIONS = DURATIONS2M.inject({}) do |r, (k, v)|
-      r[k] = v
-      r
-    end
+  DURATIONS2M = [
+    [ 'y', 365 * 24 * 3600 ],
+    [ 'M', 30 * 24 * 3600 ],
+    [ 'w', 7 * 24 * 3600 ],
+    [ 'd', 24 * 3600 ],
+    [ 'h', 3600 ],
+    [ 'm', 60 ],
+    [ 's', 1 ]
+  ]
+  DURATIONS2 = DURATIONS2M.dup
+  DURATIONS2.delete_at(1)
+
+  DURATIONS = DURATIONS2M.inject({}) do |r, (k, v)|
+    r[k] = v
+    r
+  end
 
-    DU_KEYS = DURATIONS2M.collect { |k, v| k.to_sym }
+  DU_KEYS = DURATIONS2M.collect { |k, v| k.to_sym }
 
 end
 

data/lib/rufus/scheduler/scheduler.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'thread'
 require 'rufus/scheduler/otime'
@@ -339,7 +334,7 @@ module Rufus
   #
   class Scheduler
 
-    VERSION = '1.0.13'
+    VERSION = '1.0.14'
 
     #
     # By default, the precision is 0.250, with means the scheduler
@@ -378,8 +373,10 @@ module Rufus
       @cron_jobs = {}
       @non_cron_jobs = {}
 
-      @schedule_queue = Queue.new
-      @unschedule_queue = Queue.new
+      # @schedule_queue = Queue.new
+      # @unschedule_queue = Queue.new
+
+      @edit_queue = Queue.new
         #
         # sync between the step() method and the [un]schedule
         # methods is done via these queues, no more mutex
@@ -655,7 +652,8 @@ module Rufus
       b = to_block(params, &block)
       job = CronJob.new(self, cron_id, cron_line, params, &b)
 
-      @schedule_queue << job
+      # @schedule_queue << job
+      @edit_queue << [ :schedule, job ]
 
       job.job_id
     end
@@ -677,7 +675,7 @@ module Rufus
     #
     def unschedule (job_id)
 
-      @unschedule_queue << job_id
+      @edit_queue << [ :unschedule, job_id ]
     end
 
     #
@@ -842,14 +840,16 @@ module Rufus
 
         job.trigger() unless params[:discard_past]
 
-        @non_cron_jobs.delete job.job_id # just to be sure
+        # change to @non_cron_jobs must be executed on scheduler thread (in step_schedule)
+        # @non_cron_jobs.delete(job.job_id) # just to be sure
 
         return nil
       end
 
-      @non_cron_jobs[job.job_id] = job
+      # change to @non_cron_jobs must be executed on scheduler thread (in step_schedule)
+      # @non_cron_jobs[job.job_id] = job
 
-      @schedule_queue << job
+      @edit_queue << [ :schedule, job ]
 
       job.job_id
     end
@@ -924,55 +924,60 @@ module Rufus
     #
     def step
 
-      step_unschedule
-        # unschedules any job in the unschedule queue before
-        # they have a chance to get triggered.
+      step_edit
+        # handle ops in the edit_queue
+        # this ensures that schedule and unschedule requests are processed
+        # in order
 
       step_trigger
         # triggers eligible jobs
 
-      step_schedule
-        # schedule new jobs
-
       # done.
     end
 
     #
-    # unschedules jobs in the unschedule_queue
-    #
-    def step_unschedule
-
-      loop do
-
-        break if @unschedule_queue.empty?
-
-        do_unschedule(@unschedule_queue.pop)
-      end
-    end
-
-    #
-    # adds every job waiting in the @schedule_queue to
-    # either @pending_jobs or @cron_jobs.
+    # schedules or unschedules job in the edit_queue
+    # schedule's and unschedule are processed in order
     #
-    def step_schedule
-
+    def step_edit
       loop do
+        break if @edit_queue.empty?
+        op, j = @edit_queue.pop
 
-        break if @schedule_queue.empty?
-
-        j = @schedule_queue.pop
+        case op
+        when :schedule
+          if j.is_a?(CronJob)
 
-        if j.is_a?(CronJob)
+            @cron_jobs[j.job_id] = j
 
-          @cron_jobs[j.job_id] = j
+          else # it's an 'at' job
 
-        else # it's an 'at' job
+            # add job to @non_cron_jobs
+            @non_cron_jobs[j.job_id] = j
+            push_pending_job j
 
-          push_pending_job j
+          end
+        when :unschedule
+          do_unschedule(j)
+        else
+          raise ArgumentError
         end
       end
     end
 
+    #
+    # unschedules jobs in the unschedule_queue
+    #
+    # def step_unschedule
+    #
+    #   loop do
+    #
+    #     break if @unschedule_queue.empty?
+    #
+    #     do_unschedule(@unschedule_queue.pop)
+    #   end
+    # end
+
     #
     # triggers every eligible pending (at or every) jobs, then every eligible
     # cron jobs.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 +09:00
+date: 2009-05-01 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,8 @@ files:
 - README.txt
 has_rdoc: true
 homepage: http://openwferu.rubyforge.org/scheduler.html
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -57,9 +59,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rufus
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: scheduler for Ruby (at, cron and every jobs), formerly known as 'openwferu-scheduler'
 test_files: 
 - test/test.rb