February 2010 - macruby-changes - lists.macosforge.org

[3471] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3471 http://trac.macosforge.org/projects/ruby/changeset/3471 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:26:12 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Dispatch::Future#new should take a priority Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:25:55 UTC (rev 3470) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:26:12 UTC (rev 3471) @@ -46,7 +46,8 @@ # +join+ or +value+ def fork(priority=nil, &block) - Dispatch::Future.new(priority) &block + Dispatch::Future.new(priority) { block.call } + # Can't pass block directly for some reason end module_function :label_for, :queue_for, :async, :sync, :group, :wrap, :fork Modified: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:25:55 UTC (rev 3470) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:26:12 UTC (rev 3471) @@ -13,6 +13,12 @@ it "should return a Future for tracking execution of the passed block" do @future.should be_kind_of Dispatch::Future end + + it "should take a +priority+ for which concurrent queue to use" do + future = Dispatch::Future.new(:high) { @result=Dispatch::Queue.current } + future.join + @result.to_s.should == Dispatch::Queue.concurrent(:high).to_s + end end describe :group do Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2010-02-09 23:25:55 UTC (rev 3470) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/queue_tags.txt 2010-02-09 23:26:12 UTC (rev 3471) @@ -1,2 +1,2 @@ critical:Dispatch::Queue new raises an ArgumentError if not passed a string - +fails:Dispatch::Queue == should be true if the underlying dispatch_queues are equal

1 0

[3470] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3470 http://trac.macosforge.org/projects/ruby/changeset/3470 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:25:55 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Dispatch::Future has_a Group again, not is_a Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/future.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:25:29 UTC (rev 3469) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:25:55 UTC (rev 3470) @@ -43,7 +43,7 @@ # Run the +&block+ asynchronously on a concurrent queue of the given # (optional) +priority+ as part of a Future, which is returned for use with - # +join+ or +value+ -- or as a Group, of which it is a subclass + # +join+ or +value+ def fork(priority=nil, &block) Dispatch::Future.new(priority) &block Modified: MacRuby/trunk/lib/dispatch/future.rb =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:25:29 UTC (rev 3469) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:25:55 UTC (rev 3470) @@ -1,43 +1,37 @@ # Calculate the value of an object in the background module Dispatch - # Subclass of Dispatch::Group used to implement lazy Futures - # By returning a value and duck-typing Thread +join+ and +value+ + # Wrap Dispatch::Group to implement lazy Futures + # By duck-typing Thread +join+ and +value+ - class Future < Dispatch::Group + class Future # Create a future that asynchronously dispatches the block # to the default queue - def initialize(&block) - super + attr_accessor :group + + def initialize(priority = nil, &block) @value = nil - Dispatch.group(self, nil) { @value = block.call } + @group = Group.new + Dispatch.group(@group, priority) { @value = block.call } end # Waits for the computation to finish - alias_method :join, :wait + def join + group.wait + end # Joins, then returns the value # If a block is passed, invoke that asynchronously with the final value # on the specified +queue+ (or else the default queue). def value(queue = nil, &callback) if not block_given? - wait + group.wait return @value else queue ||= Dispatch::Queue.concurrent - notify(queue) { callback.call(@value) } + group.notify(queue) { callback.call(@value) } end end end - # Run the +&block+ asynchronously on a concurrent queue of the given - # (optional) +priority+ as part of a Future, which is returned for use with - # +join+ or +value+ -- or as a Group, of which it is a subclass - - def fork(&block) - Dispatch::Future.new &block - end - - module_function :fork - end Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:25:29 UTC (rev 3469) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:25:55 UTC (rev 3470) @@ -83,15 +83,6 @@ g.join $dispatch_gval.should == 42 end - - it "should return a Group for tracking execution of the passed block" do - $dispatch_gval = 0 - g = Dispatch.fork { @actee.delay_set(42) } - $dispatch_gval.should == 0 - g.should be_kind_of Dispatch::Group - g.wait - $dispatch_gval.should == 42 - end end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:25:29 UTC (rev 3469) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:25:55 UTC (rev 3470) @@ -13,9 +13,11 @@ it "should return a Future for tracking execution of the passed block" do @future.should be_kind_of Dispatch::Future end + end + describe :group do it "should return an instance of Dispatch::Group" do - @future.should be_kind_of Dispatch::Group + @future.group.should be_kind_of Dispatch::Group end end

