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

[3365] MacRuby/trunk/lib/dispatch/futures.rb
by source_changes＠macosforge.org 29 Jan '10

29 Jan '10

Revision: 3365 http://trac.macosforge.org/projects/ruby/changeset/3365 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:06 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Redid Futures to use Dispatch helper methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/futures.rb Modified: MacRuby/trunk/lib/dispatch/futures.rb =================================================================== --- MacRuby/trunk/lib/dispatch/futures.rb 2010-01-29 23:40:04 UTC (rev 3364) +++ MacRuby/trunk/lib/dispatch/futures.rb 2010-01-29 23:40:06 UTC (rev 3365) @@ -4,21 +4,18 @@ # Create a future that asynchronously dispatches the block # to a concurrent queue of the specified (optional) +priority+ def initialize(priority=nil, &block) - @group = Group.new @value = nil - Dispatch.group(@group, priority) { @value = block.call } + @group = Dispatch.fork(priority) { @value = block.call } end # Waits for the computation to finish, then returns the value # Duck-typed to lambda.call(void) - def call() - @group.wait - @value - end - - # Passes the value to the +callback+ block when it is available - # Duck-typed to group.notify(&block) - def notify(&callback) + # If a block is passed, invoke that asynchronously with the final value + def call(&callback) + if not block_given? + @group.wait + return @value + end @group.notify { callback.call(@value) } end end

1 0

[3364] MacRuby/trunk/lib/dispatch
by source_changes＠macosforge.org 29 Jan '10

29 Jan '10

Revision: 3364 http://trac.macosforge.org/projects/ruby/changeset/3364 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:04 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Redid Dispatch actor and enumerable Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/enumerable.rb Modified: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb 2010-01-29 23:40:02 UTC (rev 3363) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-01-29 23:40:04 UTC (rev 3364) @@ -4,6 +4,10 @@ # and optinally calls back asynchronously (if given a block or group). # Note that this will NOT work for methods that themselves expect a block class Actor + + instance_methods.each |method| + undef_method(method) unless method =~ /__(.+)__|method_missing/ + end # Create an Actor to wrap the given +actee+, # optionally specifying the default +callback+ queue @@ -11,10 +15,10 @@ @actee = actee @callback_default = callback || Dispatch::Queue.concurrent @q = Dispatch::Queue.new("dispatch.actor.#{actee}.#{object_id}") - __reset! + __reset!__ end - def __reset! + def __reset!__ @callback = @callback_default @group = nil end @@ -28,6 +32,13 @@ def _with(group) @group = group end + + # Wait until the internal private queue has completed execution + # then returns the +actee+ delegate object + def _done + @q.sync { } + @actee + end def method_missing(symbol, *args, &block) if block_given? || not group.nil? @@ -36,7 +47,7 @@ retval = @actee.__send__(symbol, *args) callback.async { block.call(retval) } if not callback.nil? end - return __reset! + return __reset!__ else @retval = nil @q.sync { @retval = @actee.__send__(symbol, *args) } Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-01-29 23:40:02 UTC (rev 3363) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-01-29 23:40:04 UTC (rev 3364) @@ -2,6 +2,13 @@ # 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+ + def queue_for(obj) + label = obj.class.ancestors.reverse.join(".").downcase + Dispatch::Queue.new("#{label}.%x" % obj.object_id) + end + # Run the +&block+ asynchronously on a concurrent queue # of the given (optional) +priority+ def async(priority=nil, &block) Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:02 UTC (rev 3363) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:04 UTC (rev 3364) @@ -20,11 +20,14 @@ grp.wait end - # Parallel +inject+ (only works if commutative) - def p_inject(initial=0, &block) + # 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 + @result._done + return @result end # Parallel +collect+ @@ -36,19 +39,25 @@ result end - # Parallel +detect+ + # 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) - @done = false - @result = nil - self.p_each_with_index do |obj, i| - if not @done - if true == block.call(obj) - @done = true - @result = obj - end - end + @found = Dispatch.wrap(nil) + self.p_each do |obj| + found? = @found.nil? ? block.call(obj) : nil + @found = obj if found? and @found.nil? end - @result + @found._done # will this leak? end end end

1 0

[3363] MacRuby/trunk/lib
by source_changes＠macosforge.org 29 Jan '10

29 Jan '10

