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

[3375] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3375 http://trac.macosforge.org/projects/ruby/changeset/3375 Author: lsansonetti(a)apple.com Date: 2010-01-29 20:33:25 -0800 (Fri, 29 Jan 2010) Log Message: ----------- ignore symbolication entries with no paths Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-01-30 01:33:30 UTC (rev 3374) +++ MacRuby/trunk/vm.cpp 2010-01-30 04:33:25 UTC (rev 3375) @@ -3719,7 +3719,7 @@ if (GET_CORE()->symbolize_call_address(callstack[i], NULL, path, sizeof path, &ln, name, sizeof name) - && name[0] != '\0') { + && name[0] != '\0' && path[0] != '\0') { char entry[PATH_MAX]; if (ln == 0) { snprintf(entry, sizeof entry, "%s:in `%s'",

1 0

[3374] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3374 http://trac.macosforge.org/projects/ruby/changeset/3374 Author: lsansonetti(a)apple.com Date: 2010-01-29 17:33:30 -0800 (Fri, 29 Jan 2010) Log Message: ----------- this function is not needed anymore Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-01-30 01:32:31 UTC (rev 3373) +++ MacRuby/trunk/vm.cpp 2010-01-30 01:33:30 UTC (rev 3374) @@ -3699,13 +3699,6 @@ return Qundef; } -static inline void -rb_vm_rethrow(void) -{ - void *exc = __cxa_allocate_exception(0); - __cxa_throw(exc, NULL, NULL); -} - extern "C" VALUE rb_vm_backtrace(int level)

1 0

[3373] MacRuby/trunk/load.c
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3373 http://trac.macosforge.org/projects/ruby/changeset/3373 Author: lsansonetti(a)apple.com Date: 2010-01-29 17:32:31 -0800 (Fri, 29 Jan 2010) Log Message: ----------- make sure to catch Exception-based exceptions when requiring a file Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2010-01-30 01:31:55 UTC (rev 3372) +++ MacRuby/trunk/load.c 2010-01-30 01:32:31 UTC (rev 3373) @@ -87,6 +87,7 @@ // Load it. const char *fname_str = RSTRING_PTR(fname); +//printf("load %s\n", fname_str); NODE *node = (NODE *)rb_load_file(fname_str); if (node == NULL) { rb_raise(rb_eSyntaxError, "compile error"); @@ -251,10 +252,10 @@ } static VALUE -load_rescue(VALUE path) +load_rescue(VALUE path, VALUE exc) { rb_remove_feature(path); - rb_exc_raise(rb_vm_current_exception()); + rb_exc_raise(exc); return Qnil; } @@ -282,7 +283,8 @@ rb_provide_feature(path); switch (type) { case TYPE_RB: - rb_rescue(load_try, path, load_rescue, path); + rb_rescue2(load_try, path, load_rescue, path, + rb_eException, 0); break; case TYPE_RBO:

1 0

