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

[1954] MacRuby/branches/experimental
by source_changes＠macosforge.org 30 Jun '09

30 Jun '09

Revision: 1954 http://trac.macosforge.org/projects/ruby/changeset/1954 Author: lsansonetti(a)apple.com Date: 2009-06-30 13:34:22 -0700 (Tue, 30 Jun 2009) Log Message: ----------- AOT compiler: added support for NSObject and ID compilation Modified Paths: -------------- MacRuby/branches/experimental/compiler.cpp MacRuby/branches/experimental/compiler.h MacRuby/branches/experimental/vm.cpp Modified: MacRuby/branches/experimental/compiler.cpp =================================================================== --- MacRuby/branches/experimental/compiler.cpp 2009-06-29 23:17:43 UTC (rev 1953) +++ MacRuby/branches/experimental/compiler.cpp 2009-06-30 20:34:22 UTC (rev 1954) @@ -142,6 +142,12 @@ #endif } +RoxorAOTCompiler::RoxorAOTCompiler(const char *_fname) + : RoxorCompiler(_fname) +{ + cObject_gvar = NULL; +} + inline SEL RoxorCompiler::mid_to_sel(ID mid, int arity) { @@ -856,7 +862,7 @@ iter != lvars.end(); ++iter) { ID name = iter->first; Value *slot = iter->second; - params.push_back(ConstantInt::get(IntTy, (long)name)); + params.push_back(compile_id((long)name)); params.push_back(slot); } @@ -899,7 +905,7 @@ iter != lvars.end(); ++iter) { ID lvar = iter->first; - params.push_back(ConstantInt::get(IntTy, lvar)); + params.push_back(compile_id(lvar)); params.push_back(iter->second); } @@ -917,13 +923,10 @@ } std::vector<Value *> params; - Value *val; params.push_back(current_self); + params.push_back(compile_id(vid)); - val = ConstantInt::get(IntTy, vid); - params.push_back(val); - int *slot_cache = get_slot_cache(vid); params.push_back(compile_const_pointer(slot_cache)); @@ -944,7 +947,7 @@ std::vector<Value *> params; params.push_back(current_self); - params.push_back(ConstantInt::get(IntTy, (long)vid)); + params.push_back(compile_id(vid)); params.push_back(val); int *slot_cache = get_slot_cache(vid); @@ -968,7 +971,7 @@ std::vector<Value *> params; params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, (long)name)); + params.push_back(compile_id(name)); params.push_back(val); return CallInst::Create(cvarSetFunc, params.begin(), @@ -1008,13 +1011,13 @@ if (node->nd_vid > 0) { params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid)); + params.push_back(compile_id(node->nd_vid)); } else { assert(node->nd_else != NULL); params.push_back(compile_class_path(node->nd_else)); assert(node->nd_else->nd_mid > 0); - params.push_back(ConstantInt::get(IntTy, (long)node->nd_else->nd_mid)); + params.push_back(compile_id(node->nd_else->nd_mid)); } params.push_back(val); @@ -1028,11 +1031,61 @@ RoxorCompiler::compile_current_class(void) { if (current_opened_class == NULL) { - return cObject; + return compile_nsobject(); } return new LoadInst(current_opened_class, "", bb); } +inline Value * +RoxorCompiler::compile_nsobject(void) +{ + return cObject; +} + +inline Value * +RoxorAOTCompiler::compile_nsobject(void) +{ + if (cObject_gvar == NULL) { + cObject_gvar = new GlobalVariable( + RubyObjTy, + false, + GlobalValue::InternalLinkage, + zeroVal, + "NSObject", + RoxorCompiler::module); + } + return new LoadInst(cObject_gvar, "", bb); +} + +inline Value * +RoxorCompiler::compile_id(ID id) +{ + return ConstantInt::get(IntTy, (long)id); +} + +inline Value * +RoxorAOTCompiler::compile_id(ID id) +{ + std::map<ID, GlobalVariable *>::iterator iter = ids.find(id); + + GlobalVariable *gvar; + if (iter == ids.end()) { + gvar = new GlobalVariable( + IntTy, + false, + GlobalValue::InternalLinkage, + ConstantInt::get(IntTy, 0), + rb_id2name(id), + RoxorCompiler::module); + ids[id] = gvar; + } + else { + gvar = iter->second; + } + + return new LoadInst(gvar, "", bb); +} + Value * RoxorCompiler::compile_const(ID id, Value *outer) { @@ -1055,7 +1108,7 @@ params.push_back(outer); params.push_back(ConstantInt::get(Type::Int8Ty, outer_given ? 0 : 1)); params.push_back(compile_ccache(id)); - params.push_back(ConstantInt::get(IntTy, id)); + params.push_back(compile_id(id)); return compile_protected_call(getConstFunc, params); } @@ -1177,7 +1230,7 @@ case NODE_COLON3: what2 = nd_type(node) == NODE_COLON2 ? compile_node(node->nd_head) - : cObject; + : compile_nsobject(); if (rb_is_const_id(node->nd_mid)) { type = DEFINED_CONST; what1 = (VALUE)node->nd_mid; @@ -1433,7 +1486,7 @@ { if (nd_type(node) == NODE_COLON3) { // ::Foo - return cObject; + return compile_nsobject(); } else if (node->nd_head != NULL) { // Bar::Foo @@ -2290,7 +2343,7 @@ std::vector<Value *> params; params.push_back(klass); - params.push_back(ConstantInt::get(IntTy, iter->first)); + params.push_back(compile_id(iter->first)); Instruction *ptr = compile_const_pointer(iter->second, false); list.insert(list_iter, ptr); params.push_back(ptr); @@ -2520,7 +2573,7 @@ ID name = iter->first; Value *slot = iter->second; if (std::find(dvars.begin(), dvars.end(), name) == dvars.end()) { - params.push_back(ConstantInt::get(IntTy, (long)name)); + params.push_back(compile_id(name)); params.push_back(slot); vars_count++; } @@ -2615,7 +2668,7 @@ std::vector<Value *> params; params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid)); + params.push_back(compile_id(node->nd_vid)); return compile_protected_call(cvarGetFunc, params); } @@ -3099,7 +3152,7 @@ std::vector<Value *> params; - params.push_back(ConstantInt::get(IntTy, (long)path)); + params.push_back(compile_id(path)); params.push_back(compile_class_path(node->nd_cpath)); params.push_back(super == NULL ? zeroVal : compile_node(super)); params.push_back(ConstantInt::get(Type::Int8Ty, @@ -3632,8 +3685,8 @@ std::vector<Value *> params; assert(node->u1.id > 0 && node->u2.id > 0); - params.push_back(ConstantInt::get(IntTy, node->u1.id)); - params.push_back(ConstantInt::get(IntTy, node->u2.id)); + params.push_back(compile_id(node->u1.id)); + params.push_back(compile_id(node->u2.id)); CallInst::Create(valiasFunc, params.begin(), params.end(), "", bb); @@ -3652,8 +3705,8 @@ std::vector<Value *> params; params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, node->u1.node->u1.node->u2.id)); - params.push_back(ConstantInt::get(IntTy, node->u2.node->u1.node->u2.id)); + params.push_back(compile_id(node->u1.node->u1.node->u2.id)); + params.push_back(compile_id(node->u2.node->u1.node->u2.id)); compile_protected_call(aliasFunc, params); @@ -3726,7 +3779,7 @@ std::vector<Value *> params; params.push_back(compile_current_class()); - params.push_back(ConstantInt::get(IntTy, name)); + params.push_back(compile_id(name)); compile_protected_call(undefFunc, params); @@ -4176,7 +4229,7 @@ case NODE_COLON3: assert(node->nd_mid > 0); - return compile_const(node->nd_mid, cObject); + return compile_const(node->nd_mid, compile_nsobject()); case NODE_CASE: { @@ -4363,6 +4416,68 @@ list.insert(list.begin(), load); } + // Compile IDs. + + Function *rbInternFunc = cast<Function>(module->getOrInsertFunction( + "rb_intern", + IntTy, PtrTy, NULL)); + + for (std::map<ID, GlobalVariable *>::iterator i = ids.begin(); + i != ids.end(); + ++i) { + + ID name = i->first; + GlobalVariable *gvar = i->second; + + GlobalVariable *name_gvar = compile_const_global_string(rb_id2name(name)); + + std::vector<Value *> idxs; + idxs.push_back(ConstantInt::get(Type::Int32Ty, 0)); + idxs.push_back(ConstantInt::get(Type::Int32Ty, 0)); + Instruction *load = GetElementPtrInst::Create(name_gvar, + idxs.begin(), idxs.end(), ""); + + std::vector<Value *> params; + params.push_back(load); + + Instruction *call = CallInst::Create(rbInternFunc, params.begin(), + params.end(), ""); + + Instruction *assign = new StoreInst(call, gvar, ""); + + list.insert(list.begin(), assign); + list.insert(list.begin(), call); + list.insert(list.begin(), load); + } + + // Compile NSObject reference. + + Function *objcGetClassFunc = cast<Function>(module->getOrInsertFunction( + "objc_getClass", + RubyObjTy, PtrTy, NULL)); + + if (cObject_gvar != NULL) { + GlobalVariable *nsobject = compile_const_global_string("NSObject"); + + std::vector<Value *> idxs; + idxs.push_back(ConstantInt::get(Type::Int32Ty, 0)); + idxs.push_back(ConstantInt::get(Type::Int32Ty, 0)); + Instruction *load = GetElementPtrInst::Create(nsobject, + idxs.begin(), idxs.end(), ""); + + std::vector<Value *> params; + params.push_back(load); + + Instruction *call = CallInst::Create(objcGetClassFunc, params.begin(), + params.end(), ""); + + Instruction *assign = new StoreInst(call, cObject_gvar, ""); + + list.insert(list.begin(), assign); + list.insert(list.begin(), call); + list.insert(list.begin(), load); + } + return function; } Modified: MacRuby/branches/experimental/compiler.h =================================================================== --- MacRuby/branches/experimental/compiler.h 2009-06-29 23:17:43 UTC (rev 1953) +++ MacRuby/branches/experimental/compiler.h 2009-06-30 20:34:22 UTC (rev 1954) @@ -214,6 +214,7 @@ Value *compile_multiple_assignment(NODE *node, Value *val); void compile_multiple_assignment_element(NODE *node, Value *val); Value *compile_current_class(void); + virtual Value *compile_nsobject(void); Value *compile_class_path(NODE *node); Value *compile_const(ID id, Value *outer); Value *compile_singleton_class(Value *obj); @@ -227,6 +228,7 @@ virtual Instruction *compile_sel(SEL sel, bool add_to_bb=true) { return compile_const_pointer(sel, add_to_bb); } + virtual Value *compile_id(ID id); GlobalVariable *compile_const_global_string(const char *str); void compile_landing_pad_header(void); @@ -283,7 +285,7 @@ class RoxorAOTCompiler : public RoxorCompiler { public: - RoxorAOTCompiler(const char *fname) : RoxorCompiler(fname) { } + RoxorAOTCompiler(const char *fname); Function *compile_main_function(NODE *node); @@ -291,12 +293,16 @@ std::map<SEL, GlobalVariable *> mcaches; std::map<ID, GlobalVariable *> ccaches; std::map<SEL, GlobalVariable *> sels; + std::map<ID, GlobalVariable *> ids; + GlobalVariable *cObject_gvar; Value *compile_mcache(SEL sel, bool super); Value *compile_ccache(ID id); Instruction *compile_sel(SEL sel, bool add_to_bb=true); void compile_prepare_method(Value *classVal, Value *sel, Function *new_function, rb_vm_arity_t &arity, NODE *body); + Value *compile_nsobject(void); + Value *compile_id(ID id); Instruction * compile_const_pointer(void *ptr, bool insert_to_bb=true) { Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-29 23:17:43 UTC (rev 1953) +++ MacRuby/branches/experimental/vm.cpp 2009-06-30 20:34:22 UTC (rev 1954) @@ -4104,8 +4104,6 @@ "line was: %s", gcc_line.c_str()); exit(1); } - - //RoxorCompiler::module->dump(); } extern "C"

1 0

[1953] MacRuby/branches/experimental/spec/frozen/core/bignum/ comparison_spec.rb
by source_changes＠macosforge.org 29 Jun '09

29 Jun '09

Revision: 1953 http://trac.macosforge.org/projects/ruby/changeset/1953 Author: pthomson(a)apple.com Date: 2009-06-29 16:17:43 -0700 (Mon, 29 Jun 2009) Log Message: ----------- Fixed an incorrect specification. Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/bignum/comparison_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/bignum/comparison_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/bignum/comparison_spec.rb 2009-06-29 07:25:58 UTC (rev 1952) +++ MacRuby/branches/experimental/spec/frozen/core/bignum/comparison_spec.rb 2009-06-29 23:17:43 UTC (rev 1953) @@ -44,8 +44,8 @@ (-@inf <=> -Float::MAX.to_i*2).should == -1 end - it "returns -1 when self is negative and other is -Infinity" do - (-@inf <=> -Float::MAX.to_i*2).should == -1 + it "returns 1 when self is negative and other is -Infinity" do + (-Float::MAX.to_i*2 <=> @inf).should == 1 end end @@ -64,8 +64,8 @@ (-@inf <=> -Float::MAX.to_i*2).should == -1 end - it "returns -1 when self is negative and other is -Infinity" do - (-@inf <=> -Float::MAX.to_i*2).should == -1 + it "returns 1 when self is negative and other is -Infinity" do + (-Float::MAX.to_i*2 <=> @inf).should == 1 end end end

1 0

[1952] MacRuby/branches/experimental/sample-macruby/Scripts/web_server.rb
by source_changes＠macosforge.org 29 Jun '09

29 Jun '09

Revision: 1952 http://trac.macosforge.org/projects/ruby/changeset/1952 Author: lsansonetti(a)apple.com Date: 2009-06-29 00:25:58 -0700 (Mon, 29 Jun 2009) Log Message: ----------- A very simple Web server written on top of Foundation's run loop and dispatching new requests to a pool of threads. Added Paths: ----------- MacRuby/branches/experimental/sample-macruby/Scripts/web_server.rb Added: MacRuby/branches/experimental/sample-macruby/Scripts/web_server.rb =================================================================== --- MacRuby/branches/experimental/sample-macruby/Scripts/web_server.rb (rev 0) +++ MacRuby/branches/experimental/sample-macruby/Scripts/web_server.rb 2009-06-29 07:25:58 UTC (rev 1952) @@ -0,0 +1,199 @@ +# A very simple Web server written on top of Foundation's run loop and +# dispatching new requests to a pool of threads. + +framework 'Foundation' + +class HTTPMessage + attr_accessor :code, :content_type, :content + + def data + str = "HTTP/1.1 #{code} " + str << code == 404 ? "Not Found\n" : "OK\n" + + str << "Date: #{Time.now}\n" + str << "Server: #{__FILE__} (MacRuby, Mac OS X)\n" + str << "Content-Length: #{(a)content.length}\n" + str << "Keep-Alive: timeout=5, max=100\n" + str << "Connection: Keep-Alive\n" + str << "Content-Type: #{@content_type}" + if content_type.start_with?('text') + str << "; charset=utf-8" + end + str << "\n\n" + + data = nil + if @content.is_a?(NSData) + data = str.dataUsingEncoding(NSUTF8StringEncoding) + data = data.mutableCopy + data.appendData(@content) + else + str << @content + data = str.dataUsingEncoding(NSUTF8StringEncoding) + end + data + end +end + +class WebServer + def initialize(dir, port, debug) + @debug = debug + log "Preparing server to serve #{dir} on http://localhost:#{port}" + + @dir = dir + @port = NSSocketPort.alloc.initWithTCPPort(port) + unless @port + raise "Can't open local TCP socket on port #{port}" + end + fd = @port.socket + + @handle = NSFileHandle.alloc.initWithFileDescriptor fd, + closeOnDealloc:true + + NSNotificationCenter.defaultCenter.addObserver self, + selector:'new_connection:', + name:NSFileHandleConnectionAcceptedNotification, + object:nil + + @handle.acceptConnectionInBackgroundAndNotify + end + + THREADS_POOL = 4 + + def run + log "Starting server" + + @threads = [] + @work_queue = [] + @work_mutex = Mutex.new + THREADS_POOL.times do + @threads << Thread.new do + begin + loop do + sleep 0.1 + handle = @work_mutex.synchronize { @work_queue.shift } + if handle + handle_request(handle) + end + end + rescue => e + puts "ERROR: #{e}" + end + end + end + + NSRunLoop.currentRunLoop.run + end + + def new_connection(notification) + dict = notification.userInfo + remote_handle = dict[NSFileHandleNotificationFileHandleItem] + + @handle.acceptConnectionInBackgroundAndNotify + + if remote_handle + @work_mutex.synchronize { @work_queue << remote_handle } + @threads.each { |t| t.wakeup } + end + end + + private + + def handle_request(handle) + data = handle.availableData + str = NSString.alloc.initWithData(data, encoding:NSUTF8StringEncoding) + if str.start_with?('GET ') + i = str.index(' ', 4) + path = str[4..(i-1)] + data = serve_data(path) + handle.writeData(data) + end + handle.closeFile + end + + def serve_file(msg, path, real_path) + data = NSData.dataWithContentsOfFile(real_path) + msg.content = data + msg.content_type = case File.extname(real_path) + when '.gif' + 'image/gif' + when '.png' + 'image/png' + when '.jpg', '.jpeg' + 'image/jpg' + when '.html' + 'text/html' + else + 'text/plain' + end + end + + def serve_directory(msg, path, real_path) + str = <<EOS +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> + <head> + <title>Index of #{path}</title> + </head> + <body> + <h1>Index of #{path}</h1> + <pre> +EOS + Dir.entries(real_path).each do |entry| + entry_path = File.join(path, entry) + str << " <a href=\"#{entry_path}\">#{entry_path}</a>\n" + end + str << <<EOS + <hr> + </pre> +</body> +</html> +EOS + msg.content_type = 'text/html' + msg.content = str + end + + def serve_data(path) + real_path = File.join(@dir, path) + msg = HTTPMessage.new + + if File.exist?(real_path) + msg.code = 200 + if File.directory?(real_path) + serve_directory(msg, path, real_path) + else + serve_file(msg, path, real_path) + end + else + msg.code = 404 + msg.content_type = 'text/html' + msg.content = <<EOS +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> +<html> + <head> + <title>404 Not Found</title> + </head> + <body> + <h1>Not Found</h1> + <p>The requested URL #{path} was not found on this server.</p> + </body> +</html> +EOS + end + + log "#{msg.code} #{real_path}" + msg.data + end + + def log(msg) + puts "#{Thread.current} LOG: #{msg}" if @debug + end +end + +dir, port, debug = ARGV[0], ARGV[1], ARGV[2] + +dir ||= '/' +port ||= 8080 +debug ||= false + +server = WebServer.new(dir, port, debug) +server.run

1 0

[1951] MacRuby/branches/experimental/spec/macruby.mspec
by source_changes＠macosforge.org 29 Jun '09

29 Jun '09

Revision: 1951 http://trac.macosforge.org/projects/ruby/changeset/1951 Author: lsansonetti(a)apple.com Date: 2009-06-28 23:27:25 -0700 (Sun, 28 Jun 2009) Log Message: ----------- enabling core/thread since we pass them all Modified Paths: -------------- MacRuby/branches/experimental/spec/macruby.mspec Modified: MacRuby/branches/experimental/spec/macruby.mspec =================================================================== --- MacRuby/branches/experimental/spec/macruby.mspec 2009-06-28 00:34:33 UTC (rev 1950) +++ MacRuby/branches/experimental/spec/macruby.mspec 2009-06-29 06:27:25 UTC (rev 1951) @@ -19,7 +19,6 @@ '^core/precision', '^core/proc', '^core/process', - '^core/thread', '^core/threadgroup' ]

1 0

[1950] MacRuby/branches/experimental/spec/frozen/core/thread/fixtures/ classes.rb
by source_changes＠macosforge.org 28 Jun '09

28 Jun '09

Revision: 1950 http://trac.macosforge.org/projects/ruby/changeset/1950 Author: lsansonetti(a)apple.com Date: 2009-06-27 17:34:33 -0700 (Sat, 27 Jun 2009) Log Message: ----------- fixed some code + added a temporary MacRuby workaround (alloy: we probably need to not merge this upstream) Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/fixtures/classes.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/fixtures/classes.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/fixtures/classes.rb 2009-06-28 00:28:31 UTC (rev 1949) +++ MacRuby/branches/experimental/spec/frozen/core/thread/fixtures/classes.rb 2009-06-28 00:34:33 UTC (rev 1950) @@ -91,9 +91,10 @@ end def self.status_of_aborting_thread - t = Thread.new { sleep } + t = Thread.new { begin; sleep; ensure; Thread.pass; end } begin Thread.critical = true if Thread.respond_to? :critical + Thread.pass while t.status and t.status != 'sleep' t.kill Status.new t ensure @@ -135,13 +136,16 @@ end def self.dying_thread_ensures(kill_method_name=:kill) - t = Thread.new do + # XXX MacRuby hack: work around local variable corruption because the + # main thread might exit before kill_method_name is used. + t = Thread.new(kill_method_name) do |mid| begin - Thread.current.send(kill_method_name) + Thread.current.send(mid) ensure yield end end + t end def self.dying_thread_with_outer_ensure(kill_method_name=:kill)

1 0

[1949] MacRuby/branches/experimental/spec/frozen/core/thread
by source_changes＠macosforge.org 28 Jun '09

28 Jun '09

Revision: 1949 http://trac.macosforge.org/projects/ruby/changeset/1949 Author: lsansonetti(a)apple.com Date: 2009-06-27 17:28:31 -0700 (Sat, 27 Jun 2009) Log Message: ----------- fixed/added specs Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/list_spec.rb MacRuby/branches/experimental/spec/frozen/core/thread/shared/wakeup.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/list_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/list_spec.rb 2009-06-27 20:36:24 UTC (rev 1948) +++ MacRuby/branches/experimental/spec/frozen/core/thread/list_spec.rb 2009-06-28 00:28:31 UTC (rev 1949) @@ -17,6 +17,7 @@ c = Channel.new t = Thread.new { c.receive } begin + Thread.pass while t.status and t.status != 'sleep' Thread.list.should include(t) ensure c << nil Modified: MacRuby/branches/experimental/spec/frozen/core/thread/shared/wakeup.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/shared/wakeup.rb 2009-06-27 20:36:24 UTC (rev 1948) +++ MacRuby/branches/experimental/spec/frozen/core/thread/shared/wakeup.rb 2009-06-28 00:28:31 UTC (rev 1949) @@ -40,10 +40,21 @@ end while(t.status != false) do - t.send(@method) + begin + t.send(@method) + rescue ThreadError + # The thread might die right after. + t.status.should == false + end Thread.pass end 1.should == 1 # test succeeds if we reach here end + + it "raises a ThreadError when trying to wake up a dead thread" do + t = Thread.new { 1 } + t.join + lambda { t.wakeup }.should raise_error(ThreadError) + end end

1 0

[1948] MacRuby/branches/experimental/spec/frozen/core/thread/raise_spec.rb
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1948 http://trac.macosforge.org/projects/ruby/changeset/1948 Author: lsansonetti(a)apple.com Date: 2009-06-27 13:36:24 -0700 (Sat, 27 Jun 2009) Log Message: ----------- ported to 1.9 Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/raise_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/raise_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/raise_spec.rb 2009-06-27 20:36:06 UTC (rev 1947) +++ MacRuby/branches/experimental/spec/frozen/core/thread/raise_spec.rb 2009-06-27 20:36:24 UTC (rev 1948) @@ -50,19 +50,21 @@ lambda {t.value}.should raise_error(RuntimeError) end - it "re-raises active exception" do - t = Thread.new do - begin - 1/0 - rescue ZeroDivisionError - sleep 3 + ruby_version_is "" ... "1.9" do + it "re-raises active exception" do + t = Thread.new do + begin + 1/0 + rescue ZeroDivisionError + sleep 3 + end end + + Thread.pass while t.status and t.status != "sleep" + t.raise + lambda {t.value}.should raise_error(ZeroDivisionError) + t.kill end - - Thread.pass while t.status and t.status != "sleep" - t.raise - lambda {t.value}.should raise_error(ZeroDivisionError) - t.kill end end @@ -105,20 +107,22 @@ lambda {t.value}.should raise_error(RuntimeError) end - it "re-raises active exception" do - raised = false - t = Thread.new do - begin - 1/0 - rescue ZeroDivisionError - raised = true - loop { } + ruby_version_is "" ... "1.9" do + it "re-raises active exception" do + raised = false + t = Thread.new do + begin + 1/0 + rescue ZeroDivisionError + raised = true + loop { } + end end + + Thread.pass until raised || !t.alive? + t.raise + lambda {t.value}.should raise_error(ZeroDivisionError) end - - Thread.pass until raised || !t.alive? - t.raise - lambda {t.value}.should raise_error(ZeroDivisionError) end end

1 0

[1947] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1947 http://trac.macosforge.org/projects/ruby/changeset/1947 Author: lsansonetti(a)apple.com Date: 2009-06-27 13:36:06 -0700 (Sat, 27 Jun 2009) Log Message: ----------- Thread#raise: added Modified Paths: -------------- MacRuby/branches/experimental/eval.c MacRuby/branches/experimental/include/ruby/intern.h MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/eval.c =================================================================== --- MacRuby/branches/experimental/eval.c 2009-06-27 06:39:27 UTC (rev 1946) +++ MacRuby/branches/experimental/eval.c 2009-06-27 20:36:06 UTC (rev 1947) @@ -350,8 +350,6 @@ * raise ArgumentError, "No parameters", caller */ -VALUE rb_make_exception(int, VALUE *); - static VALUE rb_f_raise(VALUE klass, SEL sel, int argc, VALUE *argv) { Modified: MacRuby/branches/experimental/include/ruby/intern.h =================================================================== --- MacRuby/branches/experimental/include/ruby/intern.h 2009-06-27 06:39:27 UTC (rev 1946) +++ MacRuby/branches/experimental/include/ruby/intern.h 2009-06-27 20:36:06 UTC (rev 1947) @@ -204,6 +204,7 @@ NORETURN(void rb_error_frozen(const char*)); void rb_check_frozen(VALUE); /* eval.c */ +VALUE rb_make_exception(int, VALUE *); int rb_sourceline(void); const char *rb_sourcefile(void); Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-27 06:39:27 UTC (rev 1946) +++ MacRuby/branches/experimental/thread.c 2009-06-27 20:36:06 UTC (rev 1947) @@ -242,9 +242,19 @@ */ static VALUE -thread_raise_m(int argc, VALUE *argv, VALUE self) +thread_raise_m(VALUE self, SEL sel, int argc, VALUE *argv) { - // TODO + VALUE exc = rb_make_exception(argc, argv); + + rb_vm_thread_t *t = GetThreadPtr(self); + + if (t->thread == pthread_self()) { + rb_exc_raise(exc); + } + else if (t->status != THREAD_DEAD) { + rb_vm_thread_raise(t, exc); + } + return Qnil; } @@ -1358,7 +1368,7 @@ rb_objc_define_method(*(VALUE *)rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1); rb_objc_define_method(rb_cThread, "initialize", thread_initialize, -1); - rb_define_method(rb_cThread, "raise", thread_raise_m, -1); + rb_objc_define_method(rb_cThread, "raise", thread_raise_m, -1); rb_objc_define_method(rb_cThread, "join", thread_join_m, -1); rb_objc_define_method(rb_cThread, "value", thread_value, 0); rb_objc_define_method(rb_cThread, "kill", rb_thread_kill, 0); Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-27 06:39:27 UTC (rev 1946) +++ MacRuby/branches/experimental/vm.cpp 2009-06-27 20:36:06 UTC (rev 1947) @@ -4604,6 +4604,17 @@ extern "C" void +rb_vm_thread_raise(rb_vm_thread_t *t, VALUE exc) +{ + // XXX we should lock here + RoxorVM *vm = (RoxorVM *)t->vm; + vm->push_current_exception(exc); + + rb_vm_thread_cancel(t); +} + +extern "C" +void rb_thread_sleep(int sec) { struct timeval time; Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-27 06:39:27 UTC (rev 1946) +++ MacRuby/branches/experimental/vm.h 2009-06-27 20:36:06 UTC (rev 1947) @@ -359,6 +359,7 @@ VALUE rb_vm_thread_locals(VALUE thread, bool create_storage); void rb_vm_thread_wakeup(rb_vm_thread_t *t); void rb_vm_thread_cancel(rb_vm_thread_t *t); +void rb_vm_thread_raise(rb_vm_thread_t *t, VALUE exc); bool rb_vm_abort_on_exception(void); void rb_vm_set_abort_on_exception(bool flag);

1 0

[1946] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1946 http://trac.macosforge.org/projects/ruby/changeset/1946 Author: lsansonetti(a)apple.com Date: 2009-06-26 23:39:27 -0700 (Fri, 26 Jun 2009) Log Message: ----------- more MT work Modified Paths: -------------- MacRuby/branches/experimental/thread.c MacRuby/branches/experimental/vm.cpp MacRuby/branches/experimental/vm.h Modified: MacRuby/branches/experimental/thread.c =================================================================== --- MacRuby/branches/experimental/thread.c 2009-06-27 06:38:55 UTC (rev 1945) +++ MacRuby/branches/experimental/thread.c 2009-06-27 06:39:27 UTC (rev 1946) @@ -131,31 +131,35 @@ rb_scan_args(argc, argv, "01", &timeout); rb_vm_thread_t *t = GetThreadPtr(self); - if (t->status == THREAD_DEAD) { - return self; - } - - if (timeout == Qnil) { - // No timeout given: block until the thread finishes. - pthread_assert(pthread_join(t->thread, NULL)); - } - else { - // Timeout given: sleep then check if the thread is dead. - // TODO do multiple sleeps instead of only one. - struct timeval tv = rb_time_interval(timeout); - struct timespec ts; - ts.tv_sec = tv.tv_sec; - ts.tv_nsec = tv.tv_usec * 1000; - while (ts.tv_nsec >= 1000000000) { - ts.tv_sec += 1; - ts.tv_nsec -= 1000000000; + if (t->status != THREAD_DEAD) { + if (timeout == Qnil) { + // No timeout given: block until the thread finishes. + pthread_assert(pthread_join(t->thread, NULL)); } - nanosleep(&ts, NULL); - if (t->status != THREAD_DEAD) { - return Qnil; + else { + // Timeout given: sleep then check if the thread is dead. + // TODO do multiple sleeps instead of only one. + struct timeval tv = rb_time_interval(timeout); + struct timespec ts; + ts.tv_sec = tv.tv_sec; + ts.tv_nsec = tv.tv_usec * 1000; + while (ts.tv_nsec >= 1000000000) { + ts.tv_sec += 1; + ts.tv_nsec -= 1000000000; + } + nanosleep(&ts, NULL); + if (t->status != THREAD_DEAD) { + return Qnil; + } } } + // If the thread was terminated because of an exception, we need to + // propagate it. + if (t->exception != Qnil) { + rb_exc_raise(t->exception); + } + return self; } @@ -570,8 +574,7 @@ { rb_vm_thread_t *t = GetThreadPtr(thread); if (t->status == THREAD_DEAD) { - // TODO should return Qnil in case the thread got an exception. - return Qfalse; + return t->exception == Qnil ? Qfalse : Qnil; } return rb_str_new2(rb_thread_status_cstr(thread)); } Modified: MacRuby/branches/experimental/vm.cpp =================================================================== --- MacRuby/branches/experimental/vm.cpp 2009-06-27 06:38:55 UTC (rev 1945) +++ MacRuby/branches/experimental/vm.cpp 2009-06-27 06:39:27 UTC (rev 1946) @@ -4420,9 +4420,11 @@ GC_WB(&t->value, val); } catch (...) { - // TODO handle thread-level exceptions. - //printf("exception raised inside thread %p\n", pthread_self()); - t->value = Qfalse; + VALUE exc = rb_vm_current_exception(); + if (exc != Qnil) { + GC_WB(&t->exception, exc); + } + t->value = Qnil; } pthread_cleanup_pop(0); @@ -4495,6 +4497,7 @@ t->vm = vm; t->value = Qundef; t->locals = Qnil; + t->exception = Qnil; t->status = THREAD_ALIVE; t->in_cond_wait = false; Modified: MacRuby/branches/experimental/vm.h =================================================================== --- MacRuby/branches/experimental/vm.h 2009-06-27 06:38:55 UTC (rev 1945) +++ MacRuby/branches/experimental/vm.h 2009-06-27 06:39:27 UTC (rev 1946) @@ -103,6 +103,7 @@ rb_vm_thread_status_t status; bool in_cond_wait; VALUE locals; // a Hash object or Qnil + VALUE exception; // killed-by-exception or Qnil } rb_vm_thread_t; typedef struct rb_vm_outer {

