Go.rb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83d89e95b8c04124d749769213f95cde616d2b4
-  data.tar.gz: d13d4a943eb24c3bba7f0b6e6c32bde158c7c955
+  metadata.gz: fe407598b9d20a6bf74c4fd07429f179139f209a
+  data.tar.gz: e05d845eb41f6d5fdd2548316a6b9e500abaa02c
 SHA512:
-  metadata.gz: f5f2b7ab6fb493a82ad4f2d82fcb47b16f3c7d8adb81506a520246ab46392271c078048008960829b0c3c07642e01017eb3510aafdc7ea5554c98def82b0356e
-  data.tar.gz: ea7b1925d8f6365b442f79d929b690527c5b2ffd52b748e8eaaface9552ee040b276a67a68401e660c9c2e5488b441228ce9085201ce1b9eea5edef01794da6b
+  metadata.gz: 24bb125a575124cb190dd4c68ad10a352176cc50bda80ff42e26c0b69cd38709117b150cfad9e79e2e43816e1d14ca7db31782d6b570ac6a757b1eabdf347e60
+  data.tar.gz: f76a12972ce937eaaf27b2c9fe1a915a9e5deef66ca2f50fabe67769571cce6c64830f09558543e28e533e39f717b2794cf4afb8e830566aec35552c29674666

data/Rakefile

@@ -1,5 +1,3 @@
-require "bundler/gem_tasks"
-
 require 'rake/testtask'
 
 task default: %w[test]

data/lib/go.rb

@@ -1,7 +1,12 @@
 require "go/version"
-require "go/concurrency/pool"
-require "go/goconfig"
 require "go/kernel"
-require "go/engine"
-require "go/process/goprocess"
-require "go/process/channel"
+require "go/pipe"
+require "go/process"
+
+module Go
+  class Channel < Queue
+    def get nonblock=false
+      pop nonblock
+    end
+  end
+end

data/lib/go/kernel.rb

@@ -4,12 +4,16 @@
 # Author::  Jaci Brunning
 module ::Kernel
 
-  def go(&block)
-    Go::Config.get().thread_pool().execute_proc(block)
+  def go(*channels, &block)
+    Thread.new *channels, &block
   end
 
-  def gofork(*channels, &block)
-    Go::Process.new *channels, &block
+  def gofork(*pipes, &block)
+    Go::Process.new *pipes, &block
+  end
+
+  def gopipe
+    Go::Pipe.new
   end
 
   def gochan

data/lib/go/{process/channel.rb → pipe.rb}

@@ -1,12 +1,12 @@
 module Go
-  class Channel
+  class Pipe
 
     def initialize
       @reader, @writer = IO.pipe
     end
 
-    def puts data
-      @writer.puts data
+    def puts data=""
+      writer.puts data
     end
 
     def << data
@@ -14,19 +14,15 @@ module Go
     end
 
     def gets
-      @reader.gets
+      reader.gets
     end
 
     def write data
-      @writer.write data
+      writer.write data
     end
 
-    def read length=-1
-      if length == -1
-        @reader.read
-      else
-        @reader.read length
-      end
+    def read length
+      reader.read length
     end
 
     def reader
@@ -42,8 +38,8 @@ module Go
     end
 
     def destroy
-      @reader.close
-      @writer.close
+      reader.close
+      writer.close
       @reader = nil
       @writer = nil
     end

data/lib/go/process.rb

@@ -0,0 +1,21 @@
+module Go
+  class Process
+
+    def initialize *pipes, &block
+      @pid = fork { block.call *pipes }
+    end
+
+    def wait
+      ::Process.wait pid
+    end
+
+    def pid
+      @pid
+    end
+
+    def kill
+      ::Process.kill 9, pid
+    end
+
+  end
+end

data/lib/go/version.rb

@@ -1,3 +1,3 @@
 module Go
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Go.rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - JacisNonsense
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,13 +81,9 @@ files:
 - Rakefile
 - goruby.gemspec
 - lib/go.rb
-- lib/go/concurrency/future.rb
-- lib/go/concurrency/pool.rb
-- lib/go/engine.rb
-- lib/go/goconfig.rb
 - lib/go/kernel.rb
-- lib/go/process/channel.rb
-- lib/go/process/goprocess.rb
+- lib/go/pipe.rb
+- lib/go/process.rb
 - lib/go/version.rb
 homepage: http://www.github.com/JacisNonsense/go.rb
 licenses: []