1 0

[3469] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3469 http://trac.macosforge.org/projects/ruby/changeset/3469 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:25:29 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Don't pass a priority to Dispatch::Future, to better match Group Modified Paths: -------------- MacRuby/trunk/lib/dispatch/future.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb Modified: MacRuby/trunk/lib/dispatch/future.rb =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:25:06 UTC (rev 3468) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:25:29 UTC (rev 3469) @@ -6,11 +6,11 @@ class Future < Dispatch::Group # Create a future that asynchronously dispatches the block - # to a concurrent queue of the specified (optional) +priority+ - def initialize(priority=nil, &block) + # to the default queue + def initialize(&block) super @value = nil - Dispatch.group(self, priority) { @value = block.call } + Dispatch.group(self, nil) { @value = block.call } end # Waits for the computation to finish @@ -34,8 +34,8 @@ # (optional) +priority+ as part of a Future, which is returned for use with # +join+ or +value+ -- or as a Group, of which it is a subclass - def fork(priority=nil, &block) - Dispatch::Future.new(priority) &block + def fork(&block) + Dispatch::Future.new &block end module_function :fork Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:25:06 UTC (rev 3468) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:25:29 UTC (rev 3469) @@ -80,7 +80,7 @@ g = Dispatch.fork { @actee.delay_set(42) } $dispatch_gval.should == 0 g.should be_kind_of Dispatch::Future - #g.join + g.join $dispatch_gval.should == 42 end @@ -89,7 +89,7 @@ g = Dispatch.fork { @actee.delay_set(42) } $dispatch_gval.should == 0 g.should be_kind_of Dispatch::Group - #g.wait + g.wait $dispatch_gval.should == 42 end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:25:06 UTC (rev 3468) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:25:29 UTC (rev 3469) @@ -20,7 +20,7 @@ end describe :join do - it "should wait until execution is complete" + it "should wait until execution is complete" do @result.should == 0 @future.join @result.should == 2**5

1 0

[3468] MacRuby/trunk/sample-macruby/Scripts/gcd/ring_buffer.rb
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3468 http://trac.macosforge.org/projects/ruby/changeset/3468 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:25:06 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Added serial version of ring_buffer to gcd sample Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/gcd/ring_buffer.rb Added: MacRuby/trunk/sample-macruby/Scripts/gcd/ring_buffer.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/ring_buffer.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/ring_buffer.rb 2010-02-09 23:25:06 UTC (rev 3468) @@ -0,0 +1,63 @@ +#!/usr/bin/env ruby + +N_NODES = ARGV[0] || 4 +M_MESSAGES = ARGV[1] || 3 + +class Node + attr_accessor :successor + attr :index + def initialize(index, successor) + @index = index + @successor = successor + @current = 0 + end + + def call(m) + case m + when 0 + return + when @current + call(m-1) + else + puts "#{self}.call #{m}" + @current = m + @successor.call(m) + end + end + + def to_s + "#{@index}->[#{@successor.index}]@#{@current}" + end +end + +class Ring + def initialize(n) + @nodes = [] + setup(n) + end + + def setup(n) + last = nil + n.downto(1) do |i| + @nodes << Node.new(i, last) + last = @nodes[-1] + end + @nodes[0].successor = last + end + + def call(m) + @nodes[0].call(m) + end + + def to_s + @nodes.join " | " + end +end + +1.upto N_NODES do |n| + ring = Ring.new n + puts "\nRing of size #{n}: #{ring}" + 1.upto(M_MESSAGES) { |m| puts "m=#{m}"; ring.call m } +end + +

1 0

