emit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f3459190a3ae6b0f8d872f97e14cbe8524468e
-  data.tar.gz: 417ad5f6609d7ec63cabab3c0349e854842e2888
+  metadata.gz: a43400e02ac71c9a0c9568be319833e69c9e0b18
+  data.tar.gz: b28b6b8e6a01ef1b84e6e5fa797e5c404e387012
 SHA512:
-  metadata.gz: 8755bc73dd138ba8ea36a02613e7a6c99ea4a9ad0d5e3f9542ad2a592a398b7e18bf6f9a027b536f692ebf147de2c4a248a7aeda4cfed0967777c4cadb2e0e40
-  data.tar.gz: ab3bce60704fe9de7b22af564721704ea9fcb6f088bce47373085f9decab9aaca23c60172e73636b448394567dc89b2f4831117ae3928a376a97189e1b0cbd08
+  metadata.gz: c0597efaa0e69f35a94244698b5b038788e5210c780166af65068e254c04e47c3fa6717d215e680dde058167f63b7b264d2ab0de00a6b9b344974d0109023609
+  data.tar.gz: 68af9bef63afdce8f990890fd4a55dae5e3fe6cf0df86449d17a4c17bd8c603d962b5b0cb922d6851de3f84f36ea8b62cc5f40ee4602459b2754e720a391b0f8

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+emit-*.gem

data/README.md