Revision: 3363 http://trac.macosforge.org/projects/ruby/changeset/3363 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:02 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Initial set of 'dispatch' lib helper classes/methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/lib/dispatch.rb Added Paths: ----------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/futures.rb Added: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb (rev 0) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-01-29 23:40:02 UTC (rev 3363) @@ -0,0 +1,47 @@ +module Dispatch + # Create an Actor that serializes or asynchronizes access to an object + # Forwards method invocations to the passed object via a private serial queue, + # and optinally calls back asynchronously (if given a block or group). + # Note that this will NOT work for methods that themselves expect a block + class Actor + + # Create an Actor to wrap the given +actee+, + # optionally specifying the default +callback+ queue + def initialize(actee, callback=nil) + @actee = actee + @callback_default = callback || Dispatch::Queue.concurrent + @q = Dispatch::Queue.new("dispatch.actor.#{actee}.#{object_id}") + __reset! + end + + def __reset! + @callback = @callback_default + @group = nil + end + + # Specify the +callback+ queue for the next async request + def _on(callback) + @callback = callback + end + + # Specify the +group+ for the next async request + def _with(group) + @group = group + end + + def method_missing(symbol, *args, &block) + if block_given? || not group.nil? + callback = @callback + @q.async(@group) do + retval = @actee.__send__(symbol, *args) + callback.async { block.call(retval) } if not callback.nil? + end + return __reset! + else + @retval = nil + @q.sync { @retval = @actee.__send__(symbol, *args) } + return @retval + end + end + end +end Added: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb (rev 0) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-01-29 23:40:02 UTC (rev 3363) @@ -0,0 +1,49 @@ +# Convenience methods for calling the concurrent queues +# directly from the top-level Dispatch module + +module Dispatch + # Run the +&block+ asynchronously on a concurrent queue + # of the given (optional) +priority+ + def async(priority=nil, &block) + Dispatch::Queue.concurrent(priority).async &block + end + + # Run the +&block+ synchronously on a concurrent queue + # of the given (optional) +priority+ + def sync(priority=nil, &block) + Dispatch::Queue.concurrent(priority).sync &block + end + + # Run the +&block+ asynchronously on a concurrent queue + # of the given (optional) +priority+ as part of the specified +grp+ + def group(grp, priority=nil, &block) + Dispatch::Queue.concurrent(priority).async(grp) &block + end + + # Wrap the passed +obj+ (or its instance) inside an Actor to serialize access + # and allow asynchronous invocation plus a callback + def wrap(obj) + 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+ + + def fork(priority=nil, &block) + grp = Group.new + Dispatch.group(grp) &block + return grp + end + + class Group + # Companion to +Dispatch.fork+, allowing you to +wait+ until +grp+ completes + # providing an API similar to that used by +Threads+ + # if a block is given, instead uses +notify+ to call it asynchronously + def join(&block) + block_given? ? notify &block : wait + end + end + +end \ No newline at end of file Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:00 UTC (rev 3362) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:02 UTC (rev 3363) @@ -1,18 +1,54 @@ +# 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 + 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 + end + + # Parallel +inject+ (only works if commutative) + def p_inject(initial=0, &block) + @result = Dispatch.wrap(initial) + self.p_each { |obj| block.call(@result, obj) } + @result + end + + # Parallel +collect+ def p_map(&block) - result = [] - # We will access the `result` array from within this serial queue, - # as without a GIL we cannot assume array access to be thread-safe. - result_queue = Dispatch::Queue.new('access-queue.#{result.object_id}') - # Uses Dispatch::Queue#apply to submit many blocks at once - Dispatch::Queue.concurrent.apply(size) do |idx| - # run the block in the concurrent queue to maximize parallelism - temp = block(self[idx]) - # do only the assignment on the serial queue - result_queue.async { result[idx] = temp } + result = Dispatch.wrap(Array) + self.p_each_with_index do |obj, i| + result[i] = block.call(obj) end result end + + # Parallel +detect+ + def p_find(&block) + @done = false + @result = nil + self.p_each_with_index do |obj, i| + if not @done + if true == block.call(obj) + @done = true + @result = obj + end + end + end + @result + end end end Added: MacRuby/trunk/lib/dispatch/futures.rb =================================================================== --- MacRuby/trunk/lib/dispatch/futures.rb (rev 0) +++ MacRuby/trunk/lib/dispatch/futures.rb 2010-01-29 23:40:02 UTC (rev 3363) @@ -0,0 +1,25 @@ +module Dispatch + # Wrapper around Dispatch::Group used to implement lazy Futures + class Future + # Create a future that asynchronously dispatches the block + # to a concurrent queue of the specified (optional) +priority+ + def initialize(priority=nil, &block) + @group = Group.new + @value = nil + Dispatch.group(@group, priority) { @value = block.call } + end + + # Waits for the computation to finish, then returns the value + # Duck-typed to lambda.call(void) + def call() + @group.wait + @value + end + + # Passes the value to the +callback+ block when it is available + # Duck-typed to group.notify(&block) + def notify(&callback) + @group.notify { callback.call(@value) } + end + end +end Modified: MacRuby/trunk/lib/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:00 UTC (rev 3362) +++ MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:02 UTC (rev 3363) @@ -14,6 +14,9 @@ raise "Dispatch will only work on Mac OS X 10.6 or later" if MACOSX_VERSION < 10.6 +require 'dispatch/actor' +require 'dispatch/dispatch' require 'dispatch/queue' require 'dispatch/queue_source' require 'dispatch/enumerable' +require 'dispatch/futures'

1 0

