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

[3451] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3451 http://trac.macosforge.org/projects/ruby/changeset/3451 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:57 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Borked implementation of mapreduce Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-08 23:04:45 UTC (rev 3450) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-08 23:04:57 UTC (rev 3451) @@ -5,9 +5,10 @@ # Returns a unique label based on the ancestor chain and ID of +obj+ # plus the current time def label_for(obj) - label = obj.class.ancestors.uniq.reverse.join("_").downcase + ancestors = obj.class.ancestors.map {|a| a.to_s} + label = ancestors.uniq.reverse.join("_").downcase now = Time.now.to_f.to_s.gsub(".","_") - "#{label}_%x_%s" % [obj.object_id, now] + "#{label}__%x__%s" % [obj.object_id, now] end # Returns a new serial queue with a unique label based on +obj+ Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:45 UTC (rev 3450) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:57 UTC (rev 3451) @@ -30,17 +30,23 @@ end # Parallel +collect+ plus +inject+ - # Accumulates in +initial+ via +op+ (default = '<<') - def p_mapreduce(initial, op=:<<, &block) - raise ArgumentError if not initial.respond_to? :op + # Accumulates from +initial+ via +op+ (default = '+') + def p_mapreduce(initial, op=:+, &block) + raise ArgumentError if not initial.respond_to? op # Since exceptions from a Dispatch block act funky - p_result = Dispatch.wrap(initial) - self.p_each_with_index do |obj, i| - val = block.call(obj) - p_result.send(op, val) + q = Dispatch.queue_for(initial) + ivar = "@#{Dispatch.label_for(initial)}" + p ivar + self.instance_variable_set(ivar, initial) #is creating an ivar thread-safe? + self.p_each do |obj| + val = block.call(obj) + q.async do + sum = self.instance_variable_get(ivar).send(op, val) + self.instance_variable_set(ivar, sum) + end end - p_result - ._done_ + q.sync {} + self.send(:remove_instance_variable, ivar) end Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:45 UTC (rev 3450) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:57 UTC (rev 3451) @@ -18,10 +18,10 @@ @sum2 = 0 @q = Dispatch.queue_for(@sum2) @ary.p_each {|v| temp = v*v; @q.sync {@sum2 += temp} } - @sum1.should == @sum2 + @sum2.should == @sum1 end - it "executes concurrently" do + it "should execute concurrently" do true.should == true end end @@ -37,10 +37,10 @@ @sum2 = 0 @q = Dispatch.queue_for(@sum2) @ary.p_each_with_index {|v, i| temp = v**i; @q.sync {@sum2 += temp} } - @sum1.should == @sum2 + @sum2.should == @sum1 end - it "executes concurrently" do + it "should execute concurrently" do true.should == true end end @@ -52,10 +52,10 @@ it "should behave like map" do map1 = @ary.map {|v| v*v} map2 = @ary.p_map {|v| v*v} - map1.should == map2 + map2.should == map1 end - it "executes concurrently" do + it "should execute concurrently" do true.should == true end end @@ -71,20 +71,22 @@ map1.should == map2.sort end - it "should use any result that takes :<< " do - map1 = @ary.map {|v| "%x" % 10+v} - map2 = @ary.p_mapreduce("") {|v| "%x" % 10+v} + it "should accumulate any object that takes :<< " do + map1 = @ary.map {|v| "%x" % (10+v)} + map2 = @ary.p_mapreduce("") {|v| "%x" % (10+v)} map1.each do |s| map2.index(s).should_not == nil end end it "should allow custom accumulator methods" do - map2 = @ary.p_mapreduce(0, :|) {|v| v**2} - map2.should == (2 | 4 | 8) + map1 = @ary.map {|v| v**2} + sum1 = map1.inject(0) {|s,v| s | v} + sum2 = @ary.p_mapreduce(0, :|) {|v| v**2} + sum2.should == sum1 end - it "executes concurrently" do + it "should execute concurrently" do true.should == true end end

1 0

