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

[3859] MacRuby/trunk/spec/macruby/library/dispatch/source_spec.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3859 http://trac.macosforge.org/projects/ruby/changeset/3859 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 16:51:08 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Fixed unfinished Dispatch::Source#write spec Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/source_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/source_spec.rb 2010-03-24 20:38:13 UTC (rev 3858) +++ MacRuby/trunk/spec/macruby/library/dispatch/source_spec.rb 2010-03-24 23:51:08 UTC (rev 3859) @@ -113,7 +113,7 @@ describe "VNODE" do before :each do - @msg = "#{$$}-#{Time.now}" + @msg = "#{$$}-#{Time.now.to_s.gsub(' ','_')}" @filename = tmp("gcd_spec_source-#{@msg}") @file = nil @src = nil @@ -141,18 +141,16 @@ describe "write" do it "fires with data on writable bytes" do @file = File.open(@filename, "w") - @pos = 0 @message = @msg - @src = Dispatch::Source.read(@file, @q) do |s| - pos = s.data - if not @message.nil? then - next_msg = @message[0..pos-1] - @file.write(next_msg) - @message = @message[pos..-1] + @src = Dispatch::Source.write(@file, @q) do |s| + if @message.size > 0 then + char = @message[0..0] + @file.write(char) + @message = @message[1..-1] end end - while (@result.size < @msg.size) do; end - @q.sync { } + while (@message.size > 0) do; end + result = File.read(@filename) @result.should == @msg end end

1 0

[3858] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3858 http://trac.macosforge.org/projects/ruby/changeset/3858 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:38:13 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Finish sample gcd/benchmarks.rb vis-a-vis Dispatch_Compared Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:11 UTC (rev 3857) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:13 UTC (rev 3858) @@ -1,13 +1,20 @@ #!/usr/local/bin/macruby +# +# Iterate using different GCD techniques to illustrate relative performance/overhead +# +# Inspired by: https://developer.apple.com/mac/library/samplecode/Dispatch_Compared/index.… require 'dispatch' require 'benchmark' $max_tasks = 256 $reps = 1024 -$folds = 32 +$folds = 8 $results = nil#[] +$group = Dispatch::Group.new +$queue = Dispatch::Queue.new('org.macruby.gcd.serial') + class Benchmark def self.repeat(count, label="", &block) raise "count: #{count} < 1" if count < 1 @@ -23,11 +30,11 @@ $results[i] = x if not $results.nil? end -def iter(n) +def times(n) n.times {|i| work_function(i)} end -def p_iter(n) +def ptimes(n) n.p_times {|i| work_function(i)} end @@ -36,26 +43,23 @@ end def concur(n) - g = Dispatch::Group.new q = Dispatch::Queue.concurrent n.times do |i| - q.async(g) {work_function(i)} + q.async($group) {work_function(i)} end - g.wait + $group.wait end def serial(n) - q = Dispatch::Queue.new('org.macruby.gcd.serial') - n.times {|i| q.async {work_function(i)}} - q.sync { } + n.times {|i| $queue.async {work_function(i)}} + $queue.sync { } end def nqueue(n) - g = Dispatch::Group.new n.times do |i| - Dispatch::Queue.new("org.macruby.gcd.multi.#{i}").async(g) {work_function(i)} + Dispatch::Queue.new("org.macruby.gcd.multi.#{i}").async($group) {work_function(i)} end - g.wait + $group.wait end def njobs(n) @@ -69,12 +73,12 @@ Benchmark.repeat($reps, "%6s" % method, &proc).real*1e6/count end -METHODS = %w(iter p_iter apply concur serial nqueue njobs) +METHODS = %w(times ptimes apply concur serial nqueue njobs) TASKS = [t = 1] TASKS << t *= 2 while t < $max_tasks print "GCD BENCHMARKS\tMaxTask\t#{$max_tasks}\tFolds\t#{$folds}\tReps\t#{$reps}\n" -print "T µsec\t#{TASKS.join("\t ")}" +print "T µsec\t #{TASKS.join("\t ")}" METHODS.each do |method| print "\n#{method}" @@ -82,5 +86,5 @@ print "\t%6.2f" % bench(method, n) end end - +puts print "Results: #{$results.join("\t")}" if not $results.nil?

1 0