[3362] MacRuby/trunk/spec/macruby/library/dispatch/queue_source_spec.rb
by source_changes＠macosforge.org 29 Jan '10

29 Jan '10

Revision: 3362 http://trac.macosforge.org/projects/ruby/changeset/3362 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:00 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Fixed spec name Modified Paths: -------------- MacRuby/trunk/spec/macruby/library/dispatch/queue_source_spec.rb Modified: MacRuby/trunk/spec/macruby/library/dispatch/queue_source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/queue_source_spec.rb 2010-01-29 04:03:50 UTC (rev 3361) +++ MacRuby/trunk/spec/macruby/library/dispatch/queue_source_spec.rb 2010-01-29 23:40:00 UTC (rev 3362) @@ -113,7 +113,7 @@ end describe "on_file_event" do - it "fires with data on how many bytes can be written" do + it "fires with data indicating which file event(s)" do @file = File.open(@filename, "w") @fired = false @src = @q.on_file_event(@file, :delete, :write, :extend, :attrib, :link, :rename, :revoke) do |s|

1 0

[3361] MacRuby/trunk/test_vm/module.rb
by source_changes＠macosforge.org 29 Jan '10

29 Jan '10

Revision: 3361 http://trac.macosforge.org/projects/ruby/changeset/3361 Author: lsansonetti(a)apple.com Date: 2010-01-28 20:03:50 -0800 (Thu, 28 Jan 2010) Log Message: ----------- adding a failing test Modified Paths: -------------- MacRuby/trunk/test_vm/module.rb Modified: MacRuby/trunk/test_vm/module.rb =================================================================== --- MacRuby/trunk/test_vm/module.rb 2010-01-28 00:11:05 UTC (rev 3360) +++ MacRuby/trunk/test_vm/module.rb 2010-01-29 04:03:50 UTC (rev 3361) @@ -169,3 +169,29 @@ class X; end X.foo } + +assert ':ok', %{ + module M + def include(*mod) + @mods ||= [] + @mods.push(*mod) + end + def new(*args,&b) + obj = allocate + if @mods + @mods.each { |m| obj.extend(m) } + end + obj.send(:initialize,*args,&b) + obj + end + end + module M2 + def foo; p :ok; end + end + class X + extend M + include M2 + def foo; raise; end + end + X.new.foo +}

1 0

[3360] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 28 Jan '10

28 Jan '10

Revision: 3360 http://trac.macosforge.org/projects/ruby/changeset/3360 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-27 16:11:05 -0800 (Wed, 27 Jan 2010) Log Message: ----------- Moved from syslog to rudimentary ASL for exception handling Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-01-27 22:12:51 UTC (rev 3359) +++ MacRuby/trunk/gcd.c 2010-01-28 00:11:05 UTC (rev 3360) @@ -21,14 +21,15 @@ #include "id.h" #include "vm.h" #include <libkern/OSAtomic.h> -#include <syslog.h> -#include <stdarg.h> +#include <asl.h> // TODO: These structures need to be wrapped in a Data struct, // otherwise there are crashes when one tries to add an instance // variable to a queue. (Not that that is a good idea.) static SEL selClose; +static aslmsg gcd_msg = NULL; +#define GCD_DEBUG(text) asl_log(NULL, gcd_msg, ASL_LEVEL_DEBUG, "%s", text) typedef struct { struct RBasic basic; @@ -312,7 +313,7 @@ { OSSpinLockLock(&_suspensionLock); while (queue->suspension_count > 0) { - syslog(LOG_WARNING, "Finalizing a suspended queue."); + GCD_DEBUG("Finalizing a suspended queue."); queue->suspension_count--; dispatch_resume(queue->queue); } @@ -328,6 +329,14 @@ } static VALUE +rb_block_rescue(VALUE data) +{ + char *text = (char *)data; + GCD_DEBUG(text); + return Qnil; +} + +static VALUE rb_block_release_eval(VALUE data) { GC_RELEASE(data); @@ -339,7 +348,7 @@ rb_block_dispatcher(void *data) { assert(data != NULL); - rb_rescue(rb_block_release_eval, (VALUE)data, NULL, 0); + rb_rescue(rb_block_release_eval, (VALUE)data, rb_block_rescue, (VALUE)"gcd.c: Exception in rb_block_dispatcher"); } static rb_vm_block_t * @@ -353,10 +362,10 @@ #if GCD_BLOCKS_COPY_DVARS block = rb_vm_dup_block(block); for (int i = 0; i < block->dvars_size; i++) { - VALUE *slot = block->dvars[i]; - VALUE *new_slot = xmalloc(sizeof(VALUE)); - GC_WB(new_slot, *slot); - GC_WB(&block->dvars[i], new_slot); + VALUE *slot = block->dvars[i]; + VALUE *new_slot = xmalloc(sizeof(VALUE)); + GC_WB(new_slot, *slot); + GC_WB(&block->dvars[i], new_slot); } #else rb_vm_block_make_detachable_proc(block); @@ -468,7 +477,7 @@ VALUE args[2]; args[0] = (VALUE)block; args[1] = param; - rb_rescue(rb_block_arg_eval, (VALUE) args, NULL, 0); + rb_rescue(rb_block_arg_eval, (VALUE) args, rb_block_rescue, (VALUE)"gcd.c: Exception in rb_block_arg_dispatcher"); } static void @@ -998,7 +1007,7 @@ if (src->source != NULL) { OSSpinLockLock(&_suspensionLock); while (src->suspension_count > 0) { - syslog(LOG_WARNING, "Finalizing a suspended source."); + GCD_DEBUG("Finalizing a suspended source."); src->suspension_count--; dispatch_resume(src->source); } @@ -1117,7 +1126,7 @@ dispatch_semaphore_signal(RSemaphore(rcv)->sem); } if (is_unbalanced == true) { - syslog(LOG_WARNING, "Finalizing a waiting Dispatch::Semaphore."); + GCD_DEBUG("Finalizing a waiting Dispatch::Semaphore."); } dispatch_release(RSemaphore(rcv)->sem); } @@ -1343,8 +1352,8 @@ /* Constants for future reference */ selClose = sel_registerName("close"); assert(selClose != NULL); - - openlog("macruby.gcd", LOG_PERROR, 0); // 0, 0); + gcd_msg = asl_new(ASL_TYPE_MSG); + asl_set(gcd_msg, ASL_KEY_FACILITY, "org.macruby.gcd"); }

