methodmissing-channel 1.0.0 → 1.0.1

data/README

@@ -32,7 +32,7 @@ Caveats :
 Examples :
 
   counter = 0
-  ch = Channel.new.subscribe{|obj| @counter += obj }
+  ch = Channel.new.subscribe{|obj| counter += obj }
   ch << 3
   ch << -2
   counter #=> 1  
@@ -41,6 +41,7 @@ Todo :
   
   * A deferrable mode that notifies on a background thread
   * More flexible notification mechanism through integration with http://github.com/methodmissing/callback/tree/master 
+  * Filters
 
 To run the test suite:
 

data/Rakefile

@@ -63,6 +63,7 @@ task :setup => %w(clean build install)
 
 desc "run benchmarks"
 task :bench do |t|
-  ruby "bench/bench.rb"  
+  ruby "bench/bench.rb"
+  ruby "bench/bench_deferred.rb"    
 end
 task :bench => :build

data/bench/bench.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + "/ruby_channel"
 
 channel = Channel.new(16)
 16.times{ channel.subscribe{|o| o } }
-rb_channel = RubyChannel.new
+rb_channel = RubyChannel.new(16)
 16.times{ rb_channel.subscribe{|o| o } }
 
 TESTS = 10_000

data/bench/ruby_channel.rb

@@ -1,12 +1,19 @@
 class RubyChannel
-  def initialize
+  def initialize(size = 1,defer = false)
+    @size = size
     @subscribers = []
+    @defer = defer
   end
   def subscribe(&b)
+    raise ArgumentError.new("Maximum number of subscribers exceeded!") unless @subscribers.size < @size
     @subscribers << b
     self
   end
   def <<(o)
-    @subscribers.each { |s| s.call(o) }
+    unless @defer
+      @subscribers.each { |s| s.call(o) }
+    else
+      Thread.new{ @subscribers.each { |s| s.call(o) } }
+    end
   end
 end

data/channel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "channel"
-  s.version  = "1.0.0"
+  s.version  = "1.0.1"
   s.date     = "2009-08-28"
   s.summary  = "Native MRI channel"
   s.email    = "lourens@methodmissing.com"

data/ext/channel/channel.c

@@ -1,8 +1,9 @@
 #include "ruby.h"
 
 typedef struct {
-	int size;
-	int sbs;
+    int size;
+    int defer;
+    int sbs;
     VALUE *subscribers;
 } RChannel;
 
@@ -33,6 +34,7 @@ channel_alloc( VALUE klass )
     RChannel* chs;
     ch = Data_Make_Struct(klass, RChannel, mark_channel, free_channel, chs);
     chs->size = 0;
+    chs->defer = 0;
     chs->sbs = 0;
     chs->subscribers = 0;
    
@@ -40,7 +42,7 @@ channel_alloc( VALUE klass )
 }
 
 static VALUE
-rb_channel_new(VALUE ch, int size)
+rb_channel_new(VALUE ch, int size, int defer)
 {
     RChannel* chs = GetChannelStruct(ch);
     if (size < 0 || size > MAX_CHANNEL_SIZE){ 
@@ -48,6 +50,7 @@ rb_channel_new(VALUE ch, int size)
     }
     if (size == 0) size++;
     chs->size = size;
+    chs->defer = defer;
     chs->subscribers = ALLOC_N(VALUE, size);
     return ch;  
 }
@@ -55,11 +58,12 @@ rb_channel_new(VALUE ch, int size)
 static VALUE 
 rb_channel_initialize( int argc, VALUE *argv, VALUE ch )
 {
-    VALUE size;
-    int channel_size;  
-    rb_scan_args(argc, argv, "01", &size);
+    VALUE size, defer;
+    int channel_size, def;  
+    rb_scan_args(argc, argv, "02", &size, &defer);
     channel_size = NIL_P(size) ? 0 : FIX2INT(size);
-    return rb_channel_new(ch, channel_size); 
+    def = (defer == Qtrue) ? 1 : 0;  
+    return rb_channel_new(ch, channel_size, def); 
 }
 
 static VALUE 
@@ -76,25 +80,47 @@ rb_channel_subscribers( VALUE ch )
     return INT2FIX(chs->sbs); 
 }
 
+static VALUE 
+rb_channel_deferrable_p( VALUE ch )
+{
+    RChannel* chs = GetChannelStruct(ch);    
+    return (chs->defer == 1) ? Qtrue : Qfalse; 
+}
+
 static VALUE 
 rb_channel_subscribe( int argc, VALUE *argv, VALUE ch )
 {
     VALUE cb;
     RChannel* chs = GetChannelStruct(ch);    
     if (!rb_block_given_p()) rb_raise(rb_eArgError, "Block callback required!");
+    if (chs->sbs == chs->size) rb_raise(rb_eArgError, "Maximum number of subscribers exceeded!");
     cb = rb_block_proc();
     chs->subscribers[chs->sbs] = cb;
     chs->sbs++;
     return ch;
 }
 
+static void 
+rb_channel_push0( RChannel* chs, VALUE *ch, VALUE *obj )
+{
+    int i;    
+    for (i=0; i < chs->sbs; i++) {
+      rb_funcall(chs->subscribers[i],id_call,1,*obj);
+    }  
+}
+
 static VALUE 
 rb_channel_push( VALUE ch, VALUE obj )
 {
-    int i;
-    RChannel* chs = GetChannelStruct(ch);    
-    for (i=0; i < chs->sbs; i++) {
-      rb_funcall(chs->subscribers[i],id_call,1,obj);
+    void *args[3]; 
+    RChannel* chs = GetChannelStruct(ch);
+    if (chs->defer == 1){
+      args[0] = chs;
+      args[1] = &ch;
+      args[2] = &obj;
+      rb_thread_create( rb_channel_push0, &args);
+    }else{
+      rb_channel_push0(chs,&ch,&obj);
     }
     return ch;
 }
@@ -110,6 +136,7 @@ Init_channel()
     rb_define_method(rb_cChannel,"initialize", rb_channel_initialize, -1);
     rb_define_method(rb_cChannel,"size", rb_channel_size, 0);
     rb_define_method(rb_cChannel,"subscribers", rb_channel_subscribers, 0);
+    rb_define_method(rb_cChannel,"deferrable?", rb_channel_deferrable_p, 0);
     rb_define_method(rb_cChannel,"subscribe", rb_channel_subscribe, -1);
     rb_define_method(rb_cChannel,"<<", rb_channel_push, 1);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: methodmissing-channel
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9 (methodmissing)"
@@ -32,6 +32,7 @@ files:
 - channel.gemspec
 has_rdoc: true
 homepage: http://github.com/methodmissing/channel
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -53,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Native MRI channel