[3467] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3467 http://trac.macosforge.org/projects/ruby/changeset/3467 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:24:49 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Dispatch::Future now a subclass of Group Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/future.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:24:24 UTC (rev 3466) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:24:49 UTC (rev 3467) @@ -43,7 +43,7 @@ # Run the +&block+ asynchronously on a concurrent queue of the given # (optional) +priority+ as part of a Future, which is returned for use with - # +join+ or +value+ + # +join+ or +value+ -- or as a Group, of which it is a subclass def fork(priority=nil, &block) Dispatch::Future.new(priority) &block Modified: MacRuby/trunk/lib/dispatch/future.rb =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:24:24 UTC (rev 3466) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:24:49 UTC (rev 3467) @@ -4,7 +4,7 @@ # Subclass of Dispatch::Group used to implement lazy Futures # By returning a value and duck-typing Thread +join+ and +value+ - class Future < Group + class Future < Dispatch::Group # Create a future that asynchronously dispatches the block # to a concurrent queue of the specified (optional) +priority+ def initialize(priority=nil, &block) @@ -14,7 +14,7 @@ end # Waits for the computation to finish - alias :wait, :join + alias_method :join, :wait # Joins, then returns the value # If a block is passed, invoke that asynchronously with the final value @@ -30,4 +30,14 @@ end end + # Run the +&block+ asynchronously on a concurrent queue of the given + # (optional) +priority+ as part of a Future, which is returned for use with + # +join+ or +value+ -- or as a Group, of which it is a subclass + + def fork(priority=nil, &block) + Dispatch::Future.new(priority) &block + end + + module_function :fork + end Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:24:24 UTC (rev 3466) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-09 23:24:49 UTC (rev 3467) @@ -3,10 +3,10 @@ if MACOSX_VERSION >= 10.6 - $global = 0 + $dispatch_gval = 0 class Actee def initialize(s="default"); @s = s; end - def delay_set(n); sleep 0.01; $global = n; end + def delay_set(n); sleep 0.01; $dispatch_gval = n; end def to_s; @s; end end @@ -33,30 +33,30 @@ describe :sync do it "should execute the block Synchronously" do - $global = 0 + $dispatch_gval = 0 Dispatch.sync { @actee.delay_set(42) } - $global.should == 42 + $dispatch_gval.should == 42 end end describe :async do it "should execute the block Asynchronously" do - $global = 0 + $dispatch_gval = 0 Dispatch.async(:default) { @actee.delay_set(42) } - $global.should == 0 - while $global == 0 do; end - $global.should == 42 + $dispatch_gval.should == 0 + while $dispatch_gval == 0 do; end + $dispatch_gval.should == 42 end end describe :group do it "should execute the block with the specified group" do - $global = 0 + $dispatch_gval = 0 g = Dispatch::Group.new Dispatch.group(g) { @actee.delay_set(42) } - $global.should == 0 + $dispatch_gval.should == 0 g.wait - $global.should == 42 + $dispatch_gval.should == 42 end end @@ -75,32 +75,23 @@ end describe :fork do - it "should return an Group for tracking execution of the passed block" do - $global = 0 + it "should return a Future for tracking execution of the passed block" do + $dispatch_gval = 0 g = Dispatch.fork { @actee.delay_set(42) } - $global.should == 0 - g.should be_kind_of Dispatch::Group - g.wait - $global.should == 42 + $dispatch_gval.should == 0 + g.should be_kind_of Dispatch::Future + #g.join + $dispatch_gval.should == 42 end - - it "should :join Synchronously to that group" do - $global = 0 + + it "should return a Group for tracking execution of the passed block" do + $dispatch_gval = 0 g = Dispatch.fork { @actee.delay_set(42) } - $global.should == 0 - g.join - $global.should == 42 + $dispatch_gval.should == 0 + g.should be_kind_of Dispatch::Group + #g.wait + $dispatch_gval.should == 42 end - - it "should :join Asynchronously if passed another block" do - $global = 0 - g = Dispatch.fork { @actee.delay_set(42) } - $global.should == 0 - g.join { } - $global.should == 0 - while $global == 0 do; end - $global.should == 42 - end end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:24:24 UTC (rev 3466) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:24:49 UTC (rev 3467) @@ -5,28 +5,40 @@ describe "Dispatch::Future" do before :each do - @future = Dispatch::Future.new { Math.sqrt(2**10) } + @result = 0 + @future = Dispatch::Future.new { sleep 0.01; @result = Math.sqrt(2**10) } end describe :new do - it "should return an Future for tracking execution of the passed block" do + it "should return a Future for tracking execution of the passed block" do @future.should be_kind_of Dispatch::Future - future = Dispatch.future { Math.sqrt(2**10) } - future.should be_kind_of Dispatch::Future end + + it "should return an instance of Dispatch::Group" do + @future.should be_kind_of Dispatch::Group + end end - - describe :call do - it "should wait Synchronously to return value" do - @future.call.should == 2**5 + + describe :join do + it "should wait until execution is complete" + @result.should == 0 + @future.join + @result.should == 2**5 end + end - it "should invoke passed block Asynchronously with returned value " do - $global = 0 - @future.call {|v| $global = v} - while $global == 0 do; end - $global.should == 2**5 + describe :value do + it "should return value when called Synchronously" do + @future.value.should == 2**5 end + + it "should invoke passed block Asynchronously with return value" do + @fval = 0 + @future.value {|v| @fval = v} + while @fval == 0 do; end + @fval.should == 2**5 + end end + end end \ No newline at end of file

1 0

[3466] MacRuby/trunk/lib/dispatch
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3466 http://trac.macosforge.org/projects/ruby/changeset/3466 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:24:24 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Redo Dispatch::Future to duck-type Thread, first cut Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/future.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:24:14 UTC (rev 3465) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-09 23:24:24 UTC (rev 3466) @@ -41,31 +41,13 @@ Dispatch::Actor.new( (obj.is_a? Class) ? obj.new : obj) end - # Run the +&block+ asynchronously on a concurrent queue - # of the given (optional) +priority+ - # as part of a newly-created group, which is returned for use with - # +Dispatch.group+ or +wait+ / +notify+ + # Run the +&block+ asynchronously on a concurrent queue of the given + # (optional) +priority+ as part of a Future, which is returned for use with + # +join+ or +value+ def fork(priority=nil, &block) - grp = Group.new - Dispatch.group(grp, priority) { block.call } - # Can't pass block directly for some reason - return grp + Dispatch::Future.new(priority) &block end - - class Group - # Companion to +Dispatch.fork+, allowing you to +wait+ until +grp+ completes - # via an API similar to that used by +Threads+ - # If a block is given, instead uses +notify+ to call it asynchronously - def join(q = nil, &block) - if block.nil? - self.wait - else - q ||= Dispatch::Queue.concurrent - self.notify(q, &block) - end - end - end module_function :label_for, :queue_for, :async, :sync, :group, :wrap, :fork Modified: MacRuby/trunk/lib/dispatch/future.rb =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:24:14 UTC (rev 3465) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:24:24 UTC (rev 3466) @@ -1,34 +1,33 @@ # Calculate the value of an object in the background module Dispatch - # Wrapper around Dispatch::Group used to implement lazy Futures - class Future + # Subclass of Dispatch::Group used to implement lazy Futures + # By returning a value and duck-typing Thread +join+ and +value+ + + class Future < Group # Create a future that asynchronously dispatches the block # to a concurrent queue of the specified (optional) +priority+ def initialize(priority=nil, &block) + super @value = nil - @group = Dispatch.fork(priority) { @value = block.call } + Dispatch.group(self, priority) { @value = block.call } end - # Waits for the computation to finish, then returns the value - # Duck-typed to lambda.call(void) + # Waits for the computation to finish + alias :wait, :join + + # Joins, then returns the value # If a block is passed, invoke that asynchronously with the final value - def call(q = nil, &callback) + # on the specified +queue+ (or else the default queue). + def value(queue = nil, &callback) if not block_given? - @group.wait + wait return @value else - q ||= Dispatch::Queue.concurrent - @group.notify(q) { callback.call(@value) } + queue ||= Dispatch::Queue.concurrent + notify(queue) { callback.call(@value) } end end end - - # Create a +Future+ that runs the block in the background - def future(priority=nil, &block) - Future.new(priority, &block) - end - - module_function :future - + end

1 0

[3465] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3465 http://trac.macosforge.org/projects/ruby/changeset/3465 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:24:14 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Added high-level Dispatch.future method around Dispatch::Future.new Modified Paths: -------------- MacRuby/trunk/lib/dispatch/future.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb Modified: MacRuby/trunk/lib/dispatch/future.rb =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:23:38 UTC (rev 3464) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-02-09 23:24:14 UTC (rev 3465) @@ -21,7 +21,14 @@ q ||= Dispatch::Queue.concurrent @group.notify(q) { callback.call(@value) } end - end - + end end + + # Create a +Future+ that runs the block in the background + def future(priority=nil, &block) + Future.new(priority, &block) + end + + module_function :future + end Modified: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:23:38 UTC (rev 3464) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-02-09 23:24:14 UTC (rev 3465) @@ -11,6 +11,8 @@ describe :new do it "should return an Future for tracking execution of the passed block" do @future.should be_kind_of Dispatch::Future + future = Dispatch.future { Math.sqrt(2**10) } + future.should be_kind_of Dispatch::Future end end

1 0

[3464] MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3464 http://trac.macosforge.org/projects/ruby/changeset/3464 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-09 15:23:38 -0800 (Tue, 09 Feb 2010) Log Message: ----------- Spec to ensure Enumerable#p_each is happening concurrently Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-09 22:46:04 UTC (rev 3463) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-09 23:23:38 UTC (rev 3464) @@ -22,7 +22,11 @@ end it "should execute concurrently" do - true.should == true + t0 = Time.now + @ary.p_each {|v| sleep v/100.0} + t1 = Time.now + t_total = @ary.inject(0) {|a,b| a + b/100.0} + (t1-t0).to_f.should < t_total end end

1 0

[3463] MacRuby/trunk/class.c
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3463 http://trac.macosforge.org/projects/ruby/changeset/3463 Author: lsansonetti(a)apple.com Date: 2010-02-09 14:46:04 -0800 (Tue, 09 Feb 2010) Log Message: ----------- BasicObject#initialize: do not forward -init in case it's a ruby method Modified Paths: -------------- MacRuby/trunk/class.c Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-02-09 22:42:43 UTC (rev 3462) +++ MacRuby/trunk/class.c 2010-02-09 22:46:04 UTC (rev 3463) @@ -110,8 +110,10 @@ static VALUE rb_objc_init(VALUE rcv, SEL sel) { - IMP imp = class_getMethodImplementation((Class)CLASS_OF(rcv), selInit); - if (imp != NULL && imp != (IMP)rb_obj_imp_init) { + IMP imp = NULL; + rb_vm_method_node_t *node = NULL; + if (rb_vm_lookup_method((Class)CLASS_OF(rcv), sel, &imp, &node) + && imp != NULL && node == NULL && imp != (IMP)rb_obj_imp_init) { return (VALUE)((void *(*)(void *, SEL))*imp)((void *)rcv, selInit); } return rcv;

1 0

[3462] MacRuby/trunk/test_vm/gc.rb
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3462 http://trac.macosforge.org/projects/ruby/changeset/3462 Author: lsansonetti(a)apple.com Date: 2010-02-09 14:42:43 -0800 (Tue, 09 Feb 2010) Log Message: ----------- added some TLC tests Added Paths: ----------- MacRuby/trunk/test_vm/gc.rb Added: MacRuby/trunk/test_vm/gc.rb =================================================================== --- MacRuby/trunk/test_vm/gc.rb (rev 0) +++ MacRuby/trunk/test_vm/gc.rb 2010-02-09 22:42:43 UTC (rev 3462) @@ -0,0 +1,39 @@ +# Testing the TLC. + +assert 'true', %{ + s = nil + Thread.new { + s = [1,2,3,4,5] + GC.start + }.join + p s == [1,2,3,4,5] +} + +assert 'true', %{ + s = nil + Thread.new { + 1.times { s = [1,2,3,4,5]; GC.start } + }.join + p s == [1,2,3,4,5] +} + +assert 'true', %{ + def foo + Thread.new { yield }.join + end + s = nil + foo { s = [1,2,3,4,5]; GC.start } + p s == [1,2,3,4,5] +} + +assert 'true', %{ + def bar + Thread.new { yield }.join + end + def foo + bar { yield } + end + s = nil + foo { s = [1,2,3,4,5]; GC.start } + p s == [1,2,3,4,5] +}

1 0