@@ -1,6 +1,7 @@
 # Emit
 
 [![Build Status](https://travis-ci.org/omegahm/emit.svg?branch=master)](https://travis-ci.org/omegahm/emit)
+[![Gem Version](https://badge.fury.io/rb/emit.svg)](https://badge.fury.io/rb/emit)
 
 Emit is an implementation of Hoare's CSP in Ruby.
 

data/benchmarks/choice.rb

@@ -0,0 +1,22 @@
+require "emit"
+
+$result = []
+
+def selector(cin1, cin2, n)
+  n.times do
+    _, msg = Emit.choice(cin1, cin2)
+    $result << msg
+  end
+end
+
+ch1 = Emit.channel
+ch2 = Emit.channel
+
+n = 100
+Emit.parallel(
+  Emit.process { n.times { -ch1 << 0 } },
+  Emit.process { n.times { -ch2 << 1 } },
+  Emit.selector(+ch1, +ch2, 2*n)
+)
+
+puts $result.inspect

data/benchmarks/commstime.rb

@@ -40,7 +40,7 @@ def consumer(cin, n)
 end
 
 n = 3
-comms = 500
+comms = 125_000
 n.times do |i|
   puts "Running with #{4*comms} communications"
   puts

data/benchmarks/deadlock.rb

@@ -0,0 +1,14 @@
+require "emit"
+
+def deadlock_process(cout, cin)
+  cout << 1
+  cin.()
+end
+
+c = Emit.channel
+d = Emit.channel
+
+Emit.parallel(
+  Emit.deadlock_process(-c, +d),
+  Emit.deadlock_process(-d, +c)
+)

data/benchmarks/starvation.rb

@@ -4,16 +4,14 @@ c = Emit.channel
 d = Emit.channel
 
 def p(cout, cin)
-  puts "START"
   cout << 1
-  puts "WRITE"
+  cout << 1
   cin.()
-  puts "DONE"
 end
 
 def q(cout, cin)
-  cout << 1
   cin.()
+  cout << 1
 end
 
 Emit.parallel(

data/lib/emit.rb

@@ -16,11 +16,10 @@ require "emit/input_guard"
 require "emit/output_guard"
 
 require "emit/alternation"
-require "emit/choice"
 
 module Emit
   class << self
-    def parallel(*processes)
+    def parallel(*processes, run: true)
       processes.flatten!
 
       processes.each do |process|
@@ -28,8 +27,10 @@ module Emit
         Scheduler.enqueue(process)
       end
 
-      Scheduler.join(processes)
-      processes.map(&:return_value)
+      if run
+        Scheduler.join(processes)
+        processes.map(&:return_value)
+      end
     end
 
     def sequence(*processes)
@@ -52,8 +53,8 @@ module Emit
       channel_ends.each(&:retire)
     end
 
-    def select(*guards)
-      Alternation.new(guards.map(&:guard_action)).execute
+    def choice(*guards)
+      Alternation.new(guards).execute
     end
 
     def method_missing(name, *args, **kwargs)

data/lib/emit/alternation.rb

@@ -1,30 +1,26 @@
 module Emit
   class Alternation
     def initialize(guards)
-      @guards = guards
+      @guards = guards.map do |guard|
+        case guard
+        when InputGuard  then guard
+        when OutputGuard then guard
+        else
+          InputGuard.new(guard)
+        end
+      end
     end
 
     def execute
       idx, request, channel, operation = choose
 
       if @guards[idx]
-        action = @guards[idx].last[:action]
+        action = @guards[idx].action
+        fail "Failed executing action in alternation." unless [Proc, Method].include?(action.class)
 
-        case action
-        when Choice
-          case operation
-          when :write then action.invoke_on_output
-          when :read  then action.invoke_on_input(request.message)
-          end
-        when Proc, Method
-          case operation
-          when :write then action.()
-          when :read  then action.(message: request.message)
-          end
-        when nil
-          # no-op
-        else
-          fail "Failed executing action: #{action}."
+        case operation
+        when :write then action.()
+        when :read  then action.(request.message)
         end
       end
 
@@ -36,29 +32,25 @@ module Emit
     def choose
       requests  = {}
       act       = nil
-      poison    = false
-      retire    = false
 
       Scheduler.current.state = :active
 
       begin
         idx = 0
         @guards.each do |guard|
-          if guard.size == 3 # write
+          if OutputGuard === guard
             operation = :write
-            channel, message, action = guard
-            request = ChannelRequest.new(Scheduler.current, message)
-            channel.send(:post_write, request)
-          elsif guard.size == 2 # read
+            request = ChannelRequest.new(Scheduler.current, guard.message)
+            guard.channel_end.send(:post_write, request)
+          elsif InputGuard === guard
             operation = :read
-            channel, action = guard
             request = ChannelRequest.new(Scheduler.current)
-            channel.send(:post_read, request)
+            guard.channel_end.send(:post_read, request)
           else
             fail "Guard was neither write or read."
           end
 
-          requests[request] = [idx, channel, operation]
+          requests[request] = [idx, guard.channel_end, operation]
           idx += 1
         end
       rescue ChannelPoisonedException, ChannelRetiredException

data/lib/emit/input_guard.rb

@@ -1,13 +1,22 @@
 module Emit
   class InputGuard
-    attr_reader :guard_action
+    attr_reader :channel_end, :action
 
-    def initialize(channel_end, action=nil)
-      if ChannelEndRead === channel_end
-        @guard_action = [channel_end, action]
+    def initialize(argument, action=->(msg) {msg})
+      case argument
+      when InputGuard
+        @channel_end, @action = argument.channel_end, argument.action
+      when ChannelEndRead
+        @channel_end, @action = argument, action
+      when Array
+        fail "Wrong number of arguments" unless argument.size == 2
+        @channel_end, @action = argument
       else
-        fail "InputGuard must have a reading channel end."
+        fail "Unknown input guard type"
       end
+
+      fail "InputGuard must have a reading channel end." unless ChannelEndRead === @channel_end
+      fail "InputGuard action cannot be nil" if @action.nil?
     end
   end
 end

data/lib/emit/output_guard.rb

@@ -1,13 +1,22 @@
 module Emit
-  class GuardGuard
-    attr_reader :guard_action
+  class OutputGuard
+    attr_reader :channel_end, :message, :action
 
-    def initialize(channel_end, message, action=nil)
-      if ChannelEndWrite === channel_end
-        @guard_action = [channel_end, message, action]
+    def initialize(argument, message, action=nil)
+      case argument
+      when OutputGuard
+        @channel_end, @message, @action = argument.channel_end, argument.message, argument.action
+      when ChannelEndWrite
+        @channel_end, @message, @action = argument, message, action
+      when Array
+        fail "Wrong number of arguments" unless argument.size == 3
+        @channel_end, @message, @action = argument
       else
-        fail "OutputGuard must have a writing channel end."
+        fail "Unknown output guard type"
       end
+
+      fail "OutputGuard must have a writing channel end." unless ChannelEndWrite === channel_end
+      fail "OutputGuard action cannot be nil" if @action.nil?
     end
   end
 end

data/lib/emit/version.rb

@@ -1,3 +1,3 @@
 module Emit
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mads Ohm Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,10 +66,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/choice.rb
 - benchmarks/commstime.rb
+- benchmarks/deadlock.rb
 - benchmarks/many_processes.rb
 - benchmarks/montecarlopi.rb
-- benchmarks/select.rb
 - benchmarks/starvation.rb
 - bin/console
 - bin/setup
@@ -81,7 +82,6 @@ files:
 - lib/emit/channel_end_read.rb
 - lib/emit/channel_end_write.rb
 - lib/emit/channel_request.rb
-- lib/emit/choice.rb
 - lib/emit/exceptions.rb
 - lib/emit/input_guard.rb
 - lib/emit/output_guard.rb

data/benchmarks/select.rb

@@ -1,30 +0,0 @@
-require "emit"
-
-@result = []
-def action(message: nil)
-  @result << message
-end
-
-def p1(cout, n)
-  n.times { |i| cout << i }
-end
-
-def p2(cin1, cin2, n)
-  n.times do
-    Emit.select(
-      Emit::InputGuard.new(cin1, action: method(:action)),
-      Emit::InputGuard.new(cin2, action: method(:action))
-    )
-  end
-end
-
-ch1 = Emit.channel
-ch2 = Emit.channel
-
-Emit.parallel(
-  Emit.process(-ch1, 50, &method(:p1)),
-  Emit.process(-ch2, 50, &method(:p1)),
-  Emit.process(+ch1, +ch2, 100, &method(:p2))
-)
-
-puts @result.inspect

data/lib/emit/choice.rb

@@ -1,18 +0,0 @@
-module Emit
-  class Choice
-    def initialize(*args, **kwargs, &block)
-      @block  = block
-      @args   = args
-      @kwargs = kwargs
-    end
-
-    def invoke_on_output
-      @block.call(*@args, **@kwargs)
-    end
-
-    def invoke_on_input(message)
-      @kwargs[:message] = message
-      @block.call(*@args, **@kwargs)
-    end
-  end
-end