[3450] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3450 http://trac.macosforge.org/projects/ruby/changeset/3450 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:45 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Added Dispatch.label_for Modified Paths: -------------- MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-08 23:04:34 UTC (rev 3449) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-02-08 23:04:45 UTC (rev 3450) @@ -2,11 +2,17 @@ # directly from the top-level Dispatch module module Dispatch - # Returns a new serial queue with a unique label based on - # the ancestor chain and ID of +obj+ + # Returns a unique label based on the ancestor chain and ID of +obj+ + # plus the current time + def label_for(obj) + label = obj.class.ancestors.uniq.reverse.join("_").downcase + now = Time.now.to_f.to_s.gsub(".","_") + "#{label}_%x_%s" % [obj.object_id, now] + end + + # Returns a new serial queue with a unique label based on +obj+ def queue_for(obj) - label = obj.class.ancestors.reverse.join(".").downcase - Dispatch::Queue.new("#{label}.0x%x[#{obj}]" % obj.object_id) + Dispatch::Queue.new Dispatch.label_for(obj) end # Run the +&block+ synchronously on a concurrent queue @@ -60,6 +66,6 @@ end end - module_function :queue_for, :async, :sync, :group, :wrap, :fork + module_function :label_for, :queue_for, :async, :sync, :group, :wrap, :fork end Modified: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-08 23:04:34 UTC (rev 3449) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-02-08 23:04:45 UTC (rev 3450) @@ -15,13 +15,19 @@ @actee = Actee.new("my_actee") end + describe :label_for do + it "should return a unique label for any object" do + s1 = Dispatch.label_for(@actee) + s2 = Dispatch.label_for(@actee) + s1.should_not == s2 + end + end + describe :queue_for do - it "should return a unique label per actee" do - s1 = Dispatch.queue_for((a)actee).to_s - s2 = Dispatch.queue_for((a)actee).to_s - s3 = Dispatch.queue_for(Actee.new("your_actee")).to_s - s1.should == s2 - s1.should_not == s3 + it "should return a unique queue" do + q1 = Dispatch.queue_for(@actee) + q2 = Dispatch.queue_for(@actee) + q1.should_not == q2 end end

1 0

[3449] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3449 http://trac.macosforge.org/projects/ruby/changeset/3449 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:34 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Initial mapreduce specs Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:22 UTC (rev 3448) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:34 UTC (rev 3449) @@ -30,11 +30,11 @@ end # Parallel +collect+ plus +inject+ - # Accumulates in +result+ via +op+ (default = '<<') - # Only works if result doesn't depend on the order elements are processed. - def p_mapreduce(result=[], op=:<<, &block) - raise ArgumentError if not result.respond_to? :op - p_result = Dispatch.wrap(result) + # Accumulates in +initial+ via +op+ (default = '<<') + def p_mapreduce(initial, op=:<<, &block) + raise ArgumentError if not initial.respond_to? :op + # Since exceptions from a Dispatch block act funky + p_result = Dispatch.wrap(initial) self.p_each_with_index do |obj, i| val = block.call(obj) p_result.send(op, val) Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:22 UTC (rev 3448) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:34 UTC (rev 3449) @@ -12,7 +12,7 @@ @ary.respond_to?(:p_each).should == true end - it "behaves like each" do + it "should behave like each" do @sum1 = 0 @ary.each {|v| @sum1 += v*v} @sum2 = 0 @@ -31,7 +31,7 @@ @ary.respond_to?(:p_each).should == true end - it "behaves like each_with_index" do + it "should behave like each_with_index" do @sum1 = 0 @ary.each_with_index {|v, i| @sum1 += v**i} @sum2 = 0 @@ -47,15 +47,47 @@ describe :p_map do it "exists on objects that support Enumerable" do - @ary.respond_to?(:p_each).should == true + @ary.respond_to?(:p_map).should == true end - it "behaves like map" do - @ary.should.respond_to? :p_map + it "should behave like map" do + map1 = @ary.map {|v| v*v} + map2 = @ary.p_map {|v| v*v} + map1.should == map2 end it "executes concurrently" do true.should == true end end + + describe :p_mapreduce do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_mapreduce).should == true + end + + it "should behave like an unordered map" do + map1 = @ary.map {|v| v*v} + map2 = @ary.p_mapreduce([]) {|v| v*v} + map1.should == map2.sort + end + + it "should use any result that takes :<< " do + map1 = @ary.map {|v| "%x" % 10+v} + map2 = @ary.p_mapreduce("") {|v| "%x" % 10+v} + map1.each do |s| + map2.index(s).should_not == nil + end + end + + it "should allow custom accumulator methods" do + map2 = @ary.p_mapreduce(0, :|) {|v| v**2} + map2.should == (2 | 4 | 8) + end + + it "executes concurrently" do + true.should == true + end + end + end end \ No newline at end of file