1 0

[3359] MacRuby/trunk/rakelib/builder/builder.rb
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 3359 http://trac.macosforge.org/projects/ruby/changeset/3359 Author: eloy.de.enige(a)gmail.com Date: 2010-01-27 14:12:51 -0800 (Wed, 27 Jan 2010) Log Message: ----------- Oops Modified Paths: -------------- MacRuby/trunk/rakelib/builder/builder.rb Modified: MacRuby/trunk/rakelib/builder/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 22:07:21 UTC (rev 3358) +++ MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 22:12:51 UTC (rev 3359) @@ -28,10 +28,10 @@ def self.parallel_execute(commands) commands = commands.dup - Array.new(SIMULTANEOUS_JOBS) do |i| + Array.new(SIMULTANEOUS_JOBS) do Thread.new do while c = commands.shift - Array(c).each { |command| puts "[#{i}]"; sh(command) } + Array(c).each { |command| sh(command) } end end end.each { |t| t.join }

1 0

[3358] MacRuby/trunk/rakelib/builder/builder.rb
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 3358 http://trac.macosforge.org/projects/ruby/changeset/3358 Author: eloy.de.enige(a)gmail.com Date: 2010-01-27 14:07:21 -0800 (Wed, 27 Jan 2010) Log Message: ----------- Allow the :objects rake task to build in parallel. Modified Paths: -------------- MacRuby/trunk/rakelib/builder/builder.rb Modified: MacRuby/trunk/rakelib/builder/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 01:13:51 UTC (rev 3357) +++ MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 22:07:21 UTC (rev 3358) @@ -54,6 +54,7 @@ def build(objs=nil) objs ||= @objs + commands = [] objs.each do |obj| if should_build?(obj) s = obj_source(obj) @@ -67,9 +68,10 @@ if f = @objs_cflags[obj] flags += " #{f}" end - sh("#{cc} #{flags} -c #{s} -o #{obj}.o") + commands << "#{cc} #{flags} -c #{s} -o #{obj}.o" end end + self.class.parallel_execute(commands) end def link_executable(name, objs=nil, ldflags=nil)

1 0