data/lib/go/concurrency/future.rb

@@ -1,64 +0,0 @@
-module Go
-  module CC
-    class Future
-
-      def initialize proc
-        @mutex = Mutex.new
-        @cv = ConditionVariable.new
-        @complete = false
-        @work = proc
-      end
-
-      def work; @work end
-
-      def put val
-        @val = val
-        put_complete
-      end
-
-      def ex e
-        @ex = e
-        put_complete
-      end
-
-      def put_complete
-        @complete = true
-        @cv.broadcast
-      end
-
-      def complete?
-        @complete
-      end
-
-      def errored?
-        !@ex.nil?
-      end
-
-      def get
-        unless @complete
-          @mutex.synchronize do
-          unless @complete
-            @cv.wait(@mutex)
-          end
-        end
-        end
-        if @ex
-          raise @ex
-        end
-
-        @val
-      end
-
-      def wait
-        unless @complete
-          @mutex.synchronize do
-            unless @complete
-              @cv.wait(@mutex)
-            end
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/go/concurrency/pool.rb

@@ -1,83 +0,0 @@
-require 'thread'
-require 'go/concurrency/future'
-module Go
-  module CC
-    class ThreadPool
-
-      def initialize(max_size = 10, growing = true)
-        @max = max_size
-        @threadCount = 0
-        @threads = []
-        @growing = growing
-        @workQueue = Queue.new
-        @running = true
-
-        initStatic() unless @growing
-      end
-
-      def initStatic
-        @max.times do
-          pushThread
-        end
-      end
-
-      def pushThread
-        @threads << Thread.new do
-          while @running
-            future = @workQueue.pop
-            begin
-              future.put future.work().call()
-            rescue Exception => e
-              future.ex e
-            end
-          end
-        end
-        @threadCount+=1
-      end
-
-      def execute(&block)
-        return execute_proc(block)
-      end
-
-      def execute_proc(proc)
-        future = Future.new proc
-        @workQueue << future
-
-        if @threadCount < @max && @growing
-          createNew = false
-          @threads.each do |t|
-            if t.status() != "sleep"
-              createNew = true
-            end
-          end
-          if (@threadCount == 0)
-            createNew = true
-          end
-          pushThread() if createNew
-        end
-
-        return future
-      end
-
-      def shutdown
-        @running = false
-        @threads.each { |t| t.kill }
-      end
-
-      def max; @max end
-      def growing?; @growing end
-      def running?; @running end
-      def workers; @threadCount end
-      def queued; @workQueue.size() end
-
-      def status
-        status = "Thread Pool: \n"
-        status << "\tMax Size: #{max}, Worker Count: #{workers}\n"
-        status << "\tGrowing?: #{growing? ? 'true' : 'false'}, Queued Jobs: #{queued}\n"
-        status << "\tRunning?: #{running? ? 'true' : 'false'}\n"
-        return status
-      end
-
-    end
-  end
-end

data/lib/go/engine.rb

@@ -1,17 +0,0 @@
-module Go
-  class Engine
-
-    def initialize(max_size=10, growing=true)
-      @config = Go::Config.new(max_size, growing)
-    end
-
-    def go &block
-      @config.thread_pool.execute_proc block
-    end
-
-    def config
-      @config
-    end
-
-  end
-end

data/lib/go/goconfig.rb

@@ -1,31 +0,0 @@
-module Go
-  class Config
-
-    def initialize(max_threads, growing = true)
-      @threads = max_threads
-      @pool = Go::CC::ThreadPool.new(max_threads, growing)
-    end
-
-    def max_thread_count
-      @threads
-    end
-
-    def thread_pool
-      @pool
-    end
-
-    def self.create(max_threads = 10, growing = true)
-      @@config = Config.new(max_threads, growing)
-    end
-
-    def self.maybe_create(max_threads = 10)
-      @@config ||= Config.new(max_threads)
-    end
-
-    def self.get
-      maybe_create
-      @@config
-    end
-
-  end
-end

data/lib/go/process/goprocess.rb

@@ -1,28 +0,0 @@
-module Go
-  class Process
-
-    def initialize *channels, &block
-      @channels = channels
-      @pid = fork {
-        block.call *channels
-      }
-    end
-
-    def wait
-      ::Process.wait @pid
-    end
-
-    def channels
-      @channels
-    end
-
-    def pid
-      @pid
-    end
-
-    def kill
-      ::Process.kill 9, @pid
-    end
-
-  end
-end