[3857] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3857 http://trac.macosforge.org/projects/ruby/changeset/3857 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:38:11 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Tabular output for gcd/benchmarks.rb Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:09 UTC (rev 3856) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:11 UTC (rev 3857) @@ -3,6 +3,11 @@ require 'dispatch' require 'benchmark' +$max_tasks = 256 +$reps = 1024 +$folds = 32 +$results = nil#[] + class Benchmark def self.repeat(count, label="", &block) raise "count: #{count} < 1" if count < 1 @@ -12,18 +17,6 @@ end end -$max_tasks = 256 -$reps = 1024 -$folds = 32 -$results = nil#[] - -METHODS = %w(iter p_iter apply concur serial nqueue njobs) - -puts "GCD BENCHMARKS" -puts "MaxTasks\t#{$max_tasks}\tFolds\t#{$folds}\tReps\t#{$reps}" -#puts METHODS -puts "METHOD\tTASKS\tTIME µsec" - def work_function(i) x = 1.0+i*i $folds.times {|j| x = Math::tan(Math::PI/2 - Math::atan(Math::exp(2*Math::log(Math::sqrt(x))))) } @@ -73,14 +66,21 @@ def bench(method, count=1) proc = Proc.new { send(method.to_sym, count) } - t = Benchmark.repeat($reps, "%6s" % method, &proc) - puts "#{method}\t#{count}\t%6.2f" % (t.real*1e6/count) + Benchmark.repeat($reps, "%6s" % method, &proc).real*1e6/count end -n = 1 -while n <= $max_tasks do - METHODS.each { |method| bench(method, n) } - n *= 2 +METHODS = %w(iter p_iter apply concur serial nqueue njobs) +TASKS = [t = 1] +TASKS << t *= 2 while t < $max_tasks + +print "GCD BENCHMARKS\tMaxTask\t#{$max_tasks}\tFolds\t#{$folds}\tReps\t#{$reps}\n" +print "T µsec\t#{TASKS.join("\t ")}" + +METHODS.each do |method| + print "\n#{method}" + TASKS.each do |n| + print "\t%6.2f" % bench(method, n) + end end -puts "Results: #{$results}" if not $results.nil? +print "Results: #{$results.join("\t")}" if not $results.nil?

1 0

[3856] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3856 http://trac.macosforge.org/projects/ruby/changeset/3856 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:38:09 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Tab separated gcd/benchmarks.rb Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:08 UTC (rev 3855) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:09 UTC (rev 3856) @@ -20,8 +20,9 @@ METHODS = %w(iter p_iter apply concur serial nqueue njobs) puts "GCD BENCHMARKS" -puts "Folds,\t#{$folds},\tMaxTasks,\t#{$max_tasks},\tReps,\t#{$reps}" -puts "TYPE,\tTASKS,\t'TIME µsec'" +puts "MaxTasks\t#{$max_tasks}\tFolds\t#{$folds}\tReps\t#{$reps}" +#puts METHODS +puts "METHOD\tTASKS\tTIME µsec" def work_function(i) x = 1.0+i*i @@ -73,7 +74,7 @@ def bench(method, count=1) proc = Proc.new { send(method.to_sym, count) } t = Benchmark.repeat($reps, "%6s" % method, &proc) - puts "#{method},\t#{count},\t%6.2f" % (t.real*1e6/count) + puts "#{method}\t#{count}\t%6.2f" % (t.real*1e6/count) end n = 1

1 0

[3855] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3855 http://trac.macosforge.org/projects/ruby/changeset/3855 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:38:08 -0700 (Wed, 24 Mar 2010) Log Message: ----------- CSV output for gcd/benchmarks.rb sample Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:06 UTC (rev 3854) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:08 UTC (rev 3855) @@ -8,7 +8,7 @@ raise "count: #{count} < 1" if count < 1 block.call t = measure {count.times &block} / count - Tms.new(*t.to_a[1..-1], label).inspect + Tms.new(*t.to_a[1..-1], label) end end @@ -17,9 +17,12 @@ $folds = 32 $results = nil#[] -puts "GCD Benchmarks" -puts "Tasks: #{$max_tasks}\tFolded: #{$folds}\tReps:\t#{$reps}" +METHODS = %w(iter p_iter apply concur serial nqueue njobs) +puts "GCD BENCHMARKS" +puts "Folds,\t#{$folds},\tMaxTasks,\t#{$max_tasks},\tReps,\t#{$reps}" +puts "TYPE,\tTASKS,\t'TIME µsec'" + def work_function(i) x = 1.0+i*i $folds.times {|j| x = Math::tan(Math::PI/2 - Math::atan(Math::exp(2*Math::log(Math::sqrt(x))))) } @@ -39,9 +42,12 @@ end def concur(n) - j = Dispatch::Job.new - n.times {|i| j.add { work_function(i) }} - j.join + g = Dispatch::Group.new + q = Dispatch::Queue.concurrent + n.times do |i| + q.async(g) {work_function(i)} + end + g.wait end def serial(n) @@ -50,7 +56,7 @@ q.sync { } end -def multiq(n) +def nqueue(n) g = Dispatch::Group.new n.times do |i| Dispatch::Queue.new("org.macruby.gcd.multi.#{i}").async(g) {work_function(i)} @@ -58,19 +64,21 @@ g.wait end +def njobs(n) + j = Dispatch::Job.new + n.times {|i| j.add { work_function(i) }} + j.join +end + def bench(method, count=1) proc = Proc.new { send(method.to_sym, count) } - t = Benchmark.measure("%6s" % method, &proc) - t_msec = t.real*1000 - puts "#{t.label}: %5.2f millisec (avg: %5.2f microsec)" % [t_msec, t_msec*1000/count] + t = Benchmark.repeat($reps, "%6s" % method, &proc) + puts "#{method},\t#{count},\t%6.2f" % (t.real*1e6/count) end n = 1 while n <= $max_tasks do - puts "\n#{n} tasks" - %w(iter p_iter apply concur serial multiq).each do |s| - bench(s, n) - end + METHODS.each { |method| bench(method, n) } n *= 2 end