[3372] MacRuby/trunk
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3372 http://trac.macosforge.org/projects/ruby/changeset/3372 Author: lsansonetti(a)apple.com Date: 2010-01-29 17:31:55 -0800 (Fri, 29 Jan 2010) Log Message: ----------- now properly popping exceptions from the VM stack when we unwind from a handler, added blocks symbolication Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-01-30 01:26:55 UTC (rev 3371) +++ MacRuby/trunk/compiler.cpp 2010-01-30 01:31:55 UTC (rev 3372) @@ -1951,15 +1951,17 @@ } void -RoxorCompiler::compile_pop_exception(void) +RoxorCompiler::compile_pop_exception(int pos) { if (popExceptionFunc == NULL) { - // void rb_vm_pop_exception(void); + // void rb_vm_pop_exception(int pos); popExceptionFunc = cast<Function>( module->getOrInsertFunction("rb_vm_pop_exception", - VoidTy, NULL)); + VoidTy, Int32Ty, NULL)); } - CallInst::Create(popExceptionFunc, "", bb); + std::vector<Value *> params; + params.push_back(ConstantInt::get(Int32Ty, pos)); + CallInst::Create(popExceptionFunc, params.begin(), params.end(), "", bb); } void @@ -4886,13 +4888,28 @@ bb = handler_bb; assert(n->nd_body != NULL); + + // Compile the rescue handler within another exception + // handler. + BasicBlock *old_rescue_invoke_bb = rescue_invoke_bb; + BasicBlock *new_rescue_invoke_bb = + BasicBlock::Create(context, "rescue", f); + rescue_invoke_bb = new_rescue_invoke_bb; + Value *header_val = compile_node(n->nd_body); handler_bb = bb; BranchInst::Create(merge_bb, bb); - handlers.push_back(std::pair<Value *, BasicBlock *> (header_val, handler_bb)); + // If the handler raised an exception, pop the previous + // one from the VM stack and rethrow. + bb = new_rescue_invoke_bb; + compile_landing_pad_header(); + compile_pop_exception(1); + compile_rethrow_exception(); + rescue_invoke_bb = old_rescue_invoke_bb; + bb = handler_bb = next_handler_bb; n = n->nd_head; @@ -5050,7 +5067,8 @@ current_loop_begin_bb = loopBB; current_loop_body_bb = bodyBB; current_loop_end_bb = afterBB; - current_loop_exit_val = PHINode::Create(RubyObjTy, "loop_exit", afterBB); + current_loop_exit_val = PHINode::Create(RubyObjTy, + "loop_exit", afterBB); current_loop_exit_val->addIncoming(nilVal, exitBB); bb = bodyBB; Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-01-30 01:26:55 UTC (rev 3371) +++ MacRuby/trunk/compiler.h 2010-01-30 01:31:55 UTC (rev 3372) @@ -321,7 +321,7 @@ void compile_landing_pad_footer(bool pop_exception=true); Value *compile_current_exception(void); void compile_rethrow_exception(void); - void compile_pop_exception(void); + void compile_pop_exception(int pos=0); Value *compile_lvar_slot(ID name); bool compile_lvars(ID *tbl); Value *compile_new_struct(Value *klass, std::vector<Value *> &fields); Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-01-30 01:26:55 UTC (rev 3371) +++ MacRuby/trunk/vm.cpp 2010-01-30 01:31:55 UTC (rev 3372) @@ -271,6 +271,7 @@ extern "C" void *__cxa_allocate_exception(size_t); extern "C" void __cxa_throw(void *, void *, void (*)(void *)); extern "C" void __cxa_rethrow(void); +extern "C" std::type_info *__cxa_current_exception_type(void); RoxorCore::RoxorCore(void) { @@ -553,6 +554,25 @@ #endif } +// Dummy function to be used for debugging (in gdb). +extern "C" +void +rb_symbolicate(void *addr) +{ + void *start = NULL; + char path[1000]; + char name[100]; + unsigned long ln = 0; + if (GET_CORE()->symbolize_call_address(addr, &start, path, sizeof path, + &ln, name, sizeof name)) { + printf("addr %p start %p selector %s location %s:%ld\n", + addr, start, name, path, ln); + } + else { + printf("addr %p unknown\n", addr); + } +} + bool RoxorCore::symbolize_call_address(void *addr, void **startp, char *path, size_t path_len, unsigned long *ln, char *name, size_t name_len) @@ -577,37 +597,40 @@ *startp = start; } - if (name != NULL || path != NULL || ln != NULL) { - std::map<IMP, rb_vm_method_node_t *>::iterator iter = - ruby_imps.find((IMP)start); - if (iter == ruby_imps.end()) { - // TODO symbolize objc selectors - return false; - } - - rb_vm_method_node_t *node = iter->second; + if (f != NULL) { if (ln != NULL) { *ln = 0; - if (f != NULL) { - for (std::vector<RoxorFunction::Line>::iterator iter = - f->lines.begin(); iter != f->lines.end(); ++iter) { - *ln = (*iter).line; - if ((*iter).address <= (uintptr_t)addr) { - break; - } + for (std::vector<RoxorFunction::Line>::iterator iter = + f->lines.begin(); iter != f->lines.end(); ++iter) { + *ln = (*iter).line; + if ((*iter).address <= (uintptr_t)addr) { + break; } } } if (path != NULL) { - if (f != NULL && f->path.size() > 0) { - strncpy(path, f->path.c_str(), path_len); + strncpy(path, f->path.c_str(), path_len); + } + if (name != NULL) { + std::map<IMP, rb_vm_method_node_t *>::iterator iter = + ruby_imps.find((IMP)start); + if (iter == ruby_imps.end()) { + strncpy(name, "block", name_len); } else { - strncpy(path, "core", path_len); + strncpy(name, sel_getName(iter->second->sel), name_len); } } + } + else { + if (ln != NULL) { + *ln = 0; + } + if (path != NULL) { + strncpy(path, "core", path_len); + } if (name != NULL) { - strncpy(name, sel_getName(node->sel), name_len); + name[0] = '\0'; } } @@ -3426,6 +3449,61 @@ #endif } +void +RoxorVM::push_current_exception(VALUE exc) +{ + assert(!NIL_P(exc)); + rb_objc_retain((void *)exc); + current_exceptions.push_back(exc); +//printf("PUSH %p %s\n", (void *)exc, RSTRING_PTR(rb_inspect(exc))); +} + +class RoxorThreadRaiseException { +}; + +static inline bool +current_exception_is_return_from_block(void) +{ + const std::type_info *exc_type = __cxa_current_exception_type(); + return exc_type != NULL + && *exc_type == typeid(RoxorReturnFromBlockException *); +} + +static inline bool +current_exception_is_catch_throw(void) +{ + const std::type_info *exc_type = __cxa_current_exception_type(); + return exc_type != NULL + && *exc_type == typeid(RoxorCatchThrowException *); +} + +static inline bool +current_exception_is_thread_raise(void) +{ + const std::type_info *exc_type = __cxa_current_exception_type(); + return exc_type != NULL + && *exc_type == typeid(RoxorThreadRaiseException *); +} + +void +RoxorVM::pop_current_exception(int pos) +{ + if (current_exception_is_return_from_block() + || current_exception_is_catch_throw() + || current_exception_is_thread_raise()) { + return; + } + + assert((size_t)pos < current_exceptions.size()); + + std::vector<VALUE>::iterator iter = current_exceptions.end() - (pos + 1); + VALUE exc = *iter; + current_exceptions.erase(iter); + + rb_objc_release((void *)exc); +//printf("POP (%d) %p %s\n", pos, (void *)exc, RSTRING_PTR(rb_inspect(exc))); +} + #if !__LP64__ extern "C" void @@ -3465,13 +3543,14 @@ extern "C" VALUE rb_rescue2(VALUE (*b_proc) (ANYARGS), VALUE data1, - VALUE (*r_proc) (ANYARGS), VALUE data2, ...) + VALUE (*r_proc) (ANYARGS), VALUE data2, ...) { try { return (*b_proc)(data1); } catch (...) { - VALUE exc = rb_vm_current_exception(); + RoxorVM *vm = GET_VM(); + VALUE exc = vm->current_exception(); if (exc != Qnil) { va_list ar; VALUE eclass; @@ -3487,8 +3566,9 @@ va_end(ar); if (handled) { + vm->pop_current_exception(); if (r_proc != NULL) { - return (*r_proc)(data2); + return (*r_proc)(data2, exc); } return Qnil; } @@ -3604,16 +3684,6 @@ return vm->pop_broken_with(); } -extern "C" std::type_info *__cxa_current_exception_type(void); - -static inline bool -current_exception_is_return_from_block(void) -{ - const std::type_info *exc_type = __cxa_current_exception_type(); - return exc_type != NULL - && *exc_type == typeid(RoxorReturnFromBlockException *); -} - extern "C" VALUE rb_vm_check_return_from_block_exc(RoxorReturnFromBlockException **pexc, int id) @@ -3652,8 +3722,11 @@ char name[100]; unsigned long ln = 0; + path[0] = name[0] = '\0'; + if (GET_CORE()->symbolize_call_address(callstack[i], NULL, - path, sizeof path, &ln, name, sizeof name)) { + path, sizeof path, &ln, name, sizeof name) + && name[0] != '\0') { char entry[PATH_MAX]; if (ln == 0) { snprintf(entry, sizeof entry, "%s:in `%s'", @@ -3709,7 +3782,7 @@ extern "C" void -rb_vm_pop_exception(void) +rb_vm_pop_exception(int pos) { GET_VM()->pop_current_exception(); } @@ -4435,7 +4508,7 @@ // Killing a thread is implemented using a non-catchable (from Ruby) // exception, which allows us to call the ensure blocks before dying, // which is unfortunately covered in the Ruby specifications. - rb_vm_rethrow(); + throw new RoxorThreadRaiseException(); } static void Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-01-30 01:26:55 UTC (rev 3371) +++ MacRuby/trunk/vm.h 2010-01-30 01:31:55 UTC (rev 3372) @@ -847,13 +847,20 @@ METHOD_MISSING_SUPER } rb_vm_method_missing_reason_t; -// Custome C++ exception for catch/throw blocks +// Custom C++ exception class for catch/throw blocks. class RoxorCatchThrowException { - public: - VALUE throw_symbol; - VALUE throw_value; + public: + VALUE throw_symbol; + VALUE throw_value; }; +// Custom C++ exception class used to implement "return-from-block". +class RoxorReturnFromBlockException { + public: + VALUE val; + int id; +}; + // The VM class is instantiated per thread. There is always at least one // instance. The VM class is purely thread-safe and concurrent, it does not // acquire any lock, except when it calls the Core. @@ -1011,20 +1018,9 @@ ? Qnil : current_exceptions.back(); } - void push_current_exception(VALUE exc) { - assert(!NIL_P(exc)); - rb_objc_retain((void *)exc); - current_exceptions.push_back(exc); - } + void push_current_exception(VALUE exc); + void pop_current_exception(int pos=0); - VALUE pop_current_exception(void) { - assert(!current_exceptions.empty()); - VALUE exc = current_exceptions.back(); - rb_objc_release((void *)exc); - current_exceptions.pop_back(); - return exc; - } - VALUE *get_binding_lvar(ID name, bool create); VALUE ruby_catch(VALUE tag); @@ -1048,13 +1044,6 @@ #define GET_VM() (RoxorVM::current()) #define GET_THREAD() (GetThreadPtr(GET_VM()->get_thread())) -// Custom C++ exception class used to implement "return-from-block". -class RoxorReturnFromBlockException { - public: - VALUE val; - int id; -}; - #endif /* __cplusplus */ #endif /* __VM_H_ */

