infrastruct 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d13b298818cc220c0170d9176d35babca39b807
-  data.tar.gz: 13c70be836baf4aff7b2fcbdfccded092e272002
+  metadata.gz: 0113af6fb911302493392efa436bd557868e34a0
+  data.tar.gz: c8c215e965f2c8793ce42ca92650e30f28127cfa
 SHA512:
-  metadata.gz: 9fa10e69f20e1a9153aaa38d92c19b05d879b9b5dafe06abe727c09ef6f48efa1e2d424eca508672efb72c91f414f9fa70f1bea30d99ce2c271db88c83031630
-  data.tar.gz: a1652049cdc38454d220778f793ef0cf65f6167338d6a12b94e5875ef67ff13535fe1b107c4652d7058c8bf24823bf461f78877e1334b1687220ea4e48484a77
+  metadata.gz: 208a75436dc546580844be7d284328f1828ed4654cfac6cf53df9000ef609d0cfdf9713f3f1253bfa6e6cde2e2f250e90f54006267c3f7b75e940e7d0880c38d
+  data.tar.gz: a8eead8fba97d5406e5c1021f1c4c7400a3ceb89355431b82047f37ee3a8f939613447bc0d7a222f08e6917f1a3f4e5540cc7dba7f47426584e9832c71c277fd

data/README.md

@@ -1,4 +1,5 @@
 # Infrastruct
+[![Build Status](https://travis-ci.org/smolnar/infrastruct.svg?branch=master)](https://travis-ci.org/smolnar/infrastruct)
 
 Process and distribute asynchronous tasks and merge their results.
 
@@ -53,7 +54,7 @@ worker.enqueue(3)
 Run worker and wait for merge results.
 
 ```
-sum = worker.run # => 1 ^ 2 + 2 ^ 2 + 3 ^ 2 = 14
+sum = worker.result # => 1 ^ 2 + 2 ^ 2 + 3 ^ 2 = 14
 ```
 
 ## Development

data/lib/infrastruct/blocking_queue.rb

@@ -0,0 +1,25 @@
+module Infrastruct
+  class BlockingQueue
+    def initialize
+      @queue = ::Queue.new
+      @mutex = Mutex.new
+      @blocking = true
+    end
+
+    def push(element)
+      @queue.push(element)
+    end
+
+    def pop
+      @mutex.synchronize do
+        @queue.pop(!@blocking)
+      end
+    end
+
+    def unblock!
+      @mutex.synchronize do
+        @blocking = false
+      end
+    end
+  end
+end

data/lib/infrastruct/manager.rb

@@ -2,33 +2,18 @@ module Infrastruct
   class Manager
     attr_reader :queue
 
-    def initialize(worker_factory, thread_pool:)
-      @worker_factory = worker_factory
+    def initialize(thread_pool)
       @thread_pool = thread_pool
-      @results = Array.new
-      @mutex = Mutex.new
-    end
 
-    def enqueue(*args, &block)
-      @thread_pool.enqueue([args, block])
+      @thread_pool.run
     end
 
-    def run
-      @thread_pool.run do |params|
-        begin
-          worker = @worker_factory.new
-          result = worker.perform(*params[0], &params[1])
-
-          @mutex.synchronize do
-            @results.push(result)
-          end
-        rescue
-          @thread_pool.enqueue(params)
-        end
-      end
+    def enqueue(*args)
+      @thread_pool.enqueue(args)
+    end
 
-      worker = @worker_factory.new
-      worker.collect(@results)
+    def result
+      @thread_pool.finalize
     end
   end
 end

data/lib/infrastruct/runner.rb

@@ -0,0 +1,19 @@
+module Infrastruct
+  class Runner
+    def initialize(factory)
+      @factory = factory
+    end
+
+    def perform(args)
+      worker = @factory.new
+
+      worker.perform(*args)
+    end
+
+    def collect(results)
+      worker = @factory.new
+
+      worker.collect(results)
+    end
+  end
+end

data/lib/infrastruct/thread_pool.rb

@@ -1,30 +1,42 @@
 module Infrastruct
   class ThreadPool
-    attr_reader :queue
-
-    def initialize(threads:)
-      @queue = Infrastruct::NonblockingQueue.new
+    def initialize(runner, threads:)
+      @runner = runner
       @number_of_threads = threads
+      @queue = Infrastruct::BlockingQueue.new
+      @results = Array.new
+      @threads = []
     end
 
     def enqueue(args)
       @queue.push(args)
     end
 
-    def run(&block)
-      @threads = @number_of_threads.times.map do
+    def finalize
+      @queue.unblock!
+      @threads.map(&:join)
+
+      @runner.collect(@results)
+    end
+
+    def run
+      mutex = Mutex.new
+
+      @threads = @number_of_threads.times.map do |n|
         Thread.new do
           begin
-            while params = @queue.pop do
-              block.call(params)
+            while args = @queue.pop do
+              result = @runner.perform(args)
+
+              mutex.synchronize do
+                @results << result
+              end
             end
           rescue ThreadError => error
             raise error unless error.message == 'queue empty'
           end
         end
       end
-
-      @threads.map(&:join)
     end
   end
 end

data/lib/infrastruct/version.rb

@@ -1,3 +1,3 @@
 module Infrastruct
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/infrastruct.rb

@@ -1,18 +1,20 @@
 require 'thread'
 require 'infrastruct/version'
 require 'infrastruct/manager'
-require 'infrastruct/nonblocking_queue'
+require 'infrastruct/runner'
+require 'infrastruct/blocking_queue'
 require 'infrastruct/thread_pool'
 
 module Infrastruct
   def create
-    pool = Infrastruct::ThreadPool.new(threads: options[:threads])
+    runner = Infrastruct::Runner.new(self)
+    pool = Infrastruct::ThreadPool.new(runner, threads: options[:threads])
 
-    Manager.new(self, thread_pool: pool)
+    Manager.new(pool)
   end
 
   def options(options = {})
-    @options ||= { threads: 5 }
+    @options ||= { threads: 25 }
 
     @options.merge(options)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrastruct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,8 +84,9 @@ files:
 - bin/setup
 - infrastruct.gemspec
 - lib/infrastruct.rb
+- lib/infrastruct/blocking_queue.rb
 - lib/infrastruct/manager.rb
-- lib/infrastruct/nonblocking_queue.rb
+- lib/infrastruct/runner.rb
 - lib/infrastruct/thread_pool.rb
 - lib/infrastruct/version.rb
 homepage: https://github.com/smolnar/infrastruct

data/lib/infrastruct/nonblocking_queue.rb

@@ -1,15 +0,0 @@
-module Infrastruct
-  class NonblockingQueue
-    def initialize
-      @queue = ::Queue.new
-    end
-
-    def push(element)
-      @queue.push(element)
-    end
-
-    def pop
-      @queue.pop(true)
-    end
-  end
-end