rb_thread_pool 0.0.1full → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b6d5142478f31a6f209cf6bd7cce82316eeb66
-  data.tar.gz: c3193d2037273006897636e22c58ac3d46f272ec
+  metadata.gz: db3f5ce7c6233148e9f6426fdf026d9867357bd3
+  data.tar.gz: af2be7df55681f141ce60ba7d998235364be3981
 SHA512:
-  metadata.gz: b87abf11418ada1132d1c371772eee0b20ed91d95ad7293ad4d7f101acb9775edc25178a285c029a8a953154110dd6d8b1e9d679a4a9b5ac7bb4ffd16dc765be
-  data.tar.gz: 30181c7ba375dddf41644d1b5a097164cc63498a03b45e957524f2bc9c9bcbaa8a5fb1a491c1f6f851e26a1ab62545f8ea4ca599350063ae36478c61de1161ca
+  metadata.gz: 13ce6c1bf8788573c680db8ba7ee654f43a97230856ba3892e047d5e5c21303e92ab1335c4ce63264796ba08f82a06527a932cb8e4cbf2323a3ee89ce1414439
+  data.tar.gz: 539f933a4bdd0aa78a1f31556d5d52e9ae940e0b359ec6096435d8491697e3da330ce669d79738f39562481c47a5c175ef0eec219f69737a4cbd4ae737028c34

data/lib/core/base.rb

@@ -8,6 +8,8 @@ module RBThreadPool
     attr_accessor :queue, :mutex, :th_pool, :th_elastic_pool,
                   :config, :thread_manager, :elastic
 
+    attr_reader :daemon
+
     def initialize(config = {})
       @queue = Queue.new
       @mutex = Mutex.new
@@ -22,8 +24,8 @@ module RBThreadPool
       # generate elastic thread when size over alert_line
       @queue_limit = @config[:limit] || 100
       @alert_line = (@queue_limit / 2).floor
-      # Daemon Thread
-      @daemon = RBThreadDaemon.new(self)
+      # Daemon Thread manager
+      @daemon = RBThreadDaemon.new(@mutex, @th_pool, @th_elastic_pool, @thread_manager, @config)
     end
 
     def start!
@@ -31,13 +33,7 @@ module RBThreadPool
       generate_threads(@min) # generate common thread
     end
 
-    # def join_all
-    #   Thread.list.each do |th|
-    #     p th
-    #   end
-    #   @th_pool.each(&:join)
-    # end
-
+    # add proc
     def push(obj)
       @mutex.synchronize{ @th_elastic_pool << @elastic_manager.fork } if
           @queue.size > @alert_line and @th_elastic_pool.size < @elastic_amount
@@ -46,11 +42,18 @@ module RBThreadPool
     end
     alias << push
 
+
+    # add with block
     def add(&blk)
       push(blk)
     end
     alias pushb add
 
+
+    def daemon_th_inspect
+      @daemon.daemon_th.inspect
+    end
+
     private
 
     def generate_threads(num)

data/lib/core/rb_daemon.rb

@@ -5,31 +5,36 @@ module RBThreadPool
 
     attr_accessor :condition
 
-    def initialize(base)
-      @mutex = base.mutex
-      @interval = base.config[:interval] || 20
-      @pool = base.th_pool
-      @elastic = base.elastic
-      @base_control = base
+    attr_reader :daemon_th
+
+    def initialize(mutex, common_pool, elastic, manager, config = {})
+      @mutex = mutex
+      @config = config
+      @interval = config[:interval] || 20
+      @pool = common_pool
+      @elastic = elastic
+      @manager = manager
       @condition = true
+      @daemon_th = nil
     end
 
     def run!
-      return generate_daemon
+      @daemon_th = generate_daemon
     end
 
     private
 
     def generate_daemon
+
       return Thread.new do
         Thread.current.name = 'RbThr:Daemon' if Thread.respond_to?(:name=)
+        Thread.abort_on_exception = true
         interval = @interval
         mutex = @mutex
         pool = @pool
         elastic = @elastic
         while @condition
           sleep(interval)
-          puts 'daemon wakeup'
           mutex.synchronize { clean_common pool }
           Thread.pass
           mutex.synchronize { clean elastic } unless elastic.nil? || elastic.empty?
@@ -57,7 +62,7 @@ module RBThreadPool
     end
 
     def revive_common_thread(num)
-      manager = @base_control.thread_manager
+      manager = @manager
       pool = @pool
       num.times do |idx|
         pool << manager.fork

data/lib/rb_thread_pool.rb

@@ -1,18 +1,60 @@
 $LOAD_PATH.unshift(__dir__)
 require 'core/base'
 
+# github: https://github.com/nickoan
 
-#    pool = RBThreadPool::Base.new
-# # # #
-#    pool.start!
-# # # #
-#    80.times do |index|
-#      pool.pushb do
-#        raise Exception if index == 3
-#        puts index
-#        sleep(1)
-#      end
-#    end
+
+#
+# # generate thread pool
+# pool = RBThreadPool::Base.new
+# pool.start!
+#
+#
+# # add with block
+# pool.add do
+#   sleep(2)
+#
+#   puts "i'm the first adder"
+# end
+#
+#
+# # add with proc
+# blk = proc {puts "i'm the second adder"}
+# pool << blk
+#
+#
+# # pushb is alias method for add
+# 20.times do |idx|
+#   pool.pushb do
+#     sleep(0.5)
+#     puts "i'm in times at index #{idx}"
+#   end
+# end
+#
+#
+# p pool.daemon_th_inspect
+#
+# # add with block
+# pool.add do
+#   sleep(2)
+#   puts "i'm the first adder"
+# end
+#
+#
+# # add with proc
+# blk = proc {puts "i'm the second adder"}
+# pool << blk
+#
+#
+# # pushb is alias method for add
+# 20.times do |idx|
+#   pool.pushb do
+#     sleep(0.5)
+#     puts "i'm in times at index #{idx}"
+#   end
+# end
+#
 #
+# p pool.daemon_th_inspect
 #
 # sleep

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb_thread_pool
 version: !ruby/object:Gem::Version
-  version: 0.0.1full
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick An
@@ -36,9 +36,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12