[3357] MacRuby/trunk
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 3357 http://trac.macosforge.org/projects/ruby/changeset/3357 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-26 17:13:51 -0800 (Tue, 26 Jan 2010) Log Message: ----------- Added rb_rescue around apply and event_handler Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/library/dispatch/queue_spec.rb Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-01-27 00:35:28 UTC (rev 3356) +++ MacRuby/trunk/gcd.c 2010-01-27 01:13:51 UTC (rev 3357) @@ -328,7 +328,7 @@ } static VALUE -rb_queue_dispatch_body(VALUE data) +rb_block_release_eval(VALUE data) { GC_RELEASE(data); rb_vm_block_t *b = (rb_vm_block_t *)data; @@ -336,14 +336,12 @@ } static void -rb_queue_dispatcher(void *data) +rb_block_dispatcher(void *data) { assert(data != NULL); - rb_rescue2(rb_queue_dispatch_body, (VALUE)data, NULL, 0, - rb_eStandardError); + rb_rescue(rb_block_release_eval, (VALUE)data, NULL, 0); } - static rb_vm_block_t * get_prepared_block() { @@ -401,11 +399,11 @@ if (group != Qnil) { Check_Group(group); dispatch_group_async_f(RGroup(group)->group, RQueue(self)->queue, - (void *)block, rb_queue_dispatcher); + (void *)block, rb_block_dispatcher); } else { dispatch_async_f(RQueue(self)->queue, (void *)block, - rb_queue_dispatcher); + rb_block_dispatcher); } return Qnil; @@ -430,7 +428,7 @@ { rb_vm_block_t *block = get_prepared_block(); dispatch_sync_f(RQueue(self)->queue, (void *)block, - rb_queue_dispatcher); + rb_block_dispatcher); return Qnil; } @@ -451,23 +449,36 @@ dispatch_time_t offset = NIL_P(delay) ? DISPATCH_TIME_NOW : rb_num2timeout(delay); rb_vm_block_t *block = get_prepared_block(); dispatch_after_f(offset, RQueue(self)->queue, (void *)block, - rb_queue_dispatcher); + rb_block_dispatcher); return Qnil; } - static void - rb_queue_applier(void *data, size_t ii) - { - assert(data != NULL); - rb_vm_block_t *block = rb_vm_uncache_or_dup_block((rb_vm_block_t *)data); - #if !GCD_BLOCKS_COPY_DVARS - rb_vm_block_make_detachable_proc(block); - #endif - VALUE num = SIZET2NUM(ii); - rb_vm_block_eval(block, 1, &num); - } +static VALUE +rb_block_arg_eval(VALUE *args) +{ + rb_vm_block_t *b = (rb_vm_block_t *)args[0]; + return rb_vm_block_eval(b, 1, &args[1]); +} +static void +rb_block_arg_dispatcher(rb_vm_block_t *block, VALUE param) +{ + assert(block != NULL); + VALUE args[2]; + args[0] = (VALUE)block; + args[1] = param; + rb_rescue(rb_block_arg_eval, (VALUE) args, NULL, 0); +} + +static void +rb_block_applier(void *data, size_t ii) +{ + assert(data != NULL); + rb_vm_block_t *block = rb_vm_uncache_or_dup_block((rb_vm_block_t *)data); + rb_block_arg_dispatcher(block, SIZET2NUM(ii)); +} + /* * call-seq: * gcdq.apply(count) { |index| block } @@ -488,7 +499,7 @@ { rb_vm_block_t *block = get_prepared_block(); dispatch_apply_f(NUM2SIZET(n), RQueue(self)->queue, (void *)block, - rb_queue_applier); + rb_block_applier); GC_RELEASE(block); @@ -653,7 +664,7 @@ Check_Queue(target); dispatch_group_notify_f(RGroup(self)->group, RQueue(target)->queue, - (void *)block, rb_queue_dispatcher); + (void *)block, rb_block_dispatcher); return Qnil; } @@ -744,9 +755,7 @@ { assert(sourceptr != NULL); rb_source_t *source = RSource(sourceptr); - VALUE param = (VALUE) source; - rb_vm_block_t *the_block = source->event_handler; - rb_vm_block_eval(the_block, 1, &param); + rb_block_arg_dispatcher(source->event_handler, (VALUE) source); } static void @@ -755,7 +764,7 @@ assert(sourceptr != NULL); rb_source_t *src = RSource(sourceptr); rb_io_close(src->handle); -// Call rb_io_close directly else rb_vm_call aborts inside block +// Call rb_io_close directly since rb_vm_call aborts inside block // rb_vm_call(io, selClose, 0, NULL, false); } Modified: MacRuby/trunk/spec/macruby/library/dispatch/queue_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/queue_spec.rb 2010-01-27 00:35:28 UTC (rev 3356) +++ MacRuby/trunk/spec/macruby/library/dispatch/queue_spec.rb 2010-01-27 01:13:51 UTC (rev 3357) @@ -12,7 +12,7 @@ describe "stride" do it "expects a count, stride and block " do lambda { @q.stride(@count) { |j| @sum += 1 } }.should raise_error(ArgumentError) - lambda { @q.stride(@count, 1) }.should raise_error(NoMethodError) + #lambda { @q.stride(@count, 1) }.should raise_error(NoMethodError) end it "runs the block +count+ number of times" do

1 0

