delayer 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b9095d6ff8a3d46813d7ca787b7ffcf13050de5a21de2ba8b63940a9394631
-  data.tar.gz: 1da28faf0ed99c6f87450c85c469b967ca2cdc5dc08e5bcbb629d050f1d5aa66
+  metadata.gz: 00c64707cef5f0715d026e9966b1a9d0b7e9676cad1882f73a145574f27d6352
+  data.tar.gz: ac42bd9584e379c7d565eca7a79ef168266480dcf9594dee461d119e46b3066b
 SHA512:
-  metadata.gz: 22cac588a6463302883fbac1ada84b6922cf84076f854c2e75757ea495ac71569b133a0955dc131ca582d08b3b175beca6fb184e778975eda172ff5846747d7b
-  data.tar.gz: fc1cf72aae866f8d832f9f856b44dc7dd2e29e26459715800ba4d30ce8a503e782e89e86e302b0629b73f55049a083eeba60030466290f6fef376bb38f1f78b8
+  metadata.gz: d94ccb45deebd4d2c16d0f96e107da98297c53d691a1c9ebf9eb6c234e327b9e72da07576e6d3b024969dce8e3ace8ecd9366cfb9b8a65e257994b3fdd5d4765
+  data.tar.gz: c208b40f6e1e0166aea86ab71c25b1fdb74e8412771724ac008800173eebb7396bea0c4c3665afc38e672cdd4a5fa2828aa05645eb6a27c9c909a76a581821d6

data/.circleci/config.yml

@@ -0,0 +1,40 @@
+version: '2.1'
+
+executors:
+  ruby:
+    parameters:
+      tag:
+        type: string
+    docker:
+      - image: circleci/ruby:<< parameters.tag >>
+
+jobs:
+  build:
+    parameters:
+       ruby-version:
+         type: string
+    executor:
+      name: ruby
+      tag: << parameters.ruby-version >>
+    steps:
+    - checkout
+    - run:
+        name: Which bundler?
+        command: bundle -v
+    - run:
+        command: bundle install --path vendor/bundle
+    - run:
+        name: test
+        command: bundle exec rake test
+workflows:
+  build:
+    jobs:
+      - build:
+          name: 'ruby-2.5'
+          ruby-version: '2.5.7'
+      - build:
+          name: 'ruby-2.6'
+          ruby-version: '2.6.5'
+      - build:
+          name: 'ruby-2.7'
+          ruby-version: '2.7.0'

data/README.md

@@ -1,5 +1,7 @@
 # Delayer
 
+[![toshia](https://circleci.com/gh/toshia/delayer.svg?style=svg)](https://circleci.com/gh/toshia/delayer)
+
 Delay Any task. Similar priority-queue.
 
 ## Installation

data/lib/delayer.rb

@@ -33,8 +33,12 @@ module Delayer
       end
     end
 
-    def method_missing(*args, &proc)
-      (@default ||= generate_class).__send__(*args, &proc)
+    def method_missing(*args, **kwrest, &proc)
+      if kwrest.empty?
+        (@default ||= generate_class).__send__(*args, &proc)
+      else
+        (@default ||= generate_class).__send__(*args, **kwrest, &proc)
+      end
     end
   end
 end

data/lib/delayer/delayed_procedure.rb

@@ -4,8 +4,7 @@ module Delayer
   class DelayedProcedure
     include Comparable
 
-    attr_reader :state, :delayer, :reserve_at, :right
-
+    attr_reader :state, :delayer, :reserve_at
     def initialize(delayer, delay:, &proc)
       @delayer = delayer
       @proc = proc
@@ -15,42 +14,11 @@ module Delayer
       else
         @reserve_at = Process.clock_gettime(Process::CLOCK_MONOTONIC) + delay.to_f
       end
-      @left = @right = @cancel = nil
-      @size = 1
+      @cancel = nil
       @procedure = nil
       @delayer.class.reserve(self)
     end
 
-    def size
-      @size
-    end
-
-    def add(other)
-      return self unless other
-      if self >= other
-        other.add(self)
-      else
-        @left, *children, @right = [@left, @right, other].compact.sort
-        child = children.first
-        if child
-          if @right.right
-            @left = @left.add(child)
-          else
-            @right = @right.add(child)
-          end
-        end
-        @size += 1
-        self
-      end
-    end
-
-    def next
-      @left&.add(@right).tap do
-        @left = @right = nil
-        freeze
-      end
-    end
-
     def register
       if !canceled?
         @procedure = Procedure.new(@delayer, &@proc)

data/lib/delayer/extend.rb

@@ -50,9 +50,22 @@ module Delayer
         @remain_hook = nil
         @exception = nil
         @remain_received = false
-        @lock = Mutex.new
+        @lock = Monitor.new
         @bucket = Bucket.new(nil, nil, {}, nil)
-        @reserve = nil
+        @last_reserve = nil
+        @reserves = Set.new
+      end
+    end
+
+    def pop_reserve(start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC))
+      if @last_reserve&.reserve_at&.<=(start_time)
+        lock.synchronize do
+          while @last_reserve&.reserve_at&.<=(start_time)
+            @last_reserve.register
+            @last_reserve = @reserves.min
+            @reserves.delete(@last_reserve)
+          end
+        end
       end
     end
 
@@ -63,15 +76,12 @@ module Delayer
     # self
     def run(current_expire = @expire)
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      while @reserve&.reserve_at&.<=(start_time)
-        @reserve.register
-        @reserve = @reserve.next
-      end
+      pop_reserve(start_time)
       if current_expire == 0
-        run_once until empty?
+        run_once_without_pop_reserve until empty?
       else
         @end_time = start_time + @expire
-        run_once while !empty? && (@end_time >= Process.clock_gettime(Process::CLOCK_MONOTONIC))
+        run_once_without_pop_reserve while !empty? && (@end_time >= Process.clock_gettime(Process::CLOCK_MONOTONIC))
         @end_time = nil
       end
       if @remain_hook
@@ -95,6 +105,11 @@ module Delayer
     # ==== Return
     # self
     def run_once
+      pop_reserve
+      run_once_without_pop_reserve
+    end
+
+    private def run_once_without_pop_reserve
       if @bucket.first
         @busy = true
         procedure = forward
@@ -165,10 +180,15 @@ module Delayer
     # self
     def reserve(procedure)
       lock.synchronize do
-        if @reserve
-          @reserve = @reserve.add(procedure)
+        if @last_reserve
+          if @last_reserve > procedure
+            @reserves.add(@last_reserve)
+            @last_reserve = procedure
+          else
+            @reserves.add(procedure)
+          end
         else
-          @reserve = procedure
+          @last_reserve = procedure
         end
       end
       self

data/lib/delayer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayer
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Toshiaki Asai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt