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

[4366] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 15 Jul '10

15 Jul '10

Revision: 4366 http://trac.macosforge.org/projects/ruby/changeset/4366 Author: lsansonetti(a)apple.com Date: 2010-07-15 14:48:25 -0700 (Thu, 15 Jul 2010) Log Message: ----------- really revert r4364 Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/4364 Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-07-15 21:42:21 UTC (rev 4365) +++ MacRuby/trunk/gcd.c 2010-07-15 21:48:25 UTC (rev 4366) @@ -112,15 +112,23 @@ static VALUE cSemaphore; static inline void -Check_Class(VALUE object, VALUE wants_klass) +Check_Queue(VALUE object) { - VALUE has_klass = CLASS_OF(object); - if (has_klass != wants_klass) { - rb_raise(rb_eArgError, "expected class to be %s, but got %s", - rb_class2name(wants_klass), rb_class2name(has_klass)); + if (CLASS_OF(object) != cQueue) { + rb_raise(rb_eArgError, "expected Queue object, but got %s", + rb_class2name(CLASS_OF(object))); } } +static inline void +Check_Group(VALUE object) +{ + if (CLASS_OF(object) != cGroup) { + rb_raise(rb_eArgError, "expected Group object, but got %s", + rb_class2name(CLASS_OF(object))); + } +} + static VALUE rb_raise_init(VALUE self, SEL sel) { @@ -409,7 +417,7 @@ rb_scan_args(argc, argv, "01", &group); if (group != Qnil) { - Check_Class(group, cGroup); + Check_Group(group); dispatch_group_async_f(RGroup(group)->group, RQueue(self)->queue, (void *)block, rb_block_dispatcher); } @@ -673,7 +681,7 @@ rb_group_notify(VALUE self, SEL sel, VALUE target) { rb_vm_block_t *block = get_prepared_block(); - Check_Class(target, cQueue); + Check_Queue(target); dispatch_group_notify_f(RGroup(self)->group, RQueue(target)->queue, (void *)block, rb_block_dispatcher); @@ -806,7 +814,7 @@ rb_source_init(VALUE self, SEL sel, VALUE type, VALUE handle, VALUE mask, VALUE queue) { - Check_Class(queue, cQueue); + Check_Queue(queue); rb_source_t *src = RSource(self); src->source_enum = (source_enum_t) NUM2LONG(type); dispatch_source_type_t c_type = rb_source_enum2type(src->source_enum); @@ -854,7 +862,7 @@ static VALUE rb_source_timer(VALUE klass, VALUE sel, VALUE delay, VALUE interval, VALUE leeway, VALUE queue) { - Check_Class(queue, cQueue); + Check_Queue(queue); dispatch_time_t start_time; VALUE argv[4] = {INT2FIX(SOURCE_TYPE_TIMER), INT2FIX(0), INT2FIX(0), queue};

1 0

[4365] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 15 Jul '10

15 Jul '10

Revision: 4365 http://trac.macosforge.org/projects/ruby/changeset/4365 Author: ernest.prabhakar(a)gmail.com Date: 2010-07-15 14:42:21 -0700 (Thu, 15 Jul 2010) Log Message: ----------- Cleanup overly verbose gcd.c Check_Class exception message Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-07-15 21:23:05 UTC (rev 4364) +++ MacRuby/trunk/gcd.c 2010-07-15 21:42:21 UTC (rev 4365) @@ -116,10 +116,8 @@ { VALUE has_klass = CLASS_OF(object); if (has_klass != wants_klass) { - rb_raise(rb_eArgError, "expected class of [%p] to be %s [%p], but got %s [%p]", - (void*) object, - rb_class2name(wants_klass), (void*) wants_klass, - rb_class2name(has_klass), (void*) has_klass); + rb_raise(rb_eArgError, "expected class to be %s, but got %s", + rb_class2name(wants_klass), rb_class2name(has_klass)); } }

1 0

[4364] MacRuby/trunk/gcd.c
by source_changes＠macosforge.org 15 Jul '10

15 Jul '10

Revision: 4364 http://trac.macosforge.org/projects/ruby/changeset/4364 Author: ernest.prabhakar(a)gmail.com Date: 2010-07-15 14:23:05 -0700 (Thu, 15 Jul 2010) Log Message: ----------- Streamlined gcd.c class checking Modified Paths: -------------- MacRuby/trunk/gcd.c Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-07-15 21:23:03 UTC (rev 4363) +++ MacRuby/trunk/gcd.c 2010-07-15 21:23:05 UTC (rev 4364) @@ -112,23 +112,17 @@ static VALUE cSemaphore; static inline void -Check_Queue(VALUE object) +Check_Class(VALUE object, VALUE wants_klass) { - if (CLASS_OF(object) != cQueue) { - rb_raise(rb_eArgError, "expected Queue object, but got %s", - rb_class2name(CLASS_OF(object))); + VALUE has_klass = CLASS_OF(object); + if (has_klass != wants_klass) { + rb_raise(rb_eArgError, "expected class of [%p] to be %s [%p], but got %s [%p]", + (void*) object, + rb_class2name(wants_klass), (void*) wants_klass, + rb_class2name(has_klass), (void*) has_klass); } } -static inline void -Check_Group(VALUE object) -{ - if (CLASS_OF(object) != cGroup) { - rb_raise(rb_eArgError, "expected Group object, but got %s", - rb_class2name(CLASS_OF(object))); - } -} - static VALUE rb_raise_init(VALUE self, SEL sel) { @@ -417,7 +411,7 @@ rb_scan_args(argc, argv, "01", &group); if (group != Qnil) { - Check_Group(group); + Check_Class(group, cGroup); dispatch_group_async_f(RGroup(group)->group, RQueue(self)->queue, (void *)block, rb_block_dispatcher); } @@ -681,7 +675,7 @@ rb_group_notify(VALUE self, SEL sel, VALUE target) { rb_vm_block_t *block = get_prepared_block(); - Check_Queue(target); + Check_Class(target, cQueue); dispatch_group_notify_f(RGroup(self)->group, RQueue(target)->queue, (void *)block, rb_block_dispatcher); @@ -814,7 +808,7 @@ rb_source_init(VALUE self, SEL sel, VALUE type, VALUE handle, VALUE mask, VALUE queue) { - Check_Queue(queue); + Check_Class(queue, cQueue); rb_source_t *src = RSource(self); src->source_enum = (source_enum_t) NUM2LONG(type); dispatch_source_type_t c_type = rb_source_enum2type(src->source_enum); @@ -862,7 +856,7 @@ static VALUE rb_source_timer(VALUE klass, VALUE sel, VALUE delay, VALUE interval, VALUE leeway, VALUE queue) { - Check_Queue(queue); + Check_Class(queue, cQueue); dispatch_time_t start_time; VALUE argv[4] = {INT2FIX(SOURCE_TYPE_TIMER), INT2FIX(0), INT2FIX(0), queue};

1 0

[4363] MacRuby/trunk
by source_changes＠macosforge.org 15 Jul '10

15 Jul '10

Revision: 4363 http://trac.macosforge.org/projects/ruby/changeset/4363 Author: ernest.prabhakar(a)gmail.com Date: 2010-07-15 14:23:03 -0700 (Thu, 15 Jul 2010) Log Message: ----------- timeouts for dispatch_methods Modified Paths: -------------- MacRuby/trunk/lib/dispatch/README.rdoc MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb Modified: MacRuby/trunk/lib/dispatch/README.rdoc =================================================================== --- MacRuby/trunk/lib/dispatch/README.rdoc 2010-07-15 17:14:05 UTC (rev 4362) +++ MacRuby/trunk/lib/dispatch/README.rdoc 2010-07-15 21:23:03 UTC (rev 4363) @@ -592,12 +592,11 @@ file.print @msg file.flush file.close - q.join - #semaphore.wait + semaphore.wait(0.1) print "fevent: #{(@fevent & fmask).to_s(2)} =>" puts " #{Dispatch::Source::VNODE_WRITE.to_s(2)} (Dispatch::Source::VNODE_WRITE)" File.delete(filename) - #semaphore.wait + semaphore.wait(0.1) print "fevent: #{(a)fevent.to_s(2)} => #{fmask.to_s(2)}" puts " (Dispatch::Source::VNODE_DELETE | Dispatch::Source::VNODE_WRITE)" file_src.cancel! @@ -615,7 +614,7 @@ end file.print @msg file.flush - semaphore2.wait + semaphore2.wait(0.1) puts "fevent2: #{@fevent2} => [:write]" file_src2.cancel! Modified: MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb 2010-07-15 17:14:05 UTC (rev 4362) +++ MacRuby/trunk/sample-macruby/Scripts/gcd/dispatch_methods.rb 2010-07-15 21:23:03 UTC (rev 4363) @@ -96,16 +96,16 @@ puts "#{(0..4).find { |i| i.odd? }} => 1" puts "#{(0..4).p_find { |i| i.odd? }} => 1?" puts "#{(0..4).p_find(3) { |i| i.odd? }} => 3?" -puts q = Dispatch::Queue.for("my_object") puts -q.sync {"done sync"} +puts q = Dispatch::Queue.new("org.macruby.queue.example") +q.sync { puts "queue sync" } -q.async {"done async"} +q.async { puts "queue async" } -puts "joining async" +puts "queue join" q.join -puts sema = Dispatch::Semaphore.new(0) puts +puts semaphore = Dispatch::Semaphore.new(0) q.async { puts "semaphore signal" semaphore.signal @@ -115,6 +115,7 @@ semaphore.wait +puts timer = Dispatch::Source.periodic(0.4) do |src| puts "Dispatch::Source.periodic: #{src.data}" end @@ -128,6 +129,7 @@ sleep 1 # => 1 2 1 ... timer.cancel! puts "cancel!" +puts @sum = 0 adder = Dispatch::Source.add do |s| puts "Dispatch::Source.add: #{s.data} (#{@sum += s.data})" @@ -145,7 +147,7 @@ puts "sum: #{@sum} => 9" adder.cancel! @mask = 0 -masker = Dispatch::Source.or(q) do |s| +masker = Dispatch::Source.or do |s| @mask |= s.data puts "Dispatch::Source.or: #{s.data.to_s(2)} (#{(a)mask.to_s(2)})" semaphore.signal @@ -161,21 +163,24 @@ semaphore.wait puts "mask: #{(a)mask.to_s(2)} => 1011" masker.cancel! +puts + @event = 0 mask = Dispatch::Source::PROC_EXIT | Dispatch::Source::PROC_SIGNAL -proc_src = Dispatch::Source.process($$, mask, q) do |s| - puts "Dispatch::Source.process: #{s.data} (#{@event |= s.data})" +proc_src = Dispatch::Source.process($$, mask) do |s| + @event |= s.data + puts "Dispatch::Source.process: #{s.data.to_s(2)} (#{(a)event.to_s(2)})" semaphore.signal end -sema2 = Dispatch::Semaphore.new(0) +semaphore2 = Dispatch::Semaphore.new(0) @events = [] mask2 = [:exit, :fork, :exec, :signal] -proc_src2 = Dispatch::Source.process($$, mask2, q) do |s| - this_events = Dispatch::Source.data2events(s.data) - @events += this_events - puts "Dispatch::Source.process: #{this_events} (#{@events})" +proc_src2 = Dispatch::Source.process($$, mask2) do |s| + these = Dispatch::Source.data2events(s.data) + @events += these + puts "Dispatch::Source.process: #{these} (#{@events})" semaphore2.signal end sig_usr1 = Signal.list["USR1"] @@ -185,16 +190,16 @@ semaphore.wait result = @event & mask print "@event: #{result.to_s(2)} =>" -puts " #{Dispatch::Source::PROC_SIGNAL} (Dispatch::Source::PROC_SIGNAL)" +puts " #{Dispatch::Source::PROC_SIGNAL.to_s(2)} (Dispatch::Source::PROC_SIGNAL)" proc_src.cancel! semaphore2.wait puts "@events: #{(result2 = @events & mask2)} => [:signal]" proc_src2.cancel! -puts "event2num: #{Dispatch::Source.event2num(result2[0])} => #{result}" +puts "event2num: #{Dispatch::Source.event2num(result2[0]).to_s(2)} => #{result.to_s(2)}" puts "data2events: #{Dispatch::Source.data2events(result)} => #{result2}" @signals = 0 sig_usr2 = Signal.list["USR2"] -signal = Dispatch::Source.signal(sig_usr2, q) do |s| +signal = Dispatch::Source.signal(sig_usr2) do |s| puts "Dispatch::Source.signal: #{s.data} (#{@signals += s.data})" semaphore.signal end @@ -207,6 +212,7 @@ semaphore.wait puts "signals: #{@signals} => 3" signal.cancel! +puts @fevent = 0 @msg = "#{$$}-#{Time.now.to_s.gsub(' ','_')}" puts "msg: #{@msg}" @@ -215,38 +221,40 @@ file = File.open(filename, "w") fmask = Dispatch::Source::VNODE_DELETE | Dispatch::Source::VNODE_WRITE file_src = Dispatch::Source.file(file.fileno, fmask, q) do |s| - puts "Dispatch::Source.file: #{s.data.to_s(2)} (#{(@fevent |= s.data).to_s(2)})" + @fevent |= s.data + puts "Dispatch::Source.file: #{s.data.to_s(2)} (#{(a)fevent.to_s(2)})" semaphore.signal end file.print @msg file.flush file.close -semaphore.wait -print "fevent: #{@fevent & fmask} =>" -puts " #{Dispatch::Source::VNODE_WRITE} (Dispatch::Source::VNODE_WRITE)" +semaphore.wait(0.1) +print "fevent: #{(@fevent & fmask).to_s(2)} =>" +puts " #{Dispatch::Source::VNODE_WRITE.to_s(2)} (Dispatch::Source::VNODE_WRITE)" File.delete(filename) -semaphore.wait -print "fevent: #{@fevent} => #{fmask}" +semaphore.wait(0.1) +print "fevent: #{(a)fevent.to_s(2)} => #{fmask.to_s(2)}" puts " (Dispatch::Source::VNODE_DELETE | Dispatch::Source::VNODE_WRITE)" file_src.cancel! +q.join @fevent2 = [] file = File.open(filename, "w") fmask2 = %w(delete write) -file_src2 = Dispatch::Source.file(file, fmask2, q) do |s| +file_src2 = Dispatch::Source.file(file, fmask2) do |s| @fevent2 += Dispatch::Source.data2events(s.data) puts "Dispatch::Source.file: #{Dispatch::Source.data2events(s.data)} (#{@fevent2})" semaphore2.signal end file.print @msg file.flush -semaphore2.wait +semaphore2.wait(0.1) puts "fevent2: #{@fevent2} => [:write]" file_src2.cancel! file = File.open(filename, "r") @input = "" -reader = Dispatch::Source.read(file, q) do |s| +reader = Dispatch::Source.read(file) do |s| @input << file.read(s.data) puts "Dispatch::Source.read: #{s.data}: #{@input}" end @@ -255,7 +263,7 @@ reader.cancel! file = File.open(filename, "w") @next_char = 0 -writer = Dispatch::Source.write(file, q) do |s| +writer = Dispatch::Source.write(file) do |s| if @next_char < @msg.size then char = @msg[@next_char] file.write(char)

1 0

[4362] MacRuby/trunk
by source_changes＠macosforge.org 15 Jul '10

15 Jul '10

Revision: 4362 http://trac.macosforge.org/projects/ruby/changeset/4362 Author: pthomson(a)apple.com Date: 2010-07-15 10:14:05 -0700 (Thu, 15 Jul 2010) Log Message: ----------- Added specs for Socket#sendfile so that Laurent doesn't hit me with his TDD bat. Modified Paths: -------------- MacRuby/trunk/ext/socket/socket.c Added Paths: ----------- MacRuby/trunk/spec/macruby/library/socket/ MacRuby/trunk/spec/macruby/library/socket/fixtures/ MacRuby/trunk/spec/macruby/library/socket/fixtures/sample.txt MacRuby/trunk/spec/macruby/library/socket/sendfile_spec.rb Modified: MacRuby/trunk/ext/socket/socket.c =================================================================== --- MacRuby/trunk/ext/socket/socket.c 2010-07-14 23:32:17 UTC (rev 4361) +++ MacRuby/trunk/ext/socket/socket.c 2010-07-15 17:14:05 UTC (rev 4362) @@ -3003,15 +3003,12 @@ file = rb_io_check_io(file); - rb_io_t *source = ExtractIOStruct(self); - rb_io_t *dest = ExtractIOStruct(file); + rb_io_t *socket = ExtractIOStruct(self); + rb_io_t *source = ExtractIOStruct(file); - rb_io_assert_readable(source); - rb_io_assert_writable(dest); - off_t to_write = NUM2OFFT(len); - if (sendfile(source->read_fd, dest->write_fd, NUM2OFFT(offset), &to_write, NULL, 0) == -1) { + if (sendfile(source->fd, socket->fd, NUM2OFFT(offset), &to_write, NULL, 0) == -1) { if (needs_to_close) { rb_io_close(file); } @@ -3567,6 +3564,7 @@ rb_objc_define_method(rb_cBasicSocket, "recv_nonblock", bsock_recv_nonblock, -1); rb_objc_define_method(rb_cBasicSocket, "do_not_reverse_lookup", bsock_do_not_reverse_lookup, 0); rb_objc_define_method(rb_cBasicSocket, "do_not_reverse_lookup=", bsock_do_not_reverse_lookup_set, 1); + rb_objc_define_method(rb_cBasicSocket, "sendfile", socket_sendfile, 3); rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket); rb_objc_define_method(rb_cIPSocket, "addr", ip_addr, 0); @@ -3625,7 +3623,6 @@ rb_objc_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1); rb_objc_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1); - rb_objc_define_method(rb_cSocket, "sendfile", socket_sendfile, 3); rb_objc_define_method(*(VALUE *)rb_cSocket, "socketpair", sock_s_socketpair, 3); rb_objc_define_method(*(VALUE *)rb_cSocket, "pair", sock_s_socketpair, 3); Added: MacRuby/trunk/spec/macruby/library/socket/fixtures/sample.txt =================================================================== --- MacRuby/trunk/spec/macruby/library/socket/fixtures/sample.txt (rev 0) +++ MacRuby/trunk/spec/macruby/library/socket/fixtures/sample.txt 2010-07-15 17:14:05 UTC (rev 4362) @@ -0,0 +1,4 @@ +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. +Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file Added: MacRuby/trunk/spec/macruby/library/socket/sendfile_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/socket/sendfile_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/library/socket/sendfile_spec.rb 2010-07-15 17:14:05 UTC (rev 4362) @@ -0,0 +1,44 @@ +require 'socket' +require 'dispatch' + +describe "Socket" do + describe :sendfile do + + it "should be able to send instances of IO" do + port = 2112 + io = File.open(File.dirname(__FILE__) + '/fixtures/sample.txt') + server = TCPServer.open(port) + socket = TCPSocket.open('localhost', port) + + Dispatch::Queue.concurrent.async do + server.listen(5) + client = server.accept + client.sendfile(io, 0, io.stat.size) + client.close + end + + socket.readlines.should == io.readlines + socket.close + server.close + end + + it "should be able to send files specified by a path" do + port = 2112 + path = File.dirname(__FILE__) + '/fixtures/sample.txt' + io = File.open(path) + server = TCPServer.open(port) + socket = TCPSocket.open('localhost', port) + + Dispatch::Queue.concurrent.async do + server.listen(5) + client = server.accept + client.sendfile(path, 0, io.stat.size) + client.close + end + + socket.readlines.should == io.readlines + socket.close + server.close + end + end +end \ No newline at end of file

1 0

[4361] MacRuby/trunk/rational.c
by source_changes＠macosforge.org 14 Jul '10

14 Jul '10

Revision: 4361 http://trac.macosforge.org/projects/ruby/changeset/4361 Author: lsansonetti(a)apple.com Date: 2010-07-14 16:32:17 -0700 (Wed, 14 Jul 2010) Log Message: ----------- <rdar://problem/8191999> rubyfuzz: crash in rb_ary_ptr / rb_rational_reciprocal Modified Paths: -------------- MacRuby/trunk/rational.c Modified: MacRuby/trunk/rational.c =================================================================== --- MacRuby/trunk/rational.c 2010-07-14 20:37:07 UTC (rev 4360) +++ MacRuby/trunk/rational.c 2010-07-14 23:32:17 UTC (rev 4361) @@ -1582,13 +1582,13 @@ nurat_marshal_load(VALUE self, SEL sel, VALUE a) { get_dat1(self); - dat->num = RARRAY_PTR(a)[0]; - dat->den = RARRAY_PTR(a)[1]; - rb_copy_generic_ivar(self, a); - - if (f_zero_p(dat->den)) + VALUE ary = rb_convert_type(a, T_ARRAY, "Array", "to_ary"); + dat->num = RARRAY_AT(ary, 0); + dat->den = RARRAY_AT(ary ,1); + rb_copy_generic_ivar(self, ary); + if (f_zero_p(dat->den)) { rb_raise_zerodiv(); - + } return self; }

1 0

[4360] MacRuby/trunk/ext/socket/socket.c
by source_changes＠macosforge.org 14 Jul '10

14 Jul '10

Revision: 4360 http://trac.macosforge.org/projects/ruby/changeset/4360 Author: pthomson(a)apple.com Date: 2010-07-14 13:37:07 -0700 (Wed, 14 Jul 2010) Log Message: ----------- Implement Socket#sendfile. Modified Paths: -------------- MacRuby/trunk/ext/socket/socket.c Modified: MacRuby/trunk/ext/socket/socket.c =================================================================== --- MacRuby/trunk/ext/socket/socket.c 2010-07-13 23:29:32 UTC (rev 4359) +++ MacRuby/trunk/ext/socket/socket.c 2010-07-14 20:37:07 UTC (rev 4360) @@ -2973,6 +2973,58 @@ return rb_assoc_new(sock2, rb_str_new(buf, len)); } +static inline VALUE +rb_io_check_io(VALUE io) +{ + return rb_check_convert_type(io, T_FILE, "IO", "to_io"); +} + +VALUE rb_f_open(VALUE io, SEL sel, int argc, VALUE *argv); + +/* + * call-seq: + * socket.sendfile(dest, offset, len) => integer + * + * Uses the sendfile(2) system call to send the file specified by <code>dest</code> + * to <code>socket</code>. <code>dest</code> must either be a readable IO object or + * a String representing a path on the file system. The <code>offset</code> + * and <code>len</code> parameters determine the offset and length of the sent file. + * Returns the number of bytes set. May throw a SystemCallError if the underlying call fails. + */ + +static VALUE +socket_sendfile(VALUE self, SEL sel, VALUE file, VALUE offset, VALUE len) +{ + bool needs_to_close = false; + if (TYPE(file) == T_STRING) { + file = rb_f_open(rb_cIO, 0, 1, &file); + needs_to_close = true; + } + + file = rb_io_check_io(file); + + rb_io_t *source = ExtractIOStruct(self); + rb_io_t *dest = ExtractIOStruct(file); + + rb_io_assert_readable(source); + rb_io_assert_writable(dest); + + off_t to_write = NUM2OFFT(len); + + if (sendfile(source->read_fd, dest->write_fd, NUM2OFFT(offset), &to_write, NULL, 0) == -1) { + if (needs_to_close) { + rb_io_close(file); + } + rb_sys_fail("sendfile(2) failed."); + } + + if (needs_to_close) { + rb_io_close(file); + } + + return OFFT2NUM(to_write); +} + #ifdef HAVE_GETHOSTNAME static VALUE sock_gethostname(VALUE obj) @@ -3573,6 +3625,7 @@ rb_objc_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1); rb_objc_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1); + rb_objc_define_method(rb_cSocket, "sendfile", socket_sendfile, 3); rb_objc_define_method(*(VALUE *)rb_cSocket, "socketpair", sock_s_socketpair, 3); rb_objc_define_method(*(VALUE *)rb_cSocket, "pair", sock_s_socketpair, 3);