1 0

[3371] MacRuby/trunk
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3371 http://trac.macosforge.org/projects/ruby/changeset/3371 Author: lsansonetti(a)apple.com Date: 2010-01-29 17:26:55 -0800 (Fri, 29 Jan 2010) Log Message: ----------- register not implemented methods with rb_f_notimplement() Modified Paths: -------------- MacRuby/trunk/dir.c MacRuby/trunk/file.c MacRuby/trunk/gc.c MacRuby/trunk/io.c MacRuby/trunk/process.c Modified: MacRuby/trunk/dir.c =================================================================== --- MacRuby/trunk/dir.c 2010-01-30 01:25:56 UTC (rev 3370) +++ MacRuby/trunk/dir.c 2010-01-30 01:26:55 UTC (rev 3371) @@ -528,20 +528,20 @@ * d.read #=> "." * d.tell #=> 12 */ +#ifdef HAVE_TELLDIR static VALUE dir_tell(VALUE dir, SEL sel) { -#ifdef HAVE_TELLDIR struct dir_data *dirp; long pos; GetDIR(dir, dirp); pos = telldir(dirp->dir); return rb_int2inum(pos); +} #else - rb_notimplement(); +# define dir_tell rb_f_notimplement #endif -} /* * call-seq: @@ -557,6 +557,7 @@ * d.seek(i) #=> #<Dir:0x401b3c40> * d.read #=> ".." */ +#ifdef HAVE_SEEKDIR static VALUE dir_seek(VALUE dir, SEL sel, VALUE pos) { @@ -564,13 +565,12 @@ off_t p = NUM2OFFT(pos); GetDIR(dir, dirp); -#ifdef HAVE_SEEKDIR seekdir(dirp->dir, p); return dir; +} #else - rb_notimplement(); +# define dir_seek rb_f_notimplement #endif -} /* * call-seq: @@ -797,10 +797,10 @@ * platforms. On Unix systems, see <code>chroot(2)</code> for more * information. */ +#if defined(HAVE_CHROOT) && !defined(__CHECKER__) static VALUE dir_s_chroot(VALUE dir, SEL sel, VALUE path) { -#if defined(HAVE_CHROOT) && !defined(__CHECKER__) const char *path_cstr = RSTRING_PTR(path); check_dirname(&path); @@ -809,11 +809,10 @@ rb_sys_fail(path_cstr); return INT2FIX(0); +} #else - rb_notimplement(); - return Qnil; /* not reached */ +# define dir_s_chroot rb_f_notimplement #endif -} /* * call-seq: Modified: MacRuby/trunk/file.c =================================================================== --- MacRuby/trunk/file.c 2010-01-30 01:25:56 UTC (rev 3370) +++ MacRuby/trunk/file.c 2010-01-30 01:26:55 UTC (rev 3371) @@ -831,25 +831,26 @@ * f.stat.size #=> 66 */ +#if HAVE_LSTAT static VALUE rb_file_lstat(VALUE obj, SEL sel) { -// #ifdef HAVE_LSTAT -// rb_io_t *fptr; -// struct stat st; -// -// rb_secure(2); -// GetOpenFile(obj, fptr); -// if (!fptr->path) return Qnil; -// if (lstat(fptr->path, &st) == -1) { -// rb_sys_fail(fptr->path); -// } -// return stat_new(&st); -// #else -// return rb_io_stat(obj, 0); -// #endif - rb_notimplement(); + rb_io_t *fptr; + struct stat st; + + rb_secure(2); + GetOpenFile(obj, fptr); + if (fptr->path == NULL) { + return Qnil; + } + if (lstat(RSTRING_PTR(fptr->path), &st) == -1) { + rb_sys_fail(RSTRING_PTR(fptr->path)); + } + return stat_new(&st); } +#else +# define rb_file_lstat rb_f_notimplement +#endif #ifndef HAVE_GROUP_MEMBER static int @@ -1843,12 +1844,7 @@ return LONG2FIX(n); } #else -static VALUE -rb_file_s_lchmod(int argc, VALUE *argv) -{ - rb_notimplement(); - return Qnil; /* not reached */ -} +# define rb_file_s_lchmod rb_f_notimplement #endif struct chown_args { @@ -1983,11 +1979,7 @@ return LONG2FIX(n); } #else -static VALUE -rb_file_s_lchown(int argc, VALUE *argv) -{ - rb_notimplement(); -} +# define rb_file_s_lchown rb_f_notimplement #endif struct timespec rb_time_timespec(VALUE time); @@ -2128,10 +2120,10 @@ * IO.readlines(".testfile")[0] #=> "This is line one\n" */ +#ifdef HAVE_LINK static VALUE rb_file_s_link(VALUE klass, SEL sel, VALUE from, VALUE to) { -#ifdef HAVE_LINK rb_secure(2); FilePathValue(from); FilePathValue(to); @@ -2140,11 +2132,10 @@ sys_fail2(from, to); } return INT2FIX(0); +} #else - rb_notimplement(); - return Qnil; /* not reached */ +# define rb_file_s_link rb_f_notimplement #endif -} /* * call-seq: @@ -2158,10 +2149,10 @@ * */ +#ifdef HAVE_SYMLINK static VALUE rb_file_s_symlink(VALUE klass, SEL sel, VALUE from, VALUE to) { -#ifdef HAVE_SYMLINK rb_secure(2); FilePathValue(from); FilePathValue(to); @@ -2170,11 +2161,10 @@ sys_fail2(from, to); } return INT2FIX(0); +} #else - rb_notimplement(); - return Qnil; /* not reached */ +# define rb_file_s_symlink rb_f_notimplement #endif -} /* * call-seq: @@ -2187,10 +2177,10 @@ * File.readlink("link2test") #=> "testfile" */ +#ifdef HAVE_READLINK static VALUE rb_file_s_readlink(VALUE klass, SEL sel, VALUE path) { -#ifdef HAVE_READLINK char *buf; int size = 100; int rv; @@ -2215,11 +2205,10 @@ xfree(buf); return v; +} #else - rb_notimplement(); - return Qnil; /* not reached */ +# define rb_file_s_readlink rb_f_notimplement #endif -} static void unlink_internal(const char *path, void *arg) Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-01-30 01:25:56 UTC (rev 3370) +++ MacRuby/trunk/gc.c 2010-01-30 01:26:55 UTC (rev 3371) @@ -66,12 +66,15 @@ * returns current status of GC stress mode. */ +#if 0 static VALUE gc_stress_get(VALUE self, SEL sel) { - rb_notimplement(); return Qnil; } +#else +# define gc_stress_get rb_f_notimplement +#endif /* * call-seq: @@ -85,12 +88,15 @@ * Since it makes Ruby very slow, it is only for debugging. */ +#if 0 static VALUE gc_stress_set(VALUE self, SEL sel, VALUE flag) { - rb_notimplement(); return Qnil; } +#else +# define gc_stress_set rb_f_notimplement +#endif static int garbage_collect(void); Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2010-01-30 01:25:56 UTC (rev 3370) +++ MacRuby/trunk/io.c 2010-01-30 01:26:55 UTC (rev 3371) @@ -1037,11 +1037,15 @@ * */ +#if 0 static VALUE io_read_nonblock(VALUE io, SEL sel, int argc, VALUE *argv) { - rb_notimplement(); + return Qnil; } +#else +# define io_read_nonblock rb_f_notimplement +#endif /* * call-seq: @@ -1060,11 +1064,15 @@ * */ +#if 0 static VALUE rb_io_write_nonblock(VALUE io, SEL sel, VALUE str) { - rb_notimplement(); + return Qnil; } +#else +# define rb_io_write_nonblock rb_f_notimplement +#endif /* * call-seq: @@ -1983,7 +1991,7 @@ prepare_getline_args(argc, argv, &rs, &limit, io); return rb_io_getline_1(rs, limit, io); #endif - rb_notimplement(); + rb_notimplement(); } VALUE Modified: MacRuby/trunk/process.c =================================================================== --- MacRuby/trunk/process.c 2010-01-30 01:25:56 UTC (rev 3370) +++ MacRuby/trunk/process.c 2010-01-30 01:26:55 UTC (rev 3371) @@ -2378,6 +2378,7 @@ * fork doesn't copy other threads. */ +#if 0 static VALUE rb_f_fork(VALUE obj, SEL sel) { @@ -2385,8 +2386,6 @@ rb_secure(2); - rb_raise(rb_eRuntimeError, "fork is not supported yet"); - switch (pid = rb_fork(0, 0, 0, Qnil)) { case 0: //rb_thread_atfork(); @@ -2406,6 +2405,9 @@ return PIDT2NUM(pid); } } +#else +# define rb_f_fork rb_f_notimplement +#endif /*

1 0

[3370] MacRuby/trunk/variable.c
by source_changes＠macosforge.org 30 Jan '10

30 Jan '10

Revision: 3370 http://trac.macosforge.org/projects/ruby/changeset/3370 Author: lsansonetti(a)apple.com Date: 2010-01-29 17:25:56 -0800 (Fri, 29 Jan 2010) Log Message: ----------- fixed an autoload bug from a mixed module Modified Paths: -------------- MacRuby/trunk/variable.c Modified: MacRuby/trunk/variable.c =================================================================== --- MacRuby/trunk/variable.c 2010-01-29 23:40:14 UTC (rev 3369) +++ MacRuby/trunk/variable.c 2010-01-30 01:25:56 UTC (rev 3370) @@ -56,6 +56,8 @@ 0, retain_cb, release_cb, NULL, NULL }; +static SEL selRequire = 0; + void Init_var_tables(void) { @@ -66,6 +68,7 @@ autoload = rb_intern("__autoload__"); classpath = rb_intern("__classpath__"); tmp_classpath = rb_intern("__tmp_classpath__"); + selRequire = sel_registerName("require:"); } struct fc_result { @@ -1483,6 +1486,11 @@ if (!load || !(file = load->nd_lit)) { return Qfalse; } + if (false) { + // XXX Apparently RubySpec does not want us to do that... + return rb_vm_call(*(VALUE *)rb_mKernel, selRequire, 1, &file, + false); + } return rb_require_safe(file, load->nd_nth); } @@ -1569,7 +1577,7 @@ if (!RTEST(rb_autoload_load(tmp, id))) { break; } - continue; + goto retry; } if (exclude && tmp == rb_cObject && klass != rb_cObject) { rb_warn("toplevel constant %s referenced by %s::%s", @@ -1593,7 +1601,7 @@ if (!RTEST(rb_autoload_load(mod, id))) { break; } - continue; + goto retry; } return rb_vm_resolve_const_value(value, klass, id); }

1 0

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

29 Jan '10

Revision: 3369 http://trac.macosforge.org/projects/ruby/changeset/3369 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:14 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Initial lib dispatch specs Added Paths: ----------- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb Added: MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/library/dispatch/actor_spec.rb 2010-01-29 23:40:14 UTC (rev 3369) @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../../spec_helper" +require 'dispatch' + +if MACOSX_VERSION >= 10.6 + describe "Dispatch::Actor" do + it "should do something" do + true.should == true + end + end +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/library/dispatch/dispatch_spec.rb 2010-01-29 23:40:14 UTC (rev 3369) @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../../spec_helper" +require 'dispatch' + +if MACOSX_VERSION >= 10.6 + describe "Dispatch methods" do + it "should do something" do + true.should == true + end + end +end \ No newline at end of file Added: MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/library/dispatch/future_spec.rb 2010-01-29 23:40:14 UTC (rev 3369) @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + "/../../spec_helper" +require 'dispatch' + +if MACOSX_VERSION >= 10.6 + describe "Dispatch::Future" do + it "should do something" do + true.should == true + end + end +end \ No newline at end of file

1 0

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

29 Jan '10

Revision: 3368 http://trac.macosforge.org/projects/ruby/changeset/3368 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:12 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Fixed lib dispatch syntax errors Modified Paths: -------------- MacRuby/trunk/lib/dispatch/actor.rb MacRuby/trunk/lib/dispatch/dispatch.rb MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/lib/dispatch.rb Modified: MacRuby/trunk/lib/dispatch/actor.rb =================================================================== --- MacRuby/trunk/lib/dispatch/actor.rb 2010-01-29 23:40:10 UTC (rev 3367) +++ MacRuby/trunk/lib/dispatch/actor.rb 2010-01-29 23:40:12 UTC (rev 3368) @@ -5,8 +5,9 @@ # Note that this will NOT work for methods that themselves expect a block class Actor - instance_methods.each |method| - undef_method(method) unless method =~ /__(.+)__|method_missing/ + CRITICAL = /__(.+)__|method_missing|object_id/ + instance_methods.each do |method| + undef_method(method) unless method =~ CRITICAL end # Create an Actor to wrap the given +actee+, @@ -41,7 +42,7 @@ end def method_missing(symbol, *args, &block) - if block_given? || not group.nil? + if block_given? or not @group.nil? callback = @callback @q.async(@group) do retval = @actee.__send__(symbol, *args) @@ -54,5 +55,6 @@ return @retval end end + end end Modified: MacRuby/trunk/lib/dispatch/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch/dispatch.rb 2010-01-29 23:40:10 UTC (rev 3367) +++ MacRuby/trunk/lib/dispatch/dispatch.rb 2010-01-29 23:40:12 UTC (rev 3368) @@ -49,7 +49,7 @@ # providing an API similar to that used by +Threads+ # if a block is given, instead uses +notify+ to call it asynchronously def join(&block) - block_given? ? notify &block : wait + block_given? ? notify(&block) : wait end end Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:10 UTC (rev 3367) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-01-29 23:40:12 UTC (rev 3368) @@ -54,8 +54,8 @@ def p_find(&block) @found = Dispatch.wrap(nil) self.p_each do |obj| - found? = @found.nil? ? block.call(obj) : nil - @found = obj if found? and @found.nil? + found = @found.nil? ? block.call(obj) : nil + @found = obj if found and @found.nil? end @found._done # will this leak? end Modified: MacRuby/trunk/lib/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:10 UTC (rev 3367) +++ MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:12 UTC (rev 3368) @@ -12,11 +12,9 @@ # This library provides higher-level services and convenience methods # to make it easier for traditional Ruby programmers to add multicore support. -raise "Dispatch only works on Mac OS X 10.6 or later" if MACOSX_VERSION < 10.6 - require 'dispatch/actor' require 'dispatch/dispatch' require 'dispatch/enumerable' -require 'dispatch/futures' +require 'dispatch/future' require 'dispatch/queue' require 'dispatch/queue_source'