1 0

[3448] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3448 http://trac.macosforge.org/projects/ruby/changeset/3448 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:22 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Preliminary Dispatch mapreduce Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:12 UTC (rev 3447) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:22 UTC (rev 3448) @@ -19,43 +19,48 @@ grp.wait end - # Parallel +inject+ - # Requires initial value since 'first' no longer special. - # Only works if result doesn't depend on the order elements are processed. - def p_inject(initial, &block) - @result = Dispatch.wrap(initial) - self.p_each { |obj| block.call(@result, obj) } - @result._done - return @result - end - # Parallel +collect+ + # Results match the order of the original array def p_map(&block) result = Dispatch.wrap(Array) self.p_each_with_index do |obj, i| result[i] = block.call(obj) end - result + result._done_ end + # Parallel +collect+ plus +inject+ + # Accumulates in +result+ via +op+ (default = '<<') + # Only works if result doesn't depend on the order elements are processed. + def p_mapreduce(result=[], op=:<<, &block) + raise ArgumentError if not result.respond_to? :op + p_result = Dispatch.wrap(result) + self.p_each_with_index do |obj, i| + val = block.call(obj) + p_result.send(op, val) + end + p_result + ._done_ + end + + # Parallel +select+; will return array of objects for which # +&block+ returns true. - # Useful if the test block is very expensive to run def p_find_all(&block) - @found_all = Dispatch.wrap(Array) - self.p_each { |obj| @found_all << obj if block.call(obj) } - @found_all._done # will this leak? + found_all = Dispatch.wrap(Array) + self.p_each { |obj| found_all << obj if block.call(obj) } + found_all._done # will this leak? end # Parallel +detect+; will return -one- match for +&block+ # but it may not be the 'first' - # Useful if the test block is very expensive to run + # Only useful if the test block is very expensive to run def p_find(&block) - @found = Dispatch.wrap(nil) + found = Dispatch.wrap(nil) self.p_each do |obj| - found = @found.nil? ? block.call(obj) : nil - @found = obj if found and @found.nil? + found = found.nil? ? block.call(obj) : nil + found = obj if found and found.nil? end - @found._done # will this leak? + found._done # will this leak? end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:12 UTC (rev 3447) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:04:22 UTC (rev 3448) @@ -30,8 +30,14 @@ it "exists on objects that support Enumerable" do @ary.respond_to?(:p_each).should == true end + it "behaves like each_with_index" do - @ary.should.respond_to? :p_each_with_index + @sum1 = 0 + @ary.each_with_index {|v, i| @sum1 += v**i} + @sum2 = 0 + @q = Dispatch.queue_for(@sum2) + @ary.p_each_with_index {|v, i| temp = v**i; @q.sync {@sum2 += temp} } + @sum1.should == @sum2 end it "executes concurrently" do @@ -39,19 +45,6 @@ end end - describe :p_inject do - it "exists on objects that support Enumerable" do - @ary.respond_to?(:p_each).should == true - end - it "behaves like inject" do - @ary.should.respond_to? :p_inject - end - - it "executes concurrently" do - true.should == true - end - end - describe :p_map do it "exists on objects that support Enumerable" do @ary.respond_to?(:p_each).should == true

1 0

[3447] MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3447 http://trac.macosforge.org/projects/ruby/changeset/3447 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:12 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Added state to actor specs Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-08 23:04:00 UTC (rev 3446) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-08 23:04:12 UTC (rev 3447) @@ -73,18 +73,18 @@ end end - describe "should return" do - it "value when called Synchronously" do + describe "return" do + it "should be value when called Synchronously" do @actor.increment(41).should == 42 end - it "nil when called Asynchronously" do + it "should be nil when called Asynchronously" do @v = 0 v = @actor.increment(41) {|rv| @v = rv} v.should.nil? end - it "value to block when called Asynchronously" do + it "should pass value to block when called Asynchronously" do @v = 0 @actor.increment(41) {|rv| @v = rv} while @v == 0 do; end @@ -123,6 +123,28 @@ actee.should == @actee end end + + describe "state" do + it "should persist for collection objects" do + actor = Dispatch::Actor.new([]) + actor.size.should == 0 + actor << :foo + actor.size.should == 1 + actor[42] = :foo + actor.size.should == 43 + end + + it "should persist for numbers" do + actor = Dispatch::Actor.new(0) + actor.to_i.should == 0 + actor += 1 + actor.to_i.should == 1 + actor += 41.0 + actor.to_i.should == 42 + sum = actor - 1 + sum.should == 41 + end + end end end \ No newline at end of file

1 0

[3446] MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3446 http://trac.macosforge.org/projects/ruby/changeset/3446 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:04:00 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Refactored actor spec before adding more tests Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-08 23:03:48 UTC (rev 3445) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-02-08 23:04:00 UTC (rev 3446) @@ -18,97 +18,111 @@ @actor = Dispatch::Actor.new(@actee) end - it "should return an Actor when called with an actee" do - @actor.should be_kind_of(Dispatch::Actor) - @actor.should be_kind_of(SimpleDelegator) - end + describe :new do + it "should return an Actor when called with an actee" do + @actor.should be_kind_of(Dispatch::Actor) + @actor.should be_kind_of(SimpleDelegator) + end + + it "should set callback queue to use when called Asynchronously" do + qn = Dispatch::Queue.new("custom") + @actor2 = Dispatch::Actor.new(@actee, qn) + @qs = "" + @actor2.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should == qn.label + end - it "should return the actee when called with __getobj__" do - @actee.should be_kind_of(Actee) - @actor.__getobj__.should be_kind_of(Actee) + it "should set default callback queue if not specified" do + @qs = "" + @actor.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should =~ /com.apple.root.default/ + end end - it "should invoke actee for most inherited methods" do - @actor.to_s.should == @actee.to_s - end + describe :actee do + it "should be returned by __getobj__" do + @actee.should be_kind_of(Actee) + @actor.__getobj__.should be_kind_of(Actee) + end - it "should invoke actee methods on a private serial queue" do - q = @actor.current_queue - q.label.should =~ /dispatch.actor/ + it "should be invoked for most inherited methods" do + @actor.to_s.should == @actee.to_s + end end - it "should call actee Synchronously if block is NOT given" do - $global = 0 - @actor.delay_set(42) - $global.should == 42 - end + describe "method invocation" do + it "should occur on a private serial queue" do + q = @actor.current_queue + q.label.should =~ /dispatch.actor/ + end - it "should return value when called Synchronously" do - @actor.increment(41).should == 42 + it "should be Synchronous if block is NOT given" do + $global = 0 + @actor.delay_set(42) + $global.should == 42 + end + + it "should be Asynchronous if block IS given" do + $global = 0 + @actor.delay_set(42) { } + $global.should == 0 + while $global == 0 do; end + $global.should == 42 + end end - it "should call actee Asynchronously if block IS given" do - $global = 0 - @actor.delay_set(42) { } - $global.should == 0 - while $global == 0 do; end - $global.should == 42 - end + describe "should return" do + it "value when called Synchronously" do + @actor.increment(41).should == 42 + end - it "should return nil when called Asynchronously" do - @v = 0 - v = @actor.increment(41) {|rv| @v = rv} - v.should.nil? - end + it "nil when called Asynchronously" do + @v = 0 + v = @actor.increment(41) {|rv| @v = rv} + v.should.nil? + end - it "should provide return value to block when called Asynchronously" do - @v = 0 - @actor.increment(41) {|rv| @v = rv} - while @v == 0 do; end - @v.should == 42 + it "value to block when called Asynchronously" do + @v = 0 + @actor.increment(41) {|rv| @v = rv} + while @v == 0 do; end + @v.should == 42 + end end - it "should use default callback queue when called Asynchronously" do - @qs = "" - @actor.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} - while @qs == "" do; end - @qs.should =~ /com.apple.root.default/ + describe :_on_ do + it "should specify callback queue used for actee async" do + qn = Dispatch::Queue.new("custom") + @qs = "" + @actor._on_(qn).increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} + while @qs == "" do; end + @qs.should == qn.label + end end - it "should use specified callback queue when called Asynchronously" do - qn = Dispatch::Queue.new("custom") - @actor2 = Dispatch::Actor.new(@actee, qn) - @qs = "" - @actor2.increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} - while @qs == "" do; end - @qs.should == qn.label + describe :_with_ do + it "should specify group used for actee async" do + $global = 0 + g = Dispatch::Group.new + @actor._with_(g).delay_set(42) + $global.should == 0 + g.wait + $global.should == 42 + end end - it "should use callback queue specified by _on_" do - qn = Dispatch::Queue.new("custom") - @qs = "" - @actor._on_(qn).increment(41) {|rv| @qs = Dispatch::Queue.current.to_s} - while @qs == "" do; end - @qs.should == qn.label + describe :_done_ do + it "should complete work and return actee" do + $global = 0 + @actor.delay_set(42) { } + $global.should == 0 + actee = @actor._done_ + $global.should == 42 + actee.should == @actee + end end - it "should invoke actee async when group specified by _with_" do - $global = 0 - g = Dispatch::Group.new - @actor._with_(g).delay_set(42) - $global.should == 0 - g.wait - $global.should == 42 - end - - it "should complete work and return actee when called with _done" do - $global = 0 - @actor.delay_set(42) { } - $global.should == 0 - actee = @actor._done_ - $global.should == 42 - actee.should == @actee - end - end - + end end \ No newline at end of file