1 0

[3854] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3854 http://trac.macosforge.org/projects/ruby/changeset/3854 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:38:06 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Refactored Benchmark class Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:37:55 UTC (rev 3853) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:38:06 UTC (rev 3854) @@ -1,15 +1,24 @@ #!/usr/local/bin/macruby +require 'dispatch' require 'benchmark' -require 'dispatch' +class Benchmark + def self.repeat(count, label="", &block) + raise "count: #{count} < 1" if count < 1 + block.call + t = measure {count.times &block} / count + Tms.new(*t.to_a[1..-1], label).inspect + end +end + $max_tasks = 256 -$benched = $reps = 100 +$reps = 1024 $folds = 32 $results = nil#[] puts "GCD Benchmarks" -puts "Tasks: #{$max_tasks}\tFolded: #{$folds}\tReps:\t#{$reps}\n" +puts "Tasks: #{$max_tasks}\tFolded: #{$folds}\tReps:\t#{$reps}" def work_function(i) x = 1.0+i*i @@ -29,19 +38,19 @@ Dispatch::Queue.concurrent.apply(n) {|i| work_function(i)} end -def job(n) +def concur(n) j = Dispatch::Job.new n.times {|i| j.add { work_function(i) }} j.join end -def queue(n) +def serial(n) q = Dispatch::Queue.new('org.macruby.gcd.serial') n.times {|i| q.async {work_function(i)}} q.sync { } end -def multi(n) +def multiq(n) g = Dispatch::Group.new n.times do |i| Dispatch::Queue.new("org.macruby.gcd.multi.#{i}").async(g) {work_function(i)} @@ -49,27 +58,19 @@ g.wait end - -def run(x, label, &block) - (x.nil?) ? yield : x.report(label) {$reps.times &block} +def bench(method, count=1) + proc = Proc.new { send(method.to_sym, count) } + t = Benchmark.measure("%6s" % method, &proc) + t_msec = t.real*1000 + puts "#{t.label}: %5.2f millisec (avg: %5.2f microsec)" % [t_msec, t_msec*1000/count] end -def run_all(x, n) - puts "#{n} tasks" if not x.nil? - run(x,"looped") { iter(n) } - run(x,"p_loop") { p_iter(n) } - run(x," apply") { apply(n) } - run(x,"concur") { job(n) } - run(x,"serial") { queue(n) } - run(x,"multiq") { multi(n) } - puts -end - n = 1 -width = 6 while n <= $max_tasks do - run_all(nil, n) - Benchmark.bm(width) { |x| run_all(x, n) } + puts "\n#{n} tasks" + %w(iter p_iter apply concur serial multiq).each do |s| + bench(s, n) + end n *= 2 end

1 0