1 0

[4359] MacRuby/trunk/NSString.m
by source_changes＠macosforge.org 13 Jul '10

13 Jul '10

Revision: 4359 http://trac.macosforge.org/projects/ruby/changeset/4359 Author: martinlagardette(a)apple.com Date: 2010-07-13 16:29:32 -0700 (Tue, 13 Jul 2010) Log Message: ----------- Fix the number or args for some NSString forwarding methods - Fixes <rdar://problem/8163915> Modified Paths: -------------- MacRuby/trunk/NSString.m Modified: MacRuby/trunk/NSString.m =================================================================== --- MacRuby/trunk/NSString.m 2010-07-13 22:49:49 UTC (rev 4358) +++ MacRuby/trunk/NSString.m 2010-07-13 23:29:32 UTC (rev 4359) @@ -340,7 +340,7 @@ forward_bang("[]=", -1); forward("slice", -1); forward_bang("slice!", -1); - forward_bang("insert", 3); + forward_bang("insert", 2); forward("index", -1); forward("rindex", -1); forward("+", 1); @@ -381,9 +381,9 @@ forward("ljust", -1); forward("rjust", -1); forward("center", -1); - forward("strip", -1); - forward("lstrip", -1); - forward("rstrip", -1); + forward("strip", 0); + forward("lstrip", 0); + forward("rstrip", 0); forward_bang("strip!", 0); forward_bang("lstrip!", 0); forward_bang("rstrip!", 0);

1 0

[4358] MacRuby/trunk/complex.c
by source_changes＠macosforge.org 13 Jul '10

13 Jul '10

Revision: 4358 http://trac.macosforge.org/projects/ruby/changeset/4358 Author: martinlagardette(a)apple.com Date: 2010-07-13 15:49:49 -0700 (Tue, 13 Jul 2010) Log Message: ----------- Fix `#marshal_load` for non-array arguments - Fixes <rdar://problem/8164079> Modified Paths: -------------- MacRuby/trunk/complex.c Modified: MacRuby/trunk/complex.c =================================================================== --- MacRuby/trunk/complex.c 2010-07-13 22:37:13 UTC (rev 4357) +++ MacRuby/trunk/complex.c 2010-07-13 22:49:49 UTC (rev 4358) @@ -1324,9 +1324,10 @@ nucomp_marshal_load(VALUE self, SEL sel, VALUE a) { get_dat1(self); - GC_WB(&dat->real, RARRAY_AT(a, 0)); - GC_WB(&dat->imag, RARRAY_AT(a, 1)); - rb_copy_generic_ivar(self, a); + VALUE ary = rb_convert_type(a, T_ARRAY, "Array", "to_ary"); + GC_WB(&dat->real, RARRAY_AT(ary, 0)); + GC_WB(&dat->imag, RARRAY_AT(ary, 1)); + rb_copy_generic_ivar(self, ary); return self; }