1 0

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

08 Feb '10

Revision: 3445 http://trac.macosforge.org/projects/ruby/changeset/3445 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:03:48 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Initial enumerable spec Added Paths: ----------- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Added: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:03:48 UTC (rev 3445) @@ -0,0 +1,68 @@ +require File.dirname(__FILE__) + "/../../spec_helper" +require 'dispatch' + +if MACOSX_VERSION >= 10.6 + describe "parallel Enumerable" do + before :each do + @ary = (1..3).to_a + end + + describe :p_each do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_each).should == true + end + + it "behaves like each" do + @sum1 = 0 + @ary.each {|v| @sum1 += v*v} + @sum2 = 0 + @q = Dispatch.queue_for(@sum2) + @ary.p_each {|v| temp = v*v; @q.sync {@sum2 += temp} } + @sum1.should == @sum2 + end + + it "executes concurrently" do + true.should == true + end + end + + describe :p_each_with_index do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_each).should == true + end + it "behaves like each_with_index" do + @ary.should.respond_to? :p_each_with_index + end + + it "executes concurrently" do + true.should == true + end + end + + describe :p_inject do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_each).should == true + end + it "behaves like inject" do + @ary.should.respond_to? :p_inject + end + + it "executes concurrently" do + true.should == true + end + end + + describe :p_map do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_each).should == true + end + it "behaves like map" do + @ary.should.respond_to? :p_map + end + + it "executes concurrently" do + true.should == true + end + end + end +end \ No newline at end of file

1 0

[3444] MacRuby/trunk/lib/dispatch/enumerable.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3444 http://trac.macosforge.org/projects/ruby/changeset/3444 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:03:39 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Moved Dispatch::Enumerable directly into Enumerable Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:03:32 UTC (rev 3443) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:03:39 UTC (rev 3444) @@ -1,69 +1,61 @@ # Additional parallel operations for any object supporting +each+ -module Dispatch - module Enumerable - # Parallel +each+ - def p_each(&block) - grp = Group.new - self.each do |obj| - Dispatch.group(grp) { block.call(obj) } - end - grp.wait +module Enumerable + # Parallel +each+ + def p_each(&block) + grp = Dispatch::Group.new + self.each do |obj| + Dispatch.group(grp) { block.call(obj) } end + grp.wait + end - # Parallel +each_with_index+ - def p_each_with_index(&block) - grp = Group.new - self.each_with_index do |obj, i| - Dispatch.group(grp) { block.call(obj, i) } - end - grp.wait + # Parallel +each_with_index+ + def p_each_with_index(&block) + grp = Dispatch::Group.new + self.each_with_index do |obj, i| + Dispatch.group(grp) { block.call(obj, i) } end + grp.wait + end - # Parallel +inject+ - # Requires initial value since 'first' no longer special. - # Only works if result doesn't depend on the order elements are processed. - def p_inject(initial, &block) - @result = Dispatch.wrap(initial) - self.p_each { |obj| block.call(@result, obj) } - @result._done - return @result - end + # Parallel +inject+ + # Requires initial value since 'first' no longer special. + # Only works if result doesn't depend on the order elements are processed. + def p_inject(initial, &block) + @result = Dispatch.wrap(initial) + self.p_each { |obj| block.call(@result, obj) } + @result._done + return @result + end - # Parallel +collect+ - def p_map(&block) - result = Dispatch.wrap(Array) - self.p_each_with_index do |obj, i| - result[i] = block.call(obj) - end - result + # Parallel +collect+ + def p_map(&block) + result = Dispatch.wrap(Array) + self.p_each_with_index do |obj, i| + result[i] = block.call(obj) end + result + end - # Parallel +select+; will return array of objects for which - # +&block+ returns true. - # Useful if the test block is very expensive to run - def p_find_all(&block) - @found_all = Dispatch.wrap(Array) - self.p_each { |obj| @found_all << obj if block.call(obj) } - @found_all._done # will this leak? - end + # Parallel +select+; will return array of objects for which + # +&block+ returns true. + # Useful if the test block is very expensive to run + def p_find_all(&block) + @found_all = Dispatch.wrap(Array) + self.p_each { |obj| @found_all << obj if block.call(obj) } + @found_all._done # will this leak? + end - # Parallel +detect+; will return -one- match for +&block+ - # but it may not be the 'first' - # Useful if the test block is very expensive to run - def p_find(&block) - @found = Dispatch.wrap(nil) - self.p_each do |obj| - found = @found.nil? ? block.call(obj) : nil - @found = obj if found and @found.nil? - end - @found._done # will this leak? + # Parallel +detect+; will return -one- match for +&block+ + # but it may not be the 'first' + # Useful if the test block is very expensive to run + def p_find(&block) + @found = Dispatch.wrap(nil) + self.p_each do |obj| + found = @found.nil? ? block.call(obj) : nil + @found = obj if found and @found.nil? end + @found._done # will this leak? end end - -# Mixin to Enumerable, and thus everything that includes it -module Enumerable - include Dispatch::Enumerable -end -

1 0

[3443] MacRuby/trunk/lib/dispatch/enumerable.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3443 http://trac.macosforge.org/projects/ruby/changeset/3443 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:03:32 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Preliminary Dispatch::Enumerable specs Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 20:49:53 UTC (rev 3442) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:03:32 UTC (rev 3443) @@ -61,3 +61,9 @@ end end end + +# Mixin to Enumerable, and thus everything that includes it +module Enumerable + include Dispatch::Enumerable +end +

1 0

[3442] MacRuby/trunk/HACKING.rdoc
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3442 http://trac.macosforge.org/projects/ruby/changeset/3442 Author: lsansonetti(a)apple.com Date: 2010-02-08 12:49:53 -0800 (Mon, 08 Feb 2010) Log Message: ----------- added a section about code design Modified Paths: -------------- MacRuby/trunk/HACKING.rdoc Modified: MacRuby/trunk/HACKING.rdoc =================================================================== --- MacRuby/trunk/HACKING.rdoc 2010-02-08 09:10:54 UTC (rev 3441) +++ MacRuby/trunk/HACKING.rdoc 2010-02-08 20:49:53 UTC (rev 3442) @@ -92,6 +92,20 @@ do_something3(); } +=== Code Design + +* Please declare variables as you use them. The whole project is built under the + C99 mode so newer constructs are also recommended (such as the definition of + iterator variables in 'for' loops). + +* Please use the 'const' qualifier for scalar variables that are not supposed to + change. + +* Use 'assert' or 'abort' for situations that should never happen. It is not a + problem if you abuse of this, just be clever. + +* Do not use 'alloca' unless you know what you are doing. + === Debugging ==== Environment variables

1 0