[3853] MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3853 http://trac.macosforge.org/projects/ruby/changeset/3853 Author: ernest.prabhakar(a)gmail.com Date: 2010-03-24 13:37:55 -0700 (Wed, 24 Mar 2010) Log Message: ----------- Update benchmark for new dispatch library Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb Added: MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/benchmarks.rb 2010-03-24 20:37:55 UTC (rev 3853) @@ -0,0 +1,76 @@ +#!/usr/local/bin/macruby + +require 'benchmark' +require 'dispatch' + +$max_tasks = 256 +$benched = $reps = 100 +$folds = 32 +$results = nil#[] + +puts "GCD Benchmarks" +puts "Tasks: #{$max_tasks}\tFolded: #{$folds}\tReps:\t#{$reps}\n" + +def work_function(i) + x = 1.0+i*i + $folds.times {|j| x = Math::tan(Math::PI/2 - Math::atan(Math::exp(2*Math::log(Math::sqrt(x))))) } + $results[i] = x if not $results.nil? +end + +def iter(n) + n.times {|i| work_function(i)} +end + +def p_iter(n) + n.p_times {|i| work_function(i)} +end + +def apply(n) + Dispatch::Queue.concurrent.apply(n) {|i| work_function(i)} +end + +def job(n) + j = Dispatch::Job.new + n.times {|i| j.add { work_function(i) }} + j.join +end + +def queue(n) + q = Dispatch::Queue.new('org.macruby.gcd.serial') + n.times {|i| q.async {work_function(i)}} + q.sync { } +end + +def multi(n) + g = Dispatch::Group.new + n.times do |i| + Dispatch::Queue.new("org.macruby.gcd.multi.#{i}").async(g) {work_function(i)} + end + g.wait +end + + +def run(x, label, &block) + (x.nil?) ? yield : x.report(label) {$reps.times &block} +end + +def run_all(x, n) + puts "#{n} tasks" if not x.nil? + run(x,"looped") { iter(n) } + run(x,"p_loop") { p_iter(n) } + run(x," apply") { apply(n) } + run(x,"concur") { job(n) } + run(x,"serial") { queue(n) } + run(x,"multiq") { multi(n) } + puts +end + +n = 1 +width = 6 +while n <= $max_tasks do + run_all(nil, n) + Benchmark.bm(width) { |x| run_all(x, n) } + n *= 2 +end + +puts "Results: #{$results}" if not $results.nil?

1 0

[3852] MacRuby/trunk/vm.h
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3852 http://trac.macosforge.org/projects/ruby/changeset/3852 Author: lsansonetti(a)apple.com Date: 2010-03-23 20:25:17 -0700 (Tue, 23 Mar 2010) Log Message: ----------- for the posterity Modified Paths: -------------- MacRuby/trunk/vm.h Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-03-24 01:41:05 UTC (rev 3851) +++ MacRuby/trunk/vm.h 2010-03-24 03:25:17 UTC (rev 3852) @@ -51,6 +51,8 @@ struct rb_vm_block *parent_block; int dvars_size; VALUE *dvars[1]; + // ATTENTION: do not add fields here, because it would mess with the way + // the structure is allocated regarding the dvars buffer! } rb_vm_block_t; typedef struct {

1 0

[3851] MacRuby/trunk/TODO
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3851 http://trac.macosforge.org/projects/ruby/changeset/3851 Author: lsansonetti(a)apple.com Date: 2010-03-23 18:41:05 -0700 (Tue, 23 Mar 2010) Log Message: ----------- refresh Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2010-03-24 01:37:43 UTC (rev 3850) +++ MacRuby/trunk/TODO 2010-03-24 01:41:05 UTC (rev 3851) @@ -1,13 +1,13 @@ For 0.6: [X] new Hash class, insertion ordering support, optimized for immediate types -[/] new String and Symbol classes, support for 1.9 encoding semantics -[/] new Regexp class, thread-safe, ICU-based -[/] refactor the Array, Hash and String Foundation bridging models - [X] Hash - [X] Array - [ ] String -[ ] implement basic Numeric methods on NSNumber +[X] new String and Symbol classes, support for 1.9 encoding semantics +[X] new Regexp class, thread-safe, ICU-based +[X] refactor Foundation bridging models + [X] NSDictionary + [X] NSArray + [X] NSString + [X] NSNumber [/] debugger [/] command-line tool [ ] Xcode plugin @@ -22,7 +22,7 @@ [/] hello world should work [ ] support Mocha [ ] support RSpec -[ ] 90% (min.) of rubyspecs should pass +[/] 90% (min.) of rubyspecs should pass Historical:

1 0

[3850] MacRuby/trunk/symbol.c
by source_changes＠macosforge.org 24 Mar '10

24 Mar '10

Revision: 3850 http://trac.macosforge.org/projects/ruby/changeset/3850 Author: lsansonetti(a)apple.com Date: 2010-03-23 18:37:43 -0700 (Tue, 23 Mar 2010) Log Message: ----------- Symbol must not respond to #to_i and #to_f Modified Paths: -------------- MacRuby/trunk/symbol.c Modified: MacRuby/trunk/symbol.c =================================================================== --- MacRuby/trunk/symbol.c 2010-03-24 00:04:42 UTC (rev 3849) +++ MacRuby/trunk/symbol.c 2010-03-24 01:37:43 UTC (rev 3850) @@ -697,6 +697,10 @@ rb_objc_define_method(*(VALUE *)rb_cSymbol, "all_symbols", rsym_all_symbols, 0); + // Undefine methods defined on NSString. + rb_undef_method(rb_cSymbol, "to_i"); + rb_undef_method(rb_cSymbol, "to_f"); + rb_objc_define_method(rb_cSymbol, "==", rsym_equal, 1); rb_objc_define_method(rb_cSymbol, "<=>", rsym_cmp, 1); rb_objc_define_method(rb_cSymbol, "casecmp", rsym_casecmp, 1);

1 0