December 2009 - macruby-changes - lists.macosforge.org

[3150] MacRuby/trunk/sample-macruby/Scripts
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3150 http://trac.macosforge.org/projects/ruby/changeset/3150 Author: pthomson(a)apple.com Date: 2009-12-22 15:07:23 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Moved the GCD-related samples to their own directory. Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/gcd/ MacRuby/trunk/sample-macruby/Scripts/gcd/futures.rb MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb Removed Paths: ------------- MacRuby/trunk/sample-macruby/Scripts/futures.rb MacRuby/trunk/sample-macruby/Scripts/sleeping_barber.rb Deleted: MacRuby/trunk/sample-macruby/Scripts/futures.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/futures.rb 2009-12-22 22:42:22 UTC (rev 3149) +++ MacRuby/trunk/sample-macruby/Scripts/futures.rb 2009-12-22 23:07:23 UTC (rev 3150) @@ -1,34 +0,0 @@ -#!/usr/local/bin/macruby - -# An implementation of futures (delayed computations) on top of GCD. -# Original implementation written by Patrick Thomson. -# Improvements made by Ben Stiglitz. - -include Dispatch - -class Future - def initialize(&block) - # Each thread gets its own FIFO queue upon which we will dispatch - # the delayed computation passed in the &block variable. - Thread.current[:futures] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") - # Groups are just simple layers on top of semaphores. - @group = Group.new - # Asynchronously dispatch the future to the thread-local queue. - Thread.current[:futures].async(@group) { @value = block[] } - end - - def value - # Wait fo the computation to finish. If it has already finished, then - # just return the value in question. - @group.wait - @value - end -end - - -f = Future.new do - sleep 2.5 - 'some value' -end - -p f.value \ No newline at end of file Copied: MacRuby/trunk/sample-macruby/Scripts/gcd/futures.rb (from rev 3149, MacRuby/trunk/sample-macruby/Scripts/futures.rb) =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/futures.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/futures.rb 2009-12-22 23:07:23 UTC (rev 3150) @@ -0,0 +1,34 @@ +#!/usr/local/bin/macruby + +# An implementation of futures (delayed computations) on top of GCD. +# Original implementation written by Patrick Thomson. +# Improvements made by Ben Stiglitz. + +include Dispatch + +class Future + def initialize(&block) + # Each thread gets its own FIFO queue upon which we will dispatch + # the delayed computation passed in the &block variable. + Thread.current[:futures] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") + # Groups are just simple layers on top of semaphores. + @group = Group.new + # Asynchronously dispatch the future to the thread-local queue. + Thread.current[:futures].async(@group) { @value = block[] } + end + + def value + # Wait fo the computation to finish. If it has already finished, then + # just return the value in question. + @group.wait + @value + end +end + + +f = Future.new do + sleep 2.5 + 'some value' +end + +p f.value \ No newline at end of file Copied: MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb (from rev 3149, MacRuby/trunk/sample-macruby/Scripts/sleeping_barber.rb) =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/sleeping_barber.rb 2009-12-22 23:07:23 UTC (rev 3150) @@ -0,0 +1,19 @@ +# A GCD-based implementation of the sleeping barber problem: +# http://en.wikipedia.org/wiki/Sleeping_barber_problem +# http://www.madebysofa.com/#blog/the_sleeping_barber + +waiting_chairs = Dispatch::Queue.new('com.apple.waiting_chairs') +semaphore = Dispatch::Semaphore.new(3) +index = -1 +while true + index += 1 + success = semaphore.wait(Dispatch::TIME_NOW) + if success != 0 + puts "Customer turned away #{index}" + next + end + waiting_chairs.dispatch do + semaphore.signal + puts "Shave and a haircut #{index}" + end +end Deleted: MacRuby/trunk/sample-macruby/Scripts/sleeping_barber.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/sleeping_barber.rb 2009-12-22 22:42:22 UTC (rev 3149) +++ MacRuby/trunk/sample-macruby/Scripts/sleeping_barber.rb 2009-12-22 23:07:23 UTC (rev 3150) @@ -1,19 +0,0 @@ -# A GCD-based implementation of the sleeping barber problem: -# http://en.wikipedia.org/wiki/Sleeping_barber_problem -# http://www.madebysofa.com/#blog/the_sleeping_barber - -waiting_chairs = Dispatch::Queue.new('com.apple.waiting_chairs') -semaphore = Dispatch::Semaphore.new(3) -index = -1 -while true - index += 1 - success = semaphore.wait(Dispatch::TIME_NOW) - if success != 0 - puts "Customer turned away #{index}" - next - end - waiting_chairs.dispatch do - semaphore.signal - puts "Shave and a haircut #{index}" - end -end

1 0

[3149] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3149 http://trac.macosforge.org/projects/ruby/changeset/3149 Author: martinlagardette(a)apple.com Date: 2009-12-22 14:42:22 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Fixes Bug #415 Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-22 19:51:05 UTC (rev 3148) +++ MacRuby/trunk/vm.cpp 2009-12-22 22:42:22 UTC (rev 3149) @@ -735,11 +735,17 @@ return get_sizeof(RoxorCompiler::shared->convert_type(type)); } +#ifdef __LP64__ +# define LARGE_STRUCT_SIZE 128 +#else +# define LARGE_STRUCT_SIZE 64 +#endif /* !__LP64__ */ + bool RoxorCore::is_large_struct_type(const Type *type) { return type->getTypeID() == Type::StructTyID - && ee->getTargetData()->getTypeSizeInBits(type) > 128; + && ee->getTargetData()->getTypeSizeInBits(type) > LARGE_STRUCT_SIZE; } inline GlobalVariable *

1 0

[3148] MacRuby/trunk/futures.rb
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3148 http://trac.macosforge.org/projects/ruby/changeset/3148 Author: pthomson(a)apple.com Date: 2009-12-22 11:51:05 -0800 (Tue, 22 Dec 2009) Log Message: ----------- HEY GUYS HAVE YOU HEARD OF THIS SVN THING IT'S REALLY HARD Removed Paths: ------------- MacRuby/trunk/futures.rb Deleted: MacRuby/trunk/futures.rb =================================================================== --- MacRuby/trunk/futures.rb 2009-12-22 19:43:23 UTC (rev 3147) +++ MacRuby/trunk/futures.rb 2009-12-22 19:51:05 UTC (rev 3148) @@ -1,34 +0,0 @@ -#!/usr/local/bin/macruby - -# An implementation of futures (delayed computations) on top of GCD. -# Original implementation written by Patrick Thomson. -# Improvements made by Ben Stiglitz. - -include Dispatch - -class Future - def initialize(&block) - # Each thread gets its own FIFO queue upon which we will dispatch - # the delayed computation passed in the &block variable. - Thread.current[:futures] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") - # Groups are just simple layers on top of semaphores. - @group = Group.new - # Asynchronously dispatch the future to the thread-local queue. - Thread.current[:futures].async(@group) { @value = block[] } - end - - def value - # Wait fo the computation to finish. If it has already finished, then - # just return the value in question. - @group.wait - @value - end -end - - -f = Future.new do - sleep 2.5 - 'some value' -end - -p f.value \ No newline at end of file

1 0

[3147] MacRuby/trunk/sample-macruby/Scripts/futures.rb
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3147 http://trac.macosforge.org/projects/ruby/changeset/3147 Author: pthomson(a)apple.com Date: 2009-12-22 11:43:23 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Added comments and removed an unneessary variable. Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/futures.rb Modified: MacRuby/trunk/sample-macruby/Scripts/futures.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/futures.rb 2009-12-22 19:43:19 UTC (rev 3146) +++ MacRuby/trunk/sample-macruby/Scripts/futures.rb 2009-12-22 19:43:23 UTC (rev 3147) @@ -1,19 +1,31 @@ +#!/usr/local/bin/macruby + +# An implementation of futures (delayed computations) on top of GCD. +# Original implementation written by Patrick Thomson. +# Improvements made by Ben Stiglitz. + include Dispatch - + class Future def initialize(&block) - @@queue_count ||= 0 - Thread.current[:futures_queue] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") + # Each thread gets its own FIFO queue upon which we will dispatch + # the delayed computation passed in the &block variable. + Thread.current[:futures] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") + # Groups are just simple layers on top of semaphores. @group = Group.new - Thread.current[:futures_queue].async(@group) { @value = block[] } + # Asynchronously dispatch the future to the thread-local queue. + Thread.current[:futures].async(@group) { @value = block[] } end def value + # Wait fo the computation to finish. If it has already finished, then + # just return the value in question. @group.wait @value end end - + + f = Future.new do sleep 2.5 'some value'

1 0

[3146] MacRuby/trunk/futures.rb
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3146 http://trac.macosforge.org/projects/ruby/changeset/3146 Author: pthomson(a)apple.com Date: 2009-12-22 11:43:19 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Added comments and removed an unneessary variable. Added Paths: ----------- MacRuby/trunk/futures.rb Added: MacRuby/trunk/futures.rb =================================================================== --- MacRuby/trunk/futures.rb (rev 0) +++ MacRuby/trunk/futures.rb 2009-12-22 19:43:19 UTC (rev 3146) @@ -0,0 +1,34 @@ +#!/usr/local/bin/macruby + +# An implementation of futures (delayed computations) on top of GCD. +# Original implementation written by Patrick Thomson. +# Improvements made by Ben Stiglitz. + +include Dispatch + +class Future + def initialize(&block) + # Each thread gets its own FIFO queue upon which we will dispatch + # the delayed computation passed in the &block variable. + Thread.current[:futures] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") + # Groups are just simple layers on top of semaphores. + @group = Group.new + # Asynchronously dispatch the future to the thread-local queue. + Thread.current[:futures].async(@group) { @value = block[] } + end + + def value + # Wait fo the computation to finish. If it has already finished, then + # just return the value in question. + @group.wait + @value + end +end + + +f = Future.new do + sleep 2.5 + 'some value' +end + +p f.value \ No newline at end of file

1 0

[3145] MacRuby/trunk
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3145 http://trac.macosforge.org/projects/ruby/changeset/3145 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-22 10:08:11 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Remove old Dispatch::Source code, pass preliminary spec for custom sources Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-22 16:39:08 UTC (rev 3144) +++ MacRuby/trunk/gcd.c 2009-12-22 18:08:11 UTC (rev 3145) @@ -729,107 +729,6 @@ return self; } - -/* - * call-seq: - * Dispatch::Source.for_reading(queue, io, &block) => Dispatch::Source - * - * Returns a Source that monitors the passed IO object for pending data. - * When provided with a valid on_event handler, the source will call the - * handler on the provided queue whenever it sees that data becomes available from the source's - * underlying file descriptor. If the on_event handler takes a parameter, - * that parameter will be an integer corresponding to an estimated number of - * bytes available to be read. See the dispatch_source_create(3) manpage for details. - * All Sources start out suspended; in order to activate them, call <code>resume!</code>. - * If for_reading is given a block, the block shall be registered as the - * source's event handler. - * - * - * file = File.new('testfile') - * queue = Queue.new('org.macruby.documentation') - * reader = Source.for_reading(queue, file) do { |x| puts "#{x} bytes available"} - * - */ - -#if 0 // TODO: Decide if we want to include these - -static VALUE -rb_source_new_for_reading(VALUE klass, SEL sel, VALUE queue, VALUE io) -{ - VALUE src = rb_source_alloc(klass, sel); - io = rb_check_convert_type(io, T_FILE, "IO", "to_io"); - Check_Queue(queue); - RSource(src)->source = dispatch_source_create(DISPATCH_SOURCE_TYPE_READ, - ExtractIOStruct(io)->fd, 0, RQueue(queue)->queue); - RSource(src)->type = DISPATCH_SOURCE_TYPE_READ; - - if (rb_block_given_p()) { - rb_source_on_event(src, 0); - } - - return src; -} - -static VALUE -rb_source_new_for_writing(VALUE klass, SEL sel, VALUE queue, VALUE io) -{ - VALUE src = rb_source_alloc(klass, sel); - io = rb_check_convert_type(io, T_FILE, "IO", "to_io"); - Check_Queue(queue); - RSource(src)->source = dispatch_source_create(DISPATCH_SOURCE_TYPE_WRITE, - ExtractIOStruct(io)->fd, 0, RQueue(queue)->queue); - RSource(src)->type = DISPATCH_SOURCE_TYPE_WRITE; - - if (rb_block_given_p()) { - rb_source_on_event(src, 0); - } - - return src; -} - -static VALUE -rb_source_new_timer(VALUE klass, SEL sel, int argc, VALUE* argv) -{ - dispatch_time_t start_time; - VALUE queue = Qnil, interval = Qnil, delay = Qnil, leeway = Qnil; - rb_scan_args(argc, argv, "31", &queue, &delay, &interval, &leeway); - Check_Queue(queue); - if (NIL_P(leeway)) { - leeway = INT2FIX(0); - } - if (NIL_P(delay)) { - start_time = DISPATCH_TIME_NOW; - } - else { - start_time = rb_num2timeout(delay); - } - const uint64_t dispatch_interval = rb_num2nsec(interval); - const uint64_t dispatch_leeway = rb_num2nsec(leeway); - - VALUE src = rb_source_alloc(klass, sel); - RSource(src)->source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, - 0, 0, RQueue(queue)->queue); - RSource(src)->type = DISPATCH_SOURCE_TYPE_TIMER; - dispatch_source_set_timer(RSource(src)->source, start_time, - dispatch_interval, dispatch_leeway); - - if (rb_block_given_p()) { - rb_source_on_event(src, 0); - } - - return src; -} - -static inline bool -source_type_takes_parameters(dispatch_source_type_t t) -{ - return ((t == DISPATCH_SOURCE_TYPE_READ) || - (t == DISPATCH_SOURCE_TYPE_SIGNAL) || - (t == DISPATCH_SOURCE_TYPE_TIMER) || - (t == DISPATCH_SOURCE_TYPE_PROC)); -} -#endif - static void rb_source_event_handler(void* sourceptr) { @@ -1032,17 +931,6 @@ rb_define_const(cSource, "WRITE", INT2NUM(SOURCE_TYPE_WRITE)); rb_objc_define_method(*(VALUE *)cSource, "alloc", rb_source_alloc, 0); rb_objc_define_method(cSource, "initialize", rb_source_init, 4); - #if 0 // TODO: Decide if we want to include these - // rb_undef_method(*(VALUE *)cSource, "new"); - rb_objc_define_method(*(VALUE *)cSource, "for_reading", rb_source_new_for_reading, 2); - rb_objc_define_method(*(VALUE *)cSource, "for_writing", rb_source_new_for_writing, 2); - //rb_objc_define_method(*(VALUE *)cSource, "for_process", rb_source_new_for_process, 2); - //rb_objc_define_method(*(VALUE *)cSource, "for_vnode", rb_source_new_for_vnode, 2) - //rb_objc_define_method(*(VALUE *)cSource, "custom", rb_source_new_custom, 2); - //rb_objc_define_method(*(VALUE *)cSource, "for_mach", rb_source_new_for_mach, 3); - //rb_objc_define_method(*(VALUE *)cSource, "for_signal", rb_source_new_for_signal, 2), - rb_objc_define_method(*(VALUE *)cSource, "timer", rb_source_new_timer, -1); - #endif rb_objc_define_method(cSource, "on_event", rb_source_on_event, 0); rb_objc_define_method(cSource, "on_cancel", rb_source_on_cancellation, 0); rb_objc_define_method(cSource, "cancelled?", rb_source_cancelled_p, 0); Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 16:39:08 UTC (rev 3144) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 18:08:11 UTC (rev 3145) @@ -30,13 +30,23 @@ Dispatch::Source.const_defined?(:MACH_RECV).should == false end end - - describe "event handler" do + + describe "new" do before :each do @q = Dispatch::Queue.concurrent - @src = Dispatch::Source.new() #@type, @handle, mask, @q end + it "creates a custom Source" do + Dispatch::Source.new(Dispatch::Source::DATA_ADD, 0, 0, @q).should + be_kind_of(Dispatch::Source) + Dispatch::Source.new(Dispatch::Source::DATA_OR, 0, 0, @q).should + be_kind_of(Dispatch::Source) + end + + end + + describe "event handler" do + it "can be set" do true.should == false end

1 0

[3144] MacRuby/trunk/sample-macruby/Scripts/futures.rb
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3144 http://trac.macosforge.org/projects/ruby/changeset/3144 Author: pthomson(a)apple.com Date: 2009-12-22 08:39:08 -0800 (Tue, 22 Dec 2009) Log Message: ----------- Added an implementation of futures (also called promises or delayed computations) on top of GCD. Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/futures.rb Added: MacRuby/trunk/sample-macruby/Scripts/futures.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/futures.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/futures.rb 2009-12-22 16:39:08 UTC (rev 3144) @@ -0,0 +1,22 @@ +include Dispatch + +class Future + def initialize(&block) + @@queue_count ||= 0 + Thread.current[:futures_queue] ||= Queue.new("org.macruby.futures-#{Thread.current.object_id}") + @group = Group.new + Thread.current[:futures_queue].async(@group) { @value = block[] } + end + + def value + @group.wait + @value + end +end + +f = Future.new do + sleep 2.5 + 'some value' +end + +p f.value \ No newline at end of file

1 0

[3143] MacRuby/trunk
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3143 http://trac.macosforge.org/projects/ruby/changeset/3143 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-21 16:40:50 -0800 (Mon, 21 Dec 2009) Log Message: ----------- Pass Dispatch::Source constant specs Modified Paths: -------------- MacRuby/trunk/gcd.c MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2009-12-22 00:20:04 UTC (rev 3142) +++ MacRuby/trunk/gcd.c 2009-12-22 00:40:50 UTC (rev 3143) @@ -660,6 +660,44 @@ == 0 ? Qtrue : Qfalse; } + +enum SOURCE_TYPE_ENUM +{ + SOURCE_TYPE_DATA_ADD, + SOURCE_TYPE_DATA_OR, + SOURCE_TYPE_MACH_SEND, + SOURCE_TYPE_MACH_RECV, + SOURCE_TYPE_PROC, + SOURCE_TYPE_READ, + SOURCE_TYPE_SIGNAL, + SOURCE_TYPE_TIMER, + SOURCE_TYPE_VNODE, + SOURCE_TYPE_WRITE +}; + +static inline dispatch_source_type_t +rb_num2source_type(VALUE num) +{ + enum SOURCE_TYPE_ENUM value = NUM2LONG(num); + switch (value) + { + case SOURCE_TYPE_DATA_ADD: return DISPATCH_SOURCE_TYPE_DATA_ADD; + case SOURCE_TYPE_DATA_OR: return DISPATCH_SOURCE_TYPE_DATA_OR; + case SOURCE_TYPE_MACH_SEND: return DISPATCH_SOURCE_TYPE_MACH_SEND; + case SOURCE_TYPE_MACH_RECV: return DISPATCH_SOURCE_TYPE_MACH_RECV; + case SOURCE_TYPE_PROC: return DISPATCH_SOURCE_TYPE_PROC; + case SOURCE_TYPE_READ: return DISPATCH_SOURCE_TYPE_READ; + case SOURCE_TYPE_SIGNAL: return DISPATCH_SOURCE_TYPE_SIGNAL; + case SOURCE_TYPE_TIMER: return DISPATCH_SOURCE_TYPE_TIMER; + case SOURCE_TYPE_VNODE: return DISPATCH_SOURCE_TYPE_VNODE; + case SOURCE_TYPE_WRITE: return DISPATCH_SOURCE_TYPE_WRITE; + default: rb_raise(rb_eArgError, + "Unknown dispatch source type [%d]", value); + } + return NULL; +} + + static VALUE rb_source_on_event(VALUE self, SEL sel); static void rb_source_event_handler(void* sourceptr); @@ -672,6 +710,26 @@ return (VALUE)source; } + +static VALUE +rb_source_init(VALUE self, SEL sel, + VALUE type, VALUE handle, VALUE mask, VALUE queue) +{ + rb_source_t *src = RSource(self); + Check_Queue(queue); + + src->type = rb_num2source_type(type); + src->source = dispatch_source_create(src->type, + NUM2UINT(handle), NUM2LONG(mask), RQueue(queue)->queue); + + if (rb_block_given_p()) { + rb_source_on_event(self, 0); + } + + return self; +} + + /* * call-seq: * Dispatch::Source.for_reading(queue, io, &block) => Dispatch::Source @@ -693,6 +751,8 @@ * */ +#if 0 // TODO: Decide if we want to include these + static VALUE rb_source_new_for_reading(VALUE klass, SEL sel, VALUE queue, VALUE io) { @@ -768,21 +828,16 @@ (t == DISPATCH_SOURCE_TYPE_TIMER) || (t == DISPATCH_SOURCE_TYPE_PROC)); } +#endif static void rb_source_event_handler(void* sourceptr) { assert(sourceptr != NULL); rb_source_t *source = RSource(sourceptr); + VALUE param = (VALUE) source; rb_vm_block_t *the_block = source->event_handler; - if (source_type_takes_parameters(source->type) - && the_block->arity.min == 1) { - VALUE data = UINT2NUM(dispatch_source_get_data(source->source)); - rb_vm_block_eval(the_block, 1, &data); - } - else { - rb_vm_block_eval(the_block, 0, NULL); - } + rb_vm_block_eval(the_block, 1, &param); } static VALUE @@ -965,20 +1020,29 @@ rb_objc_define_method(cGroup, "notify", rb_group_notify, 1); rb_objc_define_method(cGroup, "on_completion", rb_group_notify, 1); rb_objc_define_method(cGroup, "wait", rb_group_wait, -1); - + cSource = rb_define_class_under(mDispatch, "Source", rb_cObject); + rb_define_const(cSource, "DATA_ADD", INT2NUM(SOURCE_TYPE_DATA_ADD)); + rb_define_const(cSource, "DATA_OR", INT2NUM(SOURCE_TYPE_DATA_OR)); + rb_define_const(cSource, "PROC", INT2NUM(SOURCE_TYPE_PROC)); + rb_define_const(cSource, "READ", INT2NUM(SOURCE_TYPE_READ)); + rb_define_const(cSource, "SIGNAL", INT2NUM(SOURCE_TYPE_SIGNAL)); + rb_define_const(cSource, "TIMER", INT2NUM(SOURCE_TYPE_TIMER)); + rb_define_const(cSource, "VNODE", INT2NUM(SOURCE_TYPE_VNODE)); + rb_define_const(cSource, "WRITE", INT2NUM(SOURCE_TYPE_WRITE)); rb_objc_define_method(*(VALUE *)cSource, "alloc", rb_source_alloc, 0); - rb_undef_method(*(VALUE *)cSource, "new"); + rb_objc_define_method(cSource, "initialize", rb_source_init, 4); + #if 0 // TODO: Decide if we want to include these + // rb_undef_method(*(VALUE *)cSource, "new"); rb_objc_define_method(*(VALUE *)cSource, "for_reading", rb_source_new_for_reading, 2); rb_objc_define_method(*(VALUE *)cSource, "for_writing", rb_source_new_for_writing, 2); - #if 0 // TODO: Decide if we want to include these //rb_objc_define_method(*(VALUE *)cSource, "for_process", rb_source_new_for_process, 2); //rb_objc_define_method(*(VALUE *)cSource, "for_vnode", rb_source_new_for_vnode, 2) //rb_objc_define_method(*(VALUE *)cSource, "custom", rb_source_new_custom, 2); //rb_objc_define_method(*(VALUE *)cSource, "for_mach", rb_source_new_for_mach, 3); //rb_objc_define_method(*(VALUE *)cSource, "for_signal", rb_source_new_for_signal, 2), + rb_objc_define_method(*(VALUE *)cSource, "timer", rb_source_new_timer, -1); #endif - rb_objc_define_method(*(VALUE *)cSource, "timer", rb_source_new_timer, -1); rb_objc_define_method(cSource, "on_event", rb_source_on_event, 0); rb_objc_define_method(cSource, "on_cancel", rb_source_on_cancellation, 0); rb_objc_define_method(cSource, "cancelled?", rb_source_cancelled_p, 0); Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 00:20:04 UTC (rev 3142) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 00:40:50 UTC (rev 3143) @@ -22,7 +22,7 @@ end it "for timer source" do - Dispatch::Source.const_defined?(:TIME).should == true + Dispatch::Source.const_defined?(:TIMER).should == true end it "NOT for mach sources" do Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-22 00:20:04 UTC (rev 3142) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-22 00:40:50 UTC (rev 3143) @@ -1,7 +1,3 @@ -fails:Dispatch::Source constants for custom sources -fails:Dispatch::Source constants for process sources -fails:Dispatch::Source constants for file sources -fails:Dispatch::Source constants for timer source fails:Dispatch::Source event handler can be set fails:Dispatch::Source event handler will be invoked fails:Dispatch::Source event handler receives the source