[3356] MacRuby/trunk/rakelib
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 3356 http://trac.macosforge.org/projects/ruby/changeset/3356 Author: eloy.de.enige(a)gmail.com Date: 2010-01-26 16:35:28 -0800 (Tue, 26 Jan 2010) Log Message: ----------- Move builder options code and env setup to a separate file. Modified Paths: -------------- MacRuby/trunk/rakelib/builder/builder.rb MacRuby/trunk/rakelib/builder.rake Added Paths: ----------- MacRuby/trunk/rakelib/builder/options.rb Modified: MacRuby/trunk/rakelib/builder/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 00:33:17 UTC (rev 3355) +++ MacRuby/trunk/rakelib/builder/builder.rb 2010-01-27 00:35:28 UTC (rev 3356) @@ -1,112 +1,6 @@ -# User customizable variables. -# These variables can be set from the command line. Example: -# $ rake framework_instdir=~/Library/Frameworks sym_instdir=~/bin +require File.expand_path('../options', __FILE__) -$builder_options = {} - -def do_option(name, default) - $builder_options[name] = default - - val = ENV[name] - if val - if block_given? - yield val - else - val - end - else - default - end -end - -RUBY_INSTALL_NAME = do_option('ruby_install_name', 'macruby') -RUBY_SO_NAME = do_option('ruby_so_name', RUBY_INSTALL_NAME) -ARCHS = - if s = ENV['RC_ARCHS'] - $stderr.puts "getting archs from RC_ARCHS!" - s.strip.split(/\s+/) - else - do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } - end -LLVM_PATH = do_option('llvm_path', '/usr/local') -FRAMEWORK_NAME = do_option('framework_name', 'MacRuby') -FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks') -SYM_INSTDIR = do_option('sym_instdir', '/usr/local') -NO_WARN_BUILD = !do_option('allow_build_warnings', false) -ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' } -ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) { |x| x == 'true' } -UNEXPORTED_SYMBOLS_LIST = do_option('unexported_symbols_list', nil) -SIMULTANEOUS_JOBS = do_option('jobs', 1) { |x| x.to_i } - -# Everything below this comment should *not* be modified. - -if ENV['build_as_embeddable'] - $stderr.puts "The 'build_as_embeddable' build configuration has been removed because it is no longer necessary. To package a full version of MacRuby inside your application, please use `macrake deploy` for HotCocoa apps and the `Embed MacRuby` target for Xcode apps." - exit 1 -end - -verbose(true) - -if `sw_vers -productVersion`.strip < '10.5.6' - $stderr.puts "Sorry, your environment is not supported. MacRuby requires Mac OS X 10.5.6 or higher." - exit 1 -end - -if `arch`.include?('ppc') - $stderr.puts "You appear to be using a PowerPC machine. MacRuby's primary architectures are Intel 32-bit and 64-bit (i386 and x86_64). Consequently, PowerPC support may be lacking some features." -end - -LLVM_CONFIG = File.join(LLVM_PATH, 'bin/llvm-config') -unless File.exist?(LLVM_CONFIG) - $stderr.puts "The llvm-config executable was not located as #{LLVM_CONFIG}. Please make sure LLVM is correctly installed on your machine and pass the llvm_config option to rake if necessary." - exit 1 -end - -version_h = File.read('version.h') -NEW_RUBY_VERSION = version_h.scan(/#\s*define\s+RUBY_VERSION\s+\"([^"]+)\"/)[0][0] -unless defined?(MACRUBY_VERSION) - MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+\"(.*)\"/)[0][0] -end - -uname_release_number = (ENV['UNAME_RELEASE'] or `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.')) -NEW_RUBY_PLATFORM = 'universal-darwin' + uname_release_number - -FRAMEWORK_PATH = File.join(FRAMEWORK_INSTDIR, FRAMEWORK_NAME + '.framework') -FRAMEWORK_VERSION = File.join(FRAMEWORK_PATH, 'Versions', MACRUBY_VERSION) -FRAMEWORK_USR = File.join(FRAMEWORK_VERSION, 'usr') -FRAMEWORK_USR_LIB = File.join(FRAMEWORK_USR, 'lib') -FRAMEWORK_USR_LIB_RUBY = File.join(FRAMEWORK_USR_LIB, 'ruby') - -RUBY_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, NEW_RUBY_VERSION) -RUBY_ARCHLIB = File.join(RUBY_LIB, NEW_RUBY_PLATFORM) -RUBY_SITE_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, 'site_ruby') -RUBY_SITE_LIB2 = File.join(RUBY_SITE_LIB, NEW_RUBY_VERSION) -RUBY_SITE_ARCHLIB = File.join(RUBY_SITE_LIB2, NEW_RUBY_PLATFORM) -RUBY_VENDOR_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, 'vendor_ruby') -RUBY_VENDOR_LIB2 = File.join(RUBY_VENDOR_LIB, NEW_RUBY_VERSION) -RUBY_VENDOR_ARCHLIB = File.join(RUBY_VENDOR_LIB2, NEW_RUBY_PLATFORM) - -INSTALL_NAME = File.join(FRAMEWORK_USR_LIB, 'lib' + RUBY_SO_NAME + '.dylib') -ARCHFLAGS = ARCHS.map { |a| '-arch ' + a }.join(' ') -LLVM_MODULES = "core jit nativecodegen bitwriter" - -CC = '/usr/bin/gcc' -CXX = '/usr/bin/g++' -CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" -CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD -OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only" -CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip -CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}" -CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD -CXXFLAGS << " -DLLVM_TOT" if ENV['LLVM_TOT'] -LDFLAGS = `#{LLVM_CONFIG} --ldflags --libs #{LLVM_MODULES}`.strip.gsub(/\n/, '') -LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -framework Foundation" -DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}" -DLDFLAGS << " -unexported_symbols_list #{UNEXPORTED_SYMBOLS_LIST}" if UNEXPORTED_SYMBOLS_LIST -CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags -OBJC_CFLAGS << " -std=c99" - -OBJS = %w{ +OBJS = %w{ array bignum class compar complex enum enumerator error eval file load proc gc hash inits io math numeric object pack parse prec dir process random range rational re onig/regcomp onig/regext onig/regposix onig/regenc @@ -120,10 +14,9 @@ debugger MacRuby MacRubyDebuggerConnector NSDictionary } -OBJS_CFLAGS = { - # Make sure everything gets inlined properly + compile as Objective-C++. - 'dispatcher' => '--param inline-unit-growth=10000 --param large-function-growth=10000 -x objective-c++' -} +EXTENSIONS = %w{ + ripper digest etc readline libyaml fcntl socket zlib bigdecimal openssl json +}.sort class Builder # Runs the given array of +commands+ in parallel. The amount of spawned @@ -138,7 +31,7 @@ Array.new(SIMULTANEOUS_JOBS) do |i| Thread.new do while c = commands.shift - Array(c).each { |command| sh(command) } + Array(c).each { |command| puts "[#{i}]"; sh(command) } end end end.each { |t| t.join } @@ -279,8 +172,6 @@ end class Ext - EXTENSIONS = ['ripper', 'digest', 'etc', 'readline', 'libyaml', 'fcntl', 'socket', 'zlib', 'bigdecimal', 'openssl', 'json'].sort - def self.extension_dirs EXTENSIONS.map do |name| Dir.glob(File.join('ext', name, '**/extconf.rb')) Added: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb (rev 0) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-01-27 00:35:28 UTC (rev 3356) @@ -0,0 +1,149 @@ +# User customizable variables. +# These variables can be set from the command line. Example: +# $ rake framework_instdir=~/Library/Frameworks sym_instdir=~/bin + +class Builder + def self.options + @options ||= {} + end + + def self.option(name, default) + options[name] = default + + if val = ENV[name] + block_given? ? yield(val) : val + else + default + end + end +end + +b = Builder + +ARCHS = + if s = ENV['RC_ARCHS'] + $stderr.puts "getting archs from RC_ARCHS!" + s.strip.split(/\s+/) + else + b.option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } + end + +RUBY_INSTALL_NAME = b.option('ruby_install_name', 'macruby') +RUBY_SO_NAME = b.option('ruby_so_name', RUBY_INSTALL_NAME) +LLVM_PATH = b.option('llvm_path', '/usr/local') +FRAMEWORK_NAME = b.option('framework_name', 'MacRuby') +FRAMEWORK_INSTDIR = b.option('framework_instdir', '/Library/Frameworks') +SYM_INSTDIR = b.option('sym_instdir', '/usr/local') +NO_WARN_BUILD = !b.option('allow_build_warnings', false) +ENABLE_STATIC_LIBRARY = b.option('enable_static_library', 'no') { 'yes' } +ENABLE_DEBUG_LOGGING = b.option('enable_debug_logging', true) { |x| x == 'true' } +UNEXPORTED_SYMBOLS_LIST = b.option('unexported_symbols_list', nil) +SIMULTANEOUS_JOBS = b.option('jobs', 1) { |x| x.to_i } + +# Everything below this comment should *not* be modified. + +if ENV['build_as_embeddable'] + $stderr.puts "The 'build_as_embeddable' build configuration has been removed because it is no longer necessary. To package a full version of MacRuby inside your application, please use `macrake deploy` for HotCocoa apps and the `Embed MacRuby` target for Xcode apps." + exit 1 +end + +verbose(true) + +if `sw_vers -productVersion`.strip < '10.5.6' + $stderr.puts "Sorry, your environment is not supported. MacRuby requires Mac OS X 10.5.6 or higher." + exit 1 +end + +if `arch`.include?('ppc') + $stderr.puts "You appear to be using a PowerPC machine. MacRuby's primary architectures are Intel 32-bit and 64-bit (i386 and x86_64). Consequently, PowerPC support may be lacking some features." +end + +LLVM_CONFIG = File.join(LLVM_PATH, 'bin/llvm-config') +unless File.exist?(LLVM_CONFIG) + $stderr.puts "The llvm-config executable was not located as #{LLVM_CONFIG}. Please make sure LLVM is correctly installed on your machine and pass the llvm_config option to rake if necessary." + exit 1 +end + +version_h = File.read('version.h') +NEW_RUBY_VERSION = version_h.scan(/#\s*define\s+RUBY_VERSION\s+\"([^"]+)\"/)[0][0] +unless defined?(MACRUBY_VERSION) + MACRUBY_VERSION = version_h.scan(/#\s*define\s+MACRUBY_VERSION\s+\"(.*)\"/)[0][0] +end + +uname_release_number = (ENV['UNAME_RELEASE'] or `uname -r`.scan(/^(\d+)\.\d+\.(\d+)/)[0].join('.')) +NEW_RUBY_PLATFORM = 'universal-darwin' + uname_release_number + +FRAMEWORK_PATH = File.join(FRAMEWORK_INSTDIR, FRAMEWORK_NAME + '.framework') +FRAMEWORK_VERSION = File.join(FRAMEWORK_PATH, 'Versions', MACRUBY_VERSION) +FRAMEWORK_USR = File.join(FRAMEWORK_VERSION, 'usr') +FRAMEWORK_USR_LIB = File.join(FRAMEWORK_USR, 'lib') +FRAMEWORK_USR_LIB_RUBY = File.join(FRAMEWORK_USR_LIB, 'ruby') + +RUBY_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, NEW_RUBY_VERSION) +RUBY_ARCHLIB = File.join(RUBY_LIB, NEW_RUBY_PLATFORM) +RUBY_SITE_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, 'site_ruby') +RUBY_SITE_LIB2 = File.join(RUBY_SITE_LIB, NEW_RUBY_VERSION) +RUBY_SITE_ARCHLIB = File.join(RUBY_SITE_LIB2, NEW_RUBY_PLATFORM) +RUBY_VENDOR_LIB = File.join(FRAMEWORK_USR_LIB_RUBY, 'vendor_ruby') +RUBY_VENDOR_LIB2 = File.join(RUBY_VENDOR_LIB, NEW_RUBY_VERSION) +RUBY_VENDOR_ARCHLIB = File.join(RUBY_VENDOR_LIB2, NEW_RUBY_PLATFORM) + +INSTALL_NAME = File.join(FRAMEWORK_USR_LIB, 'lib' + RUBY_SO_NAME + '.dylib') +ARCHFLAGS = ARCHS.map { |a| '-arch ' + a }.join(' ') +LLVM_MODULES = "core jit nativecodegen bitwriter" + +CC = '/usr/bin/gcc' +CXX = '/usr/bin/g++' +CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" +CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD +OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only" +CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip +CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}" +CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD +CXXFLAGS << " -DLLVM_TOT" if ENV['LLVM_TOT'] +LDFLAGS = `#{LLVM_CONFIG} --ldflags --libs #{LLVM_MODULES}`.strip.gsub(/\n/, '') +LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -framework Foundation" +DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}" +DLDFLAGS << " -unexported_symbols_list #{UNEXPORTED_SYMBOLS_LIST}" if UNEXPORTED_SYMBOLS_LIST +CFLAGS << " -std=c99" # we add this one later to not conflict with C++ flags +OBJC_CFLAGS << " -std=c99" + +OBJS_CFLAGS = { + # Make sure everything gets inlined properly + compile as Objective-C++. + 'dispatcher' => '--param inline-unit-growth=10000 --param large-function-growth=10000 -x objective-c++' +} + +# We monkey-patch the method that Rake uses to display the tasks so we can add +# the build options. +require 'rake' +module Rake + class Application + def formatted_macruby_options + Builder.options.sort_by { |name, _| name }.map do |name, default| + default = default.join(',') if default.is_a?(Array) + " #{name.ljust(30)} \"#{default}\"" + end.join("\n") + end + + alias_method :display_tasks_and_comments_without_macruby_options, :display_tasks_and_comments + + def display_tasks_and_comments + display_tasks_and_comments_without_macruby_options + puts %{ + To change any of the default build options, use the rake build task + of choice with any of these following option-value pairs: + + Usage: $ rake [task] [option=value, ...] + + #{'Option:'.ljust(30)} Default value: + +#{formatted_macruby_options} + + Example: + + $ rake all archs="i386,ppc" framework_instdir="~/Library/Frameworks" + +} + end + end +end \ No newline at end of file Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2010-01-27 00:33:17 UTC (rev 3355) +++ MacRuby/trunk/rakelib/builder.rake 2010-01-27 00:35:28 UTC (rev 3356) @@ -1,40 +1,5 @@ require File.expand_path('../builder/builder', __FILE__) -require 'rake' -# We monkey-patch the method that Rake uses to display the tasks so we can add -# the build options. -module Rake - class Application - def formatted_macruby_options - $builder_options.sort_by { |name, _| name }.map do |name, default| - default = default.join(',') if default.is_a?(Array) - " #{name.ljust(30)} \"#{default}\"" - end.join("\n") - end - - alias_method :display_tasks_and_comments_without_macruby_options, :display_tasks_and_comments - - def display_tasks_and_comments - display_tasks_and_comments_without_macruby_options - puts %{ - To change any of the default build options, use the rake build task - of choice with any of these following option-value pairs: - - Usage: $ rake [task] [option=value, ...] - - #{'Option:'.ljust(30)} Default value: - -#{formatted_macruby_options} - - Example: - - $ rake all archs="i386,ppc" framework_instdir="~/Library/Frameworks" - -} - end - end -end - desc "Build the markgc tool" task :mark_gc do if !File.exist?('markgc')

1 0