1 0

[4357] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 13 Jul '10

13 Jul '10

Revision: 4357 http://trac.macosforge.org/projects/ruby/changeset/4357 Author: ernest.prabhakar(a)gmail.com Date: 2010-07-13 15:37:13 -0700 (Tue, 13 Jul 2010) Log Message: ----------- gcd specs all pass most times, pass ci all times Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt Modified: MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-07-13 22:37:12 UTC (rev 4356) +++ MacRuby/trunk/spec/macruby/core/gcd/source_spec.rb 2010-07-13 22:37:13 UTC (rev 4357) @@ -78,7 +78,7 @@ @i = 0 src = Dispatch::Source.new(@type, 0, 0, @q) {|s| @i = 42; @sm.signal} src << 42 - @sm.wait + @sm.wait(0.1) @i.should == 42 end @@ -89,7 +89,7 @@ @sm.signal end src << 42 - @sm.wait + @sm.wait(0.1) @flag.should == true end @@ -100,7 +100,7 @@ @sm.signal end src << 42 - @sm.wait + @sm.wait(0.1) @i.should == 42 end @@ -114,7 +114,7 @@ src << 17 src << 25 src.resume! - @sm.wait + @sm.wait(0.1) @i.should == 42 end end @@ -134,7 +134,7 @@ @i = 0 src = Dispatch::Source.new(@type, 0, 0, @q) {|s| @i = 42; @sm.signal} src << 42 - @sm.wait + @sm.wait(0.1) @i.should == 42 end @@ -148,7 +148,7 @@ src << 0b000_010 src << 0b101_000 src.resume! - @sm.wait + @sm.wait(0.1) @i.should == 42 #0b101_010 src.cancel! end @@ -179,7 +179,7 @@ Signal.trap(@signal, "IGNORE") Process.kill(@signal, $$) Signal.trap(@signal, "DEFAULT") - @sm.wait + @sm.wait(0.1) #while (@fired == false) do; end @fired.should == true @i.should == @mask @@ -210,7 +210,7 @@ Signal.trap(@signal, "IGNORE") Process.kill(@signal, $$) Signal.trap(@signal, "DEFAULT") - @sm.wait + @sm.wait(0.1) @fired.should == true @i.should == 1 src.cancel! @@ -346,7 +346,7 @@ end @file.write(@msg) @file.flush - @sm.wait + @sm.wait(0.1) @fired.should == true @flag.should == @mask end @@ -354,7 +354,7 @@ it "does not close file when cancelled given descriptor" do @src = Dispatch::Source.new(@type, @file.to_i, 0, @q) { } @src.cancel! - @sm.wait + @sm.wait(0.1) @file.closed?.should == false end Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2010-07-13 22:37:12 UTC (rev 4356) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/source_tags.txt 2010-07-13 22:37:13 UTC (rev 4357) @@ -1,2 +1,6 @@ -fails:Dispatch::Source of type file: VNODE does not close file when cancelled given descriptor +fails:Dispatch::Source of type file: READ does close file when cancelled given IO +fails:Dispatch::Source of type file: WRITE does close file when cancelled given IO +fails:Dispatch::Source of type file: VNODE fires with data showing mask of vnode events +#fails:Dispatch::Source of type file: VNODE does not close file when cancelled given descriptor +#fails:Dispatch::Source of type PROC fires on process event with event mask data

1 0