1 0

[3142] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 22 Dec '09

22 Dec '09

Revision: 3142 http://trac.macosforge.org/projects/ruby/changeset/3142 Author: ernest.prabhakar(a)gmail.com Date: 2009-12-21 16:20:04 -0800 (Mon, 21 Dec 2009) Log Message: ----------- Checkin skeleton of Dispatch::Source specs Modified Paths: -------------- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt Added Paths: ----------- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb Added: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2009-12-22 00:20:04 UTC (rev 3142) @@ -0,0 +1,88 @@ +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + + describe "Dispatch::Source" do + + describe "constants" do + it "for custom sources" do + Dispatch::Source.const_defined?(:DATA_ADD).should == true + Dispatch::Source.const_defined?(:DATA_OR).should == true + end + + it "for process sources" do + Dispatch::Source.const_defined?(:PROC).should == true + Dispatch::Source.const_defined?(:SIGNAL).should == true + end + + it "for file sources" do + Dispatch::Source.const_defined?(:READ).should == true + Dispatch::Source.const_defined?(:VNODE).should == true + Dispatch::Source.const_defined?(:WRITE).should == true + end + + it "for timer source" do + Dispatch::Source.const_defined?(:TIME).should == true + end + + it "NOT for mach sources" do + Dispatch::Source.const_defined?(:MACH_SEND).should == false + Dispatch::Source.const_defined?(:MACH_RECV).should == false + end + end + + describe "event handler" do + before :each do + @q = Dispatch::Queue.concurrent + @src = Dispatch::Source.new() #@type, @handle, mask, @q + end + + it "can be set" do + true.should == false + end + + it "will be invoked" do + true.should == false + end + + it "receives the source" do + true.should == false + end + + it "can get data" do + true.should == false + end + + it "will get merged data" do + true.should == false + end + + it "can get handle" do + true.should == false + end + + it "can get mask" do + true.should == false + end + + end + + describe "cancel handler" do + before :each do + @q = Dispatch::Queue.concurrent + @src = Dispatch::Source.new() #@type, @handle, mask, @q + end + + it "can be set" do + true.should == false + end + + it "will be invoked" do + true.should == false + end + end + + + end + +end Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-21 20:37:44 UTC (rev 3141) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2009-12-22 00:20:04 UTC (rev 3142) @@ -0,0 +1,13 @@ +fails:Dispatch::Source constants for custom sources +fails:Dispatch::Source constants for process sources +fails:Dispatch::Source constants for file sources +fails:Dispatch::Source constants for timer source +fails:Dispatch::Source event handler can be set +fails:Dispatch::Source event handler will be invoked +fails:Dispatch::Source event handler receives the source +fails:Dispatch::Source event handler can get data +fails:Dispatch::Source event handler will get merged data +fails:Dispatch::Source event handler can get handle +fails:Dispatch::Source event handler can get mask +fails:Dispatch::Source cancel handler can be set +fails:Dispatch::Source cancel handler will be invoked