1 0

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

29 Jan '10

Revision: 3367 http://trac.macosforge.org/projects/ruby/changeset/3367 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:10 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Added header comments Modified Paths: -------------- MacRuby/trunk/lib/dispatch/queue.rb MacRuby/trunk/lib/dispatch/queue_source.rb Modified: MacRuby/trunk/lib/dispatch/queue.rb =================================================================== --- MacRuby/trunk/lib/dispatch/queue.rb 2010-01-29 23:40:08 UTC (rev 3366) +++ MacRuby/trunk/lib/dispatch/queue.rb 2010-01-29 23:40:10 UTC (rev 3367) @@ -1,3 +1,5 @@ +# Adds convenience methods to Queues + module Dispatch class Queue # Combines +&block+ up to +stride+ times before passing to Queue::Apply Modified: MacRuby/trunk/lib/dispatch/queue_source.rb =================================================================== --- MacRuby/trunk/lib/dispatch/queue_source.rb 2010-01-29 23:40:08 UTC (rev 3366) +++ MacRuby/trunk/lib/dispatch/queue_source.rb 2010-01-29 23:40:10 UTC (rev 3367) @@ -1,3 +1,5 @@ +# Adds convenience methods to Queues for creating Sources + module Dispatch class Source @@proc_events = {

1 0

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