1 0

[1945] MacRuby/branches/experimental/spec/frozen/core/thread
by source_changes＠macosforge.org 27 Jun '09

27 Jun '09

Revision: 1945 http://trac.macosforge.org/projects/ruby/changeset/1945 Author: lsansonetti(a)apple.com Date: 2009-06-26 23:38:55 -0700 (Fri, 26 Jun 2009) Log Message: ----------- 1.9-related spec work Modified Paths: -------------- MacRuby/branches/experimental/spec/frozen/core/thread/join_spec.rb MacRuby/branches/experimental/spec/frozen/core/thread/value_spec.rb Modified: MacRuby/branches/experimental/spec/frozen/core/thread/join_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/join_spec.rb 2009-06-27 05:57:24 UTC (rev 1944) +++ MacRuby/branches/experimental/spec/frozen/core/thread/join_spec.rb 2009-06-27 06:38:55 UTC (rev 1945) @@ -45,8 +45,17 @@ t.join.should equal(t) end - it "returns the dead thread even if an uncaught exception is thrown from ensure block" do - t = ThreadSpecs.dying_thread_ensures { raise "In dying thread" } - t.join.should equal(t) + ruby_version_is "" ... "1.9" do + it "returns the dead thread even if an uncaught exception is thrown from ensure block" do + t = ThreadSpecs.dying_thread_ensures { raise "In dying thread" } + t.join.should equal(t) + end end + + ruby_version_is "1.9" do + it "raises any uncaught exception encountered in ensure block" do + t = ThreadSpecs.dying_thread_ensures { raise NotImplementedError.new("Just kidding") } + lambda { t.join }.should raise_error(NotImplementedError) + end + end end Modified: MacRuby/branches/experimental/spec/frozen/core/thread/value_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/frozen/core/thread/value_spec.rb 2009-06-27 05:57:24 UTC (rev 1944) +++ MacRuby/branches/experimental/spec/frozen/core/thread/value_spec.rb 2009-06-27 06:38:55 UTC (rev 1945) @@ -11,13 +11,24 @@ lambda { t.value }.should raise_error(RuntimeError, "Hello") end - it "is false for a killed thread" do - t = Thread.new { Thread.current.exit } - t.value.should == false + ruby_version_is "" ... "1.9" do + it "is false for a killed thread" do + t = Thread.new { Thread.current.exit } + t.value.should == false + end end - it "is false for an uncaught exception thrown from a dying thread" do - t = ThreadSpecs.dying_thread_ensures { 1/0 } - t.value.should == false + ruby_version_is "1.9" do + it "is nil for a killed thread" do + t = Thread.new { Thread.current.exit } + t.value.should == nil + end end + + ruby_version_is "" ... "1.9" do + it "is false for an uncaught exception thrown from a dying thread" do + t = ThreadSpecs.dying_thread_ensures { 1/0 } + t.value.should == false + end + end end

1 0