1 0

[3141] MacRuby/trunk
by source_changes＠macosforge.org 21 Dec '09

21 Dec '09

Revision: 3141 http://trac.macosforge.org/projects/ruby/changeset/3141 Author: joshua.ballanco(a)apple.com Date: 2009-12-21 12:37:44 -0800 (Mon, 21 Dec 2009) Log Message: ----------- Reverting last change for further investigation Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/array_spec.rb MacRuby/trunk/spec/macruby/core/hash_spec.rb MacRuby/trunk/spec/macruby/core/string_spec.rb MacRuby/trunk/spec/macruby/language/objc_method_spec.rb MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/spec/macruby/core/array_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/array_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/spec/macruby/core/array_spec.rb 2009-12-21 20:37:44 UTC (rev 3141) @@ -79,49 +79,3 @@ end =end end - -describe "Objective-C Array methods" do - before :each do - @a = [1,2,3,4] - end - - it "should be able to be aliased to other selectors" do - class << @a - alias :foo :count - end - - @a.foo.should == @a.count - end - - it "should be able to be aliased by pure Ruby methods" do - class << @a - def foo - return 42 - end - alias :count :foo - end - - @a.count.should == 42 - end - - it "should be commutative when aliased" do - class << @a - def foo - return 42 - end - def do_alias - alias :old_count :count - alias :count :foo - end - def undo_alias - alias :count :old_count - end - end - - @a.count.should == 4 - @a.do_alias - @a.count.should == 42 - @a.undo_alias - @a.count.should == 4 - end -end Modified: MacRuby/trunk/spec/macruby/core/hash_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/hash_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/spec/macruby/core/hash_spec.rb 2009-12-21 20:37:44 UTC (rev 3141) @@ -77,49 +77,3 @@ lambda { a[42] = 123 }.should raise_error(RuntimeError) end end - -describe "Objective-C Hash methods" do - before :each do - @a = {:a => 1, :b => 2, :c => 3} - end - - it "should be able to be aliased to other selectors" do - class << @a - alias :foo :count - end - - @a.foo.should == @a.count - end - - it "should be able to be aliased by pure Ruby methods" do - class << @a - def foo - return 42 - end - alias :count :foo - end - - @a.count.should == 42 - end - - it "should be commutative when aliased" do - class << @a - def foo - return 42 - end - def do_alias - alias :old_count :count - alias :count :foo - end - def undo_alias - alias :count :old_count - end - end - - @a.count.should == 4 - @a.do_alias - @a.count.should == 42 - @a.undo_alias - @a.count.should == 4 - end -end Modified: MacRuby/trunk/spec/macruby/core/string_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/spec/macruby/core/string_spec.rb 2009-12-21 20:37:44 UTC (rev 3141) @@ -81,49 +81,3 @@ #lambda { a << 'foo' }.should raise_error(RuntimeError) end end - -describe "Objective-C String methods" do - before :each do - @a = "test" - end - - it "should be able to be aliased to other selectors" do - class << @a - alias :foo :length - end - - @a.foo.should == @a.length - end - - it "should be able to be aliased by pure Ruby methods" do - class << @a - def foo - return 42 - end - alias :length :foo - end - - @a.length.should == 42 - end - - it "should be commutative when aliased" do - class << @a - def foo - return 42 - end - def do_alias - alias :old_length :length - alias :length :foo - end - def undo_alias - alias :length :old_length - end - end - - @a.length.should == 4 - @a.do_alias - @a.length.should == 42 - @a.undo_alias - @a.length.should == 4 - end -end Modified: MacRuby/trunk/spec/macruby/language/objc_method_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2009-12-21 20:37:44 UTC (rev 3141) @@ -408,49 +408,6 @@ end @o.methodAcceptingSEL('foo:arg1:arg2:', target:o) end - - it "can have another method aliased to it" do - class << @o - alias :test_method :methodReturningSelf - end - - @o.should.respond_to(:test_method) - @o.test_method.should == @o - @o.test_method.object_id.should == @o.object_id - end - - it "can be aliased to a pure Ruby method" do - class << @o - def foo - return 42 - end - alias :methodReturningSelf :foo - end - - @o.should.respond_to(:methodReturningSelf) - @o.methodReturningSelf.should == 42 - end - - it "should be commutative when aliased" do - class << @o - def foo - return 42 - end - def do_alias - alias :old_methodReturningSelf :methodReturningSelf - alias :methodReturningSelf :foo - end - def undo_alias - alias :methodReturningSelf :old_methodReturningSelf - end - end - - @o.methodReturningSelf.should == @o - @o.do_alias - @o.methodReturningSelf.should == 42 - @o.undo_alias - @o.methodReturningSelf.should == @o - end end describe "A pure MacRuby method" do Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/vm.cpp 2009-12-21 20:37:44 UTC (rev 3141) @@ -1464,6 +1464,11 @@ const char *types = method_getTypeEncoding(method); rb_vm_method_node_t *node = GET_CORE()->method_node_get(method); + if (node == NULL) { + rb_raise(rb_eArgError, + "only pure Ruby methods can be aliased (`%s' is not)", + sel_getName(method_getName(method))); + } const char *name_str = rb_id2name(name); SEL sel; @@ -1476,27 +1481,8 @@ sel = sel_registerName(tmp); } - if (node == NULL) { - Method method_to_replace = class_getInstanceMethod(klass, sel); - rb_vm_method_node_t *node_to_replace = GET_CORE()->method_node_get(method_to_replace); - if ((klass == (Class)rb_cCFString || klass == (Class)rb_cCFHash) - && node_to_replace != NULL) { - //Doesn't work: - //GET_CORE()->remove_method(klass, sel); - // - //This, apparently, doesn't work either... - //GET_CORE()->add_method(klass, sel, imp, imp, - // arity, 0, types); - // - //This...sorta...works... - GET_CORE()->nuke_method(method_to_replace); - } - class_replaceMethod(klass, sel, imp, types); - } - else { - GET_CORE()->add_method(klass, sel, imp, node->ruby_imp, - node->arity, node->flags, types); - } + GET_CORE()->add_method(klass, sel, imp, node->ruby_imp, + node->arity, node->flags, types); } extern "C" @@ -1517,15 +1503,6 @@ const char *def_str = rb_id2name(def); SEL sel = sel_registerName(def_str); - - // String and Hash aliases should be defined on the Core Foundation classes - if (klass == (Class)rb_cNSMutableString) { - klass = (Class)rb_cCFString; - } - if (klass == (Class)rb_cNSMutableHash) { - klass = (Class)rb_cCFHash; - } - Method def_method1 = class_getInstanceMethod(klass, sel); Method def_method2 = NULL; if (def_str[strlen(def_str) - 1] != ':') { @@ -2558,16 +2535,6 @@ } } -void -RoxorCore::nuke_method(Method m) -{ - invalidate_method_cache(method_getName(m)); - std::map<Method, rb_vm_method_node_t *>::iterator iter = ruby_methods.find(m); - assert(iter != ruby_methods.end()); - free(iter->second); - ruby_methods.erase(iter); -} - extern "C" void rb_vm_undef_method(Class klass, ID name, bool must_exist) Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-12-21 12:34:46 UTC (rev 3140) +++ MacRuby/trunk/vm.h 2009-12-21 20:37:44 UTC (rev 3141) @@ -757,7 +757,6 @@ rb_vm_method_node_t *node, const char *types); void undef_method(Class klass, SEL sel); void remove_method(Class klass, SEL sel); - void nuke_method(Method m); bool resolve_methods(std::map<Class, rb_vm_method_source_t *> *map, Class klass, SEL sel); bool copy_method(Class klass, Method m);

1 0