29 Jan '10

Revision: 3366 http://trac.macosforge.org/projects/ruby/changeset/3366 Author: ernest.prabhakar(a)gmail.com Date: 2010-01-29 15:40:08 -0800 (Fri, 29 Jan 2010) Log Message: ----------- Rename futures to future to match class name Modified Paths: -------------- MacRuby/trunk/lib/dispatch.rb Added Paths: ----------- MacRuby/trunk/lib/dispatch/future.rb Removed Paths: ------------- MacRuby/trunk/lib/dispatch/futures.rb Copied: MacRuby/trunk/lib/dispatch/future.rb (from rev 3365, MacRuby/trunk/lib/dispatch/futures.rb) =================================================================== --- MacRuby/trunk/lib/dispatch/future.rb (rev 0) +++ MacRuby/trunk/lib/dispatch/future.rb 2010-01-29 23:40:08 UTC (rev 3366) @@ -0,0 +1,24 @@ +# Calculate the value of an object in the background + +module Dispatch + # Wrapper around Dispatch::Group used to implement lazy Futures + class Future + # Create a future that asynchronously dispatches the block + # to a concurrent queue of the specified (optional) +priority+ + def initialize(priority=nil, &block) + @value = nil + @group = Dispatch.fork(priority) { @value = block.call } + end + + # Waits for the computation to finish, then returns the value + # Duck-typed to lambda.call(void) + # If a block is passed, invoke that asynchronously with the final value + def call(&callback) + if not block_given? + @group.wait + return @value + end + @group.notify { callback.call(@value) } + end + end +end Deleted: MacRuby/trunk/lib/dispatch/futures.rb =================================================================== --- MacRuby/trunk/lib/dispatch/futures.rb 2010-01-29 23:40:06 UTC (rev 3365) +++ MacRuby/trunk/lib/dispatch/futures.rb 2010-01-29 23:40:08 UTC (rev 3366) @@ -1,22 +0,0 @@ -module Dispatch - # Wrapper around Dispatch::Group used to implement lazy Futures - class Future - # Create a future that asynchronously dispatches the block - # to a concurrent queue of the specified (optional) +priority+ - def initialize(priority=nil, &block) - @value = nil - @group = Dispatch.fork(priority) { @value = block.call } - end - - # Waits for the computation to finish, then returns the value - # Duck-typed to lambda.call(void) - # If a block is passed, invoke that asynchronously with the final value - def call(&callback) - if not block_given? - @group.wait - return @value - end - @group.notify { callback.call(@value) } - end - end -end Modified: MacRuby/trunk/lib/dispatch.rb =================================================================== --- MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:06 UTC (rev 3365) +++ MacRuby/trunk/lib/dispatch.rb 2010-01-29 23:40:08 UTC (rev 3366) @@ -3,7 +3,7 @@ # # Copyright (C) 2010 Apple, Inc. # -# == Overview +# == Overview == # # Grand Central Dispatch (GCD) is a novel approach to multicore computing # first released in Mac OS X version 10.6 Snow Leopard. @@ -12,11 +12,11 @@ # This library provides higher-level services and convenience methods # to make it easier for traditional Ruby programmers to add multicore support. -raise "Dispatch will only work on Mac OS X 10.6 or later" if MACOSX_VERSION < 10.6 +raise "Dispatch only works on Mac OS X 10.6 or later" if MACOSX_VERSION < 10.6 require 'dispatch/actor' require 'dispatch/dispatch' +require 'dispatch/enumerable' +require 'dispatch/futures' require 'dispatch/queue' require 'dispatch/queue_source' -require 'dispatch/enumerable' -require 'dispatch/futures'

1 0