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

[3130] MacRuby/trunk/TODO
by source_changes＠macosforge.org 18 Dec '09

18 Dec '09

Revision: 3130 http://trac.macosforge.org/projects/ruby/changeset/3130 Author: lsansonetti(a)apple.com Date: 2009-12-17 17:55:13 -0800 (Thu, 17 Dec 2009) Log Message: ----------- refreshed Modified Paths: -------------- MacRuby/trunk/TODO Modified: MacRuby/trunk/TODO =================================================================== --- MacRuby/trunk/TODO 2009-12-18 01:51:01 UTC (rev 3129) +++ MacRuby/trunk/TODO 2009-12-18 01:55:13 UTC (rev 3130) @@ -6,7 +6,7 @@ [/] frozen, stable and documented GCD API [ ] non-ASCII regexp [/] 32-bit should be back -[ ] macruby should support #require calls when assembling a binary +[X] macruby should support #require calls when assembling a binary For 0.5 (must do):

1 0

[3129] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 18 Dec '09

18 Dec '09

Revision: 3129 http://trac.macosforge.org/projects/ruby/changeset/3129 Author: lsansonetti(a)apple.com Date: 2009-12-17 17:51:01 -0800 (Thu, 17 Dec 2009) Log Message: ----------- fixed format of the -C example Modified Paths: -------------- MacRuby/trunk/rubyc.1 Modified: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 2009-12-17 22:14:07 UTC (rev 3128) +++ MacRuby/trunk/rubyc.1 2009-12-18 01:51:01 UTC (rev 3129) @@ -74,7 +74,7 @@ The easiest way to compile an existing project is probably to generate loadable object bundles for every Ruby source file, using the .Fl C option. These bundles are using the .rbo file extension and can simply be installed in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files in priority upon #require calls. The source files can later be removed. -.Dl $ find src/lib -name "*.rb" -exec rubyc -C {} \; +.Dl $ find src/lib -name """*.rb""" -exec rubyc -C {} \e; .Pp .Nm rubyc without any option will create a binary executable, like the C compiler.

1 0

[3128] MacRuby/trunk/rubyc.1
by source_changes＠macosforge.org 17 Dec '09

17 Dec '09

Revision: 3128 http://trac.macosforge.org/projects/ruby/changeset/3128 Author: lsansonetti(a)apple.com Date: 2009-12-17 14:14:07 -0800 (Thu, 17 Dec 2009) Log Message: ----------- added macrubyc man page (draft) Added Paths: ----------- MacRuby/trunk/rubyc.1 Added: MacRuby/trunk/rubyc.1 =================================================================== --- MacRuby/trunk/rubyc.1 (rev 0) +++ MacRuby/trunk/rubyc.1 2009-12-17 22:14:07 UTC (rev 3128) @@ -0,0 +1,107 @@ +.Dd December 16, 2009 +.Dt RUBYC 1 +.Os +.Sh NAME +.Nm rubyc +.Nd MacRuby Ahead-of-Time Compiler +.Sh SYNOPSIS +.Nm rubyc +.Op Ar options... +.Ar files... +.Sh DESCRIPTION +.Nm rubyc +is a command-line interface to the MacRuby Ahead-of-Time (AOT) compiler. It allows static compilation of Ruby source code into machine code objects, dynamic libraries or executables. +.Pp +The Ahead-of-Time compilation process has two major advantages; the Ruby code does not need to be parsed and compiled at runtime, which improves the startup time of the program, and the original Ruby source code is no longer available as is since it has been compiled down to machine code. +.Sh OPTIONS +The +.Nm rubyc +tool accepts the following command-line options: +.Bl -tag -width "123" -compact +.Pp +.It Fl o Ar file +Place the output into +.Ar file . +If this option is not given, +.Nm rubyc +will try to determine a default output file name based on the object file type that is being generated. For executables, the default is a.out. For objects, the default is the original source file name with the object type extension. For dynamic libraries, this option is mandatory. +.Pp +.It Fl c +Compile and assemble, but do not link. This option produces a Mach-O object file (.o) for every Ruby source file passed to +.Nm rubyc , +using a default file name which consists of the source file name with the .o file extension. Such a file can later be passed to +.Nm rubyc +to create a dynamic library or executable. +.Pp +.It Fl C +Compile, assemble and link a loadable object file. This option produces a Mach-O MacRuby loadable object bundle (.rbo) for every Ruby source file passed to +.Mm rubyc , +using a default file name which consists of the source file name with the .rbo file extension. A MacRuby loadable object is a Mach-O bundle compiled with a global constructor that will evaluate the Ruby machine code once it's loaded by the dynamic linker, at runtime, generally upon a Ruby #require statement. +.Pp +.It Fl -static +Create a standalone, static executable. By default, executables created by +.Nm rubyc +are dynamically linking against the MacRuby runtime. This option will generate executables that are statically linking against the MacRuby runtime, significantly increasing the binary size but allowing its distribution on environments where MacRuby is not installed. This option can only be used when creating executables. +.Pp +.It Fl -dylib +Create a dynamic library instead of an executable. This option compiles every Ruby source file passed to +.Nm rubyc +and produces a Mach-O dynamic library (.dylib). This library is compiled with a global constructor that will register every Ruby machine code file into the MacRuby runtime once it's loaded by the dynamic linker, at runtime. This library is intended to be linked against an executable that uses the MacRuby runtime, for example executables generated by +.Nm rubyc . +The +.Fl o +option must be provided when building dynamic libraries. +.Pp +.It Fl a Ar arch, Fl -arch Ar arch +Compile for specified CPU architecture. By default, +.Nm rubyc +will compile for the current CPU architecture. This option will compile for a different architecture. When this option is provided more than once, +.Nm rubyc +will create a universal binary. At the time of this writing, only the i386 and x86_64 architectures are supported. +.Pp +.It Fl v, Fl -version +Display the version. +.Pp +.It Fl V, Fl -verbose +Print every command line executed by +.Nm rubyc . +This option is generally used for internal debugging. +.Pp +.It Fl h, Fl -help +Display a short description of the command line options. +.El +.Sh EXAMPLES +The easiest way to compile an existing project is probably to generate loadable object bundles for every Ruby source file, using the +.Fl C +option. These bundles are using the .rbo file extension and can simply be installed in the same directory as the original .rb source files. The MacRuby runtime will always pick .rbo files in priority upon #require calls. The source files can later be removed. +.Dl $ find src/lib -name "*.rb" -exec rubyc -C {} \; +.Pp +.Nm rubyc +without any option will create a binary executable, like the C compiler. +.Dl $ echo """p 42""" > test.rb +.Dl $ rubyc test.rb +.Dl $ ./a.out +.Pp +When building an executable, the very first file passed to +.Nm rubyc +will be considered as the main file and its machine code will be ran once the executable starts. Other machine code files will be linked into the executable but only ran upon #require calls. +.Dl $ echo """def t1; 21; end""" > t1.rb +.Dl $ echo """def t2; 21; end""" > t2.rb +.Dl $ echo """require 't1'; require 't2'; p t1+t2""" > test.rb +.Dl $ rubyc test.rb t1.rb t2.rb -o test +.Dl $ ./test +.Pp +.Nm rubyc +is also able to generate a dynamic library (.dylib) out of Ruby source files, using the +.Fl -dylib +option. Such a library can later be linked against an executable that uses the MacRuby runtime. Like executables, the Ruby machine code files will ran upon #require calls. Libraries can also be passed to +.Nm rubyc +when forming an executable, allowing the compilation of multiple executables sharing common code. +.Dl $ rubyc t1.rb t2.rb -o code.dylib --dylib +.Dl $ rubyc test.rb code.dylib -o test +.Dl $ ./test +.Pp +.Sh SEE ALSO +.Xr ruby 1 +.Xr irb 1 +.Xr ruby_deploy 1

1 0

[3127] MacRuby/trunk/bin/rubyc
by source_changes＠macosforge.org 17 Dec '09

17 Dec '09

Revision: 3127 http://trac.macosforge.org/projects/ruby/changeset/3127 Author: lsansonetti(a)apple.com Date: 2009-12-17 13:36:52 -0800 (Thu, 17 Dec 2009) Log Message: ----------- when generating the feature name out of an object file, strip the trailing ./ if needed and warn if the path is absolute Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2009-12-17 02:37:03 UTC (rev 3126) +++ MacRuby/trunk/bin/rubyc 2009-12-17 21:36:52 UTC (rev 3127) @@ -78,15 +78,16 @@ if @files.size > 1 and @output die "Cannot specify -o with -c or -C and multiple input files" end - file = @files[0] - if File.extname(file) != '.rb' - die "Given input file `#{file}' must be a Ruby source file (.rb)" + @files.each do |file| + if File.extname(file) != '.rb' + die "Given input file `#{file}' must be a Ruby source file (.rb)" + end + if @bundle + compile_bundle(file, @output) + else + compile_object(file, @output) + end end - if @bundle - compile_bundle(file, @output) - else - compile_object(file, @output) - end else die "Cannot specify --static and --dylib at the same time" if @dylib and @static objs = @files.map do |file| @@ -326,7 +327,17 @@ end def feature_name(obj) - obj.sub(/#{File.extname(obj)}$/, '') + # Remove trailing ./ if exists. + if obj[0..1] == './' + obj[0..1] = '' + end + + if obj[0] == '/' + $stderr.puts "warning: object file path `#{obj}' is absolute and not relative, this might cause a problem later at runtime" + end + + # Strip the extension. + obj = obj.sub(/#{File.extname(obj)}$/, '') end def gen_tmpfile(base, ext)

1 0

[3126] MacRuby/trunk
by source_changes＠macosforge.org 17 Dec '09

17 Dec '09

Revision: 3126 http://trac.macosforge.org/projects/ruby/changeset/3126 Author: lsansonetti(a)apple.com Date: 2009-12-16 18:37:03 -0800 (Wed, 16 Dec 2009) Log Message: ----------- support LLVM's ToT, do not emit buggy subprogram dwarf entries, make sure basename and dirname fields of dwarf compile unit entries are good Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-12-16 22:40:49 UTC (rev 3125) +++ MacRuby/trunk/compiler.cpp 2009-12-17 02:37:03 UTC (rev 3126) @@ -3115,11 +3115,16 @@ bb = BasicBlock::Create(context, "MainBlock", f); DISubprogram old_debug_subprogram = debug_subprogram; +#if 0 + // This is not the right way to emit subprogram DWARF entries, + // llc emits some assembly that doesn't compile because some + // symbols are duplicated. debug_subprogram = debug_info->CreateSubprogram( debug_compile_unit, f->getName(), f->getName(), f->getName(), debug_compile_unit, nd_line(node), DIType(), f->hasInternalLinkage(), true); debug_info->InsertSubprogramStart(debug_subprogram, bb); +#endif std::map<ID, Value *> old_lvars = lvars; lvars.clear(); @@ -5311,6 +5316,8 @@ return NULL; } +#include <libgen.h> + void RoxorCompiler::set_fname(const char *_fname) { @@ -5318,8 +5325,29 @@ fname = _fname; if (fname != NULL) { + // Compute complete path. + char path[PATH_MAX]; + if (*_fname == '/') { + strncpy(path, _fname, sizeof path); + } + else { + char cwd[PATH_MAX]; + getcwd(cwd, sizeof cwd); + snprintf(path, sizeof path, "%s/%s", cwd, _fname); + } + + // Split the path into 2 parts: the directory and the base. + char *dir = dirname(path); + char *base = basename(path); + + // LLVM (llc) really doesn't like when you pass empty strings for + // these values and might later throw a cryptic C++ exception that + // will take hours to investigate. How fun. + assert(strlen(dir) > 0); + assert(strlen(base) > 0); + debug_compile_unit = debug_info->CreateCompileUnit(DW_LANG_Ruby, - fname, "", RUBY_DESCRIPTION, false, false, ""); + base, dir, RUBY_DESCRIPTION, false, false, ""); } } } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-16 22:40:49 UTC (rev 3125) +++ MacRuby/trunk/vm.cpp 2009-12-17 02:37:03 UTC (rev 3126) @@ -242,8 +242,13 @@ for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator iter = Details.LineStarts.begin(); iter != Details.LineStarts.end(); ++iter) { DebugLocTuple dlt = Details.MF->getDebugLocTuple(iter->Loc); if (file.size() == 0) { +#if LLVM_TOT + DICompileUnit unit(dlt.Scope); + file.append(unit.getFilename()); +#else DICompileUnit unit(dlt.CompileUnit); unit.getFilename(file); +#endif assert(file.size() != 0); } @@ -3797,7 +3802,6 @@ RoxorCompiler::shared->set_fname(RSTRING_PTR(rb_progname)); Function *f = RoxorCompiler::shared->compile_main_function(node); f->setName(RSTRING_PTR(ruby_aot_init_func)); - GET_CORE()->optimize(f); // Force a module verification. if (verifyModule(*RoxorCompiler::module, PrintMessageAction)) { @@ -3805,6 +3809,9 @@ exit(1); } + // Optimize the IR. + GET_CORE()->optimize(f); + // Dump the bitcode. std::string err; const char *output = RSTRING_PTR(ruby_aot_compile);

1 0

[3125] MacRuby/trunk
by source_changes＠macosforge.org 16 Dec '09

16 Dec '09

Revision: 3125 http://trac.macosforge.org/projects/ruby/changeset/3125 Author: lsansonetti(a)apple.com Date: 2009-12-16 14:40:49 -0800 (Wed, 16 Dec 2009) Log Message: ----------- added support for AOT compiled source code objects in #require Modified Paths: -------------- MacRuby/trunk/bin/rubyc MacRuby/trunk/load.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2009-12-15 06:27:31 UTC (rev 3124) +++ MacRuby/trunk/bin/rubyc 2009-12-16 22:40:49 UTC (rev 3125) @@ -15,7 +15,6 @@ def initialize(argv) @mode = :normal @archs = [] - @frameworks = [] @internal = argv.delete('--internal') # Parse arguments. @@ -24,8 +23,8 @@ opts.on('-c', 'Compile and assemble, but do not link') { @dont_link = true } opts.on('-o <file>', 'Place the output into <file>') { |output| @output = output } #opts.on('--mode [MODE]', "Select compilation mode (normal or full)") { |mode| @mode = mode.intern } - #opts.on('--framework <framework>', 'Link against <framework>') { |path| @frameworks << path } - opts.on('--static', "Create a standalone static executable") { @static = true } + opts.on('--static', "Create a standalone static executable") { @static = true } + opts.on('--dylib', "Create a dynamic library") { @dylib = true } opts.on('-C', 'Compile, assemble and link a loadable object file') { @bundle = true } opts.on('-a', '--arch <ARCH>', 'Compile for specified CPU architecture') { |arch| @archs << arch } opts.on('-v', '--version', 'Display the version') { puts RUBY_DESCRIPTION; exit 1 } @@ -74,6 +73,7 @@ end if @dont_link or @bundle die "Cannot specify --static when not building an executable" if @static + die "Cannot specify -c or -C when building a dynamic library" if @dylib die "Cannot specify -c and -C at the same time" if @bundle and @dont_link if @files.size > 1 and @output die "Cannot specify -o with -c or -C and multiple input files" @@ -88,18 +88,26 @@ compile_object(file, @output) end else + die "Cannot specify --static and --dylib at the same time" if @dylib and @static objs = @files.map do |file| + die "Given input file `#{file} must exist" unless File.exist?(file) case File.extname(file) when '.rb' compile_object(file, nil) when '.o' - die "Given input file `#{file} must exist" unless File.exist?(file) - file + [file, find_init_func(file)] + when '.dylib' + [file, nil] else - die "Given input file `#{file}' must be either a Ruby source file (.rb) or a Mach-O object file (.o)" + die "Given input file `#{file}' must be either a Ruby source file (.rb) or a Mach-O object file (.o) or dynamic library (.dylib)" end end - compile_executable(objs, @output) + if @dylib + die "-o must be specified when building a dynamic library" unless @output + compile_dylib(objs, @output) + else + compile_executable(objs, @output) + end end end @@ -149,6 +157,7 @@ output ||= File.join(File.dirname(file), base + '.rbo') + # Generate main file. main_txt = <<EOS extern "C" { void *#{init_func}(void *, void *); @@ -159,18 +168,43 @@ } EOS + # Build. main = gen_tmpfile('main', 'c') File.open(main, 'w') { |io| io.write(main_txt) } linkf = @internal ? "-L. -lmacruby" : "-framework MacRuby" - archf = @archs.map { |x| "-arch #{x}" }.join(' ') - execute("#{@gcxx} \"#{main}\" -dynamic -bundle -undefined suppress -flat_namespace #{archf} #{linkf} \"#{obj}\" -o \"#{output}\"") + execute("#{@gcxx} \"#{main}\" -dynamic -bundle -undefined suppress -flat_namespace #{arch_flags} #{linkf} \"#{obj}\" -o \"#{output}\"") end + def compile_dylib(objs_data, output) + # Generate main file. + main_txt = <<EOS +extern "C" { + void rb_vm_aot_feature_provide(const char *, void *); +EOS + objs_data.each do |obj, init_func| + next if init_func == nil + main_txt << "void *#{init_func}(void *, void *);\n" + end + main_txt << <<EOS +__attribute__((constructor)) static void __init__(void) { +EOS + objs_data.each do |obj, init_func| + main_txt << "rb_vm_aot_feature_provide(\"#{feature_name(obj)}\", (void *)#{init_func});\n" + end + main_txt << "}}" + + # Build. + main = gen_tmpfile('main', 'c') + File.open(main, 'w') { |io| io.write(main_txt) } + linkf = @internal ? "-L. -lmacruby" : "-framework MacRuby" + objs = objs_data.map { |obj, f| "\"#{obj}\"" }.join(' ') + execute("#{@gcxx} \"#{main}\" -dynamiclib -dynamic -undefined suppress -flat_namespace #{arch_flags} #{linkf} #{objs} -o \"#{output}\"") + end + def compile_executable(objs_data, output) output ||= 'a.out' - objs = [] - init_funcs = [] - objs_data.each { |obj, init_func| objs << obj; init_funcs << init_func } + raise if objs_data.empty? + die "first object file must be a Ruby source file or object" if objs_data[0][1] == nil # Generate main file. main_txt = <<EOS @@ -181,11 +215,15 @@ void ruby_script(const char *); void ruby_set_argv(int, char **); void rb_vm_init_compiler(void); + void rb_vm_aot_feature_provide(const char *, void *); void *rb_vm_top_self(void); void rb_vm_print_current_exception(void); void rb_exit(int); EOS - init_funcs.each { |x| main_txt << "void *#{x}(void *, void *);\n" } + objs_data.each do |obj, init_func| + next if init_func == nil + main_txt << "void *#{init_func}(void *, void *);\n" + end main_txt << <<EOS } @@ -203,10 +241,14 @@ rb_vm_init_compiler(); ruby_script(progname); try { - void *self = rb_vm_top_self(); EOS - init_funcs.each { |x| main_txt << "#{x}(self, 0);\n" } + objs_data[1..-1].each do |obj, init_func| + next if init_func == nil + main_txt << "rb_vm_aot_feature_provide(\"#{feature_name(obj)}\", (void *)#{init_func});\n" + end main_txt << <<EOS + void *self = rb_vm_top_self(); + #{objs_data[0][1]}(self, 0); } catch (...) { rb_vm_print_current_exception(); @@ -216,20 +258,22 @@ } EOS + # Prepare objects. + objs = [] + objs_data.each { |o, _| objs << o } + # Compile main file. main = gen_tmpfile('main', 'mm') File.open(main, 'w') { |io| io.write(main_txt) } main_o = gen_tmpfile('main', 'o') - archf = @archs.map { |x| "-arch #{x}" }.join(' ') - execute("#{@gcxx} \"#{main}\" -c #{archf} -o \"#{main_o}\" -fobjc-gc") + execute("#{@gcxx} \"#{main}\" -c #{arch_flags} -o \"#{main_o}\" -fobjc-gc") objs.unshift(main_o) # Link all objects into executable. linkf = @static ? "-L#{RbConfig::CONFIG['libdir']} #{RbConfig::CONFIG['LIBRUBYARG_STATIC_REALLY']}" : "-framework MacRuby -lobjc" - line = "#{@gcxx} -o \"#{output}\" #{archf} #{linkf} " - @frameworks.each { |f| line << "-framework #{f} " } + line = "#{@gcxx} -o \"#{output}\" #{arch_flags} #{linkf} " objs.each { |o| line << " \"#{o}\"" } execute(line) end @@ -266,6 +310,25 @@ end end + def arch_flags + @archs.map { |x| "-arch #{x}" }.join(' ') + end + + def find_init_func(obj) + output = `#{@nm} -j "#{obj}"` + output.scan(/^_MREP_.*$/).reject { |func| + # Ignore non-main functions. + func.include?('ruby_scope') + }.map { |func| + # Ignore the very first character (_). + func[1..-1] + }[0] + end + + def feature_name(obj) + obj.sub(/#{File.extname(obj)}$/, '') + end + def gen_tmpfile(base, ext) file = File.join(@tmpdir, "#{base}.#{ext}") @tmpfiles << file Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2009-12-15 06:27:31 UTC (rev 3124) +++ MacRuby/trunk/load.c 2009-12-16 22:40:49 UTC (rev 3125) @@ -265,6 +265,12 @@ VALUE path; int type = 0; + // Immediately, check out if we have an AOT feature for this. + if (rb_vm_aot_feature_load(RSTRING_PTR(fname))) { + rb_provide_feature(fname); + return Qtrue; + } + FilePathValue(fname); if (search_required(fname, &path, &type)) { if (path == 0) { Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-15 06:27:31 UTC (rev 3124) +++ MacRuby/trunk/vm.cpp 2009-12-16 22:40:49 UTC (rev 3125) @@ -4807,8 +4807,44 @@ } } +// AOT features. These are registered at runtime once an AOT object file +// is loaded, either directly from an executable's main() function or from +// a gcc constructor (in case of a dylib). +// +// XXX this shared map is not part of RoxorCore because gcc constructors can +// potentially be called *before* RoxorCore has been initialized. This is +// definitely not thread-safe, but it shouldn't be a big deal at this point. +static std::map<std::string, void *> aot_features; + extern "C" +bool +rb_vm_aot_feature_load(const char *name) +{ + std::string key(name); + std::map<std::string, void *>::iterator iter = aot_features.find(name); + if (iter == aot_features.end()) { + return false; + } + void *init_func = iter->second; + ((void *(*)(void *, void *))init_func)((void *)rb_vm_top_self(), NULL); + aot_features.erase(iter); + return true; +} + +extern "C" void +rb_vm_aot_feature_provide(const char *name, void *init_func) +{ + std::string key(name); + std::map<std::string, void *>::iterator iter = aot_features.find(key); + if (iter != aot_features.end()) { + printf("WARNING: AOT feature '%s' already registered, new one will be ignored. This could happen if you link your executable against dylibs that contain the same Ruby file.\n", name); + } + aot_features[key] = init_func; +} + +extern "C" +void Init_PostVM(void) { // Create and register the main thread. Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2009-12-15 06:27:31 UTC (rev 3124) +++ MacRuby/trunk/vm.h 2009-12-16 22:40:49 UTC (rev 3125) @@ -413,6 +413,8 @@ bool rb_vm_is_multithreaded(void); void rb_vm_set_multithreaded(bool flag); +bool rb_vm_aot_feature_load(const char *name); + static inline VALUE rb_robject_allocate_instance(VALUE klass) { @@ -584,11 +586,13 @@ // be empty when we exit and we need to call the remaining finalizers. std::vector<rb_vm_finalizer_t *> finalizers; + // The global lock. + pthread_mutex_t gl; + // State. bool running; bool multithreaded; bool abort_on_exception; - pthread_mutex_t gl; VALUE loaded_features; VALUE load_path; VALUE rand_seed; @@ -803,7 +807,8 @@ void invalidate_respond_to_cache(void) { respond_to_cache.clear(); } - bool respond_to(VALUE obj, VALUE klass, SEL sel, bool priv, bool check_override); + bool respond_to(VALUE obj, VALUE klass, SEL sel, bool priv, + bool check_override); private: bool register_bs_boxed(bs_element_type_t type, void *value);

1 0

[3124] MacRuby/trunk/spec/macruby/core/gcd
by source_changes＠macosforge.org 15 Dec '09

15 Dec '09

Revision: 3124 http://trac.macosforge.org/projects/ruby/changeset/3124 Author: lsansonetti(a)apple.com Date: 2009-12-14 22:27:31 -0800 (Mon, 14 Dec 2009) Log Message: ----------- disable the semaphore spec file because of a potential GCD crasher (<rdar://problem/7472121>) Added Paths: ----------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb Removed Paths: ------------- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb Deleted: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2009-12-15 03:13:58 UTC (rev 3123) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb 2009-12-15 06:27:31 UTC (rev 3124) @@ -1,68 +0,0 @@ -require File.dirname(__FILE__) + "/../../spec_helper" - -if MACOSX_VERSION >= 10.6 - - describe "Dispatch::Semaphore" do - before :each do - @sema0 = Dispatch::Semaphore.new 0 - @sema1 = Dispatch::Semaphore.new 1 - @q = Dispatch::Queue.new('org.macruby.gcd_spec.semaphore') - end - - it "returns an instance of Semaphore for non-negative counts" do - @sema0.should be_kind_of(Dispatch::Semaphore) - @sema1.should be_kind_of(Dispatch::Semaphore) - end - - it "raises an ArgumentError if the count isn't specified" do - lambda { Dispatch::Semaphore.new }.should raise_error(ArgumentError) - end - - it "raises a TypeError if a non-numeric count is provided" do - lambda { Dispatch::Semaphore.new :foo }.should raise_error(TypeError) - lambda { Dispatch::Semaphore.new 3.5 }.should_not raise_error(TypeError) - lambda { Dispatch::Semaphore.new "3" }.should raise_error(TypeError) - end - - it "raises an ArgumentError if the specified count is less than zero" do - lambda { Dispatch::Semaphore.new -1 }.should raise_error(ArgumentError) - end - - describe :wait do - it "always returns true with default timeout FOREVER" do - @sema1.wait.should == true - end - - it "returns false if explicit timeout DOES expire" do - @sema0.wait(0.01).should == false - @sema1.wait(0.01).should == false - end - - it "returns true if explicit timeout does NOT expire" do - @sema1.wait(Dispatch::TIME_FOREVER).should == true - q = Dispatch::Queue.new('foo') - q.async { @sema0.signal } - @sema0.wait(Dispatch::TIME_FOREVER).should == true - end - end - - describe :signal do - it "returns true if it does NOT wake a thread" do - @sema0.signal.should == true - @sema1.signal.should == true - end - - it "returns false if it DOES wake a thread" do - @q.async do - sleep 0.1 - @sema0.signal.should == false - @sema1.signal.should == true - @sema1.signal.should == false - end - @sema0.wait(Dispatch::TIME_FOREVER) - @sema1.wait(Dispatch::TIME_FOREVER) - end - end - - end -end \ No newline at end of file Copied: MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb (from rev 3116, MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec.rb) =================================================================== --- MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/gcd/semaphore_spec_disabled.rb 2009-12-15 06:27:31 UTC (rev 3124) @@ -0,0 +1,70 @@ +# XXX disabled because of <rdar://problem/7472121> dispatch_release() crashes on a semaphore after a successful wait + +require File.dirname(__FILE__) + "/../../spec_helper" + +if MACOSX_VERSION >= 10.6 + + describe "Dispatch::Semaphore" do + before :each do + @sema0 = Dispatch::Semaphore.new 0 + @sema1 = Dispatch::Semaphore.new 1 + @q = Dispatch::Queue.new('org.macruby.gcd_spec.semaphore') + end + + it "returns an instance of Semaphore for non-negative counts" do + @sema0.should be_kind_of(Dispatch::Semaphore) + @sema1.should be_kind_of(Dispatch::Semaphore) + end + + it "raises an ArgumentError if the count isn't specified" do + lambda { Dispatch::Semaphore.new }.should raise_error(ArgumentError) + end + + it "raises a TypeError if a non-numeric count is provided" do + lambda { Dispatch::Semaphore.new :foo }.should raise_error(TypeError) + lambda { Dispatch::Semaphore.new 3.5 }.should_not raise_error(TypeError) + lambda { Dispatch::Semaphore.new "3" }.should raise_error(TypeError) + end + + it "raises an ArgumentError if the specified count is less than zero" do + lambda { Dispatch::Semaphore.new -1 }.should raise_error(ArgumentError) + end + + describe :wait do + it "always returns true with default timeout FOREVER" do + @sema1.wait.should == true + end + + it "returns false if explicit timeout DOES expire" do + @sema0.wait(0.01).should == false + @sema1.wait(0.01).should == false + end + + it "returns true if explicit timeout does NOT expire" do + @sema1.wait(Dispatch::TIME_FOREVER).should == true + q = Dispatch::Queue.new('foo') + q.async { @sema0.signal } + @sema0.wait(Dispatch::TIME_FOREVER).should == true + end + end + + describe :signal do + it "returns true if it does NOT wake a thread" do + @sema0.signal.should == true + @sema1.signal.should == true + end + + it "returns false if it DOES wake a thread" do + @q.async do + sleep 0.1 + @sema0.signal.should == false + @sema1.signal.should == true + @sema1.signal.should == false + end + @sema0.wait(Dispatch::TIME_FOREVER) + @sema1.wait(Dispatch::TIME_FOREVER) + end + end + + end +end

1 0

[3122] MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb
by source_changes＠macosforge.org 15 Dec '09

15 Dec '09

Revision: 3122 http://trac.macosforge.org/projects/ruby/changeset/3122 Author: mattaimonetti(a)gmail.com Date: 2009-12-14 19:13:55 -0800 (Mon, 14 Dec 2009) Log Message: ----------- made a small change to the seach to pdf sample Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb Modified: MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb 2009-12-15 02:35:38 UTC (rev 3121) +++ MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb 2009-12-15 03:13:55 UTC (rev 3122) @@ -57,7 +57,7 @@ puts "Request timed out... moving on!" break else - NSRunLoop.currentRunLoop.runUntilDate NSDate.date + NSRunLoop.currentRunLoop.runUntilDate(NSDate.distantFuture) end end end

1 0

[3123] MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb
by source_changes＠macosforge.org 15 Dec '09

15 Dec '09

Revision: 3123 http://trac.macosforge.org/projects/ruby/changeset/3123 Author: mattaimonetti(a)gmail.com Date: 2009-12-14 19:13:58 -0800 (Mon, 14 Dec 2009) Log Message: ----------- Added an event driven RSS parser example Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb Added: MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb 2009-12-15 03:13:58 UTC (rev 3123) @@ -0,0 +1,127 @@ +#!/usr/local/bin/macruby + +# Copyright (c) 2009 Matt Aimonetti +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# example script that fetches the top 5 results from google and capture the pages in PDF format. +# inspired by http://github.com/tomafro/macruby-snapper +# + +framework 'Cocoa' +# Documentation for NSXMLParser delegates: +# http://developer.apple.com/mac/library/documentation/cocoa/reference/NSXMLP… + +class RSSParser + attr_accessor :parser, :xml_url, :doc + + def initialize(xml_url) + @xml_url = xml_url + NSApplication.sharedApplication + url = NSURL.alloc.initWithString(xml_url) + @parser = NSXMLParser.alloc.initWithContentsOfURL(url) + @parser.shouldProcessNamespaces = true + @parser.delegate = self + @items = [] + end + + # RSSItem is a simple class that holds all of RSS items. + # Extend this class to display/process the item differently. + class RSSItem + attr_accessor :title, :description, :link, :guid, :pubDate, :enclosure + def initialize + @title, @description, @link, @pubDate, @guid = '', '', '', '', '' + end + end + + # Starts the parsing and send each parsed item through its block. + # + # Usage: + # feed.block_while_parsing do |item| + # puts item.link + # end + def parse(&block) + @block = block + puts "Parsing #{xml_url}" + @parser.parse + end + + # Starts the parsing but keep block the main runloop + # until the parsing is done. + # Do not use this method in a GUI app. + # use #parse instead. + def block_while_parsing(&block) + @parsed = false + parse(&block) + NSRunLoop.currentRunLoop.runUntilDate(NSDate.distantFuture) until @parsed + end + + # Delegate getting called when parsing starts + def parserDidStartDocument(parser) + puts "starting parsing.." + end + + # Delegate being called when an element starts being processed + def parser(parser, didStartElement:element, namespaceURI:uri, qualifiedName:name, attributes:attrs) + if element == 'item' + @current_item = RSSItem.new + elsif element == 'enclosure' + @current_item.enclosure = attrs + end + @current_element = element + end + + # as the parser finds characters, this method is being called + def parser(parser, foundCharacters:string) + if @current_item && @current_item.respond_to?(@current_element) + el = @current_item.send(@current_element) + el << string + end + end + + # method called when an element is done being parsed + def parser(parser, didEndElement:element, namespaceURI:uri, qualifiedName:name) + if element == 'item' + @items << @current_item + end + end + + # delegate getting called when the parsing is done + # If a block was set, it will be called on each parsed items + def parserDidEndDocument(parser) + @parsed = true + puts "done parsing" + if @block + @items.each{|item| @block.call(item)} + end + end + +end + + +twitter = RSSParser.new("http://twitter.com/statuses/user_timeline/17093090.rss") + +# because we are running in a script, we need the run loop to keep running +# until we are done with parsing +# +# If we would to use the above code in a GUI app, +# we would use #parse instead of #block_while_parsing +twitter.block_while_parsing do |item| + print item.title +end \ No newline at end of file Property changes on: MacRuby/trunk/sample-macruby/Scripts/rss_parser.rb ___________________________________________________________________ Added: svn:executable + *

1 0

[3121] MacRuby/trunk/include/ruby/ruby.h
by source_changes＠macosforge.org 15 Dec '09

15 Dec '09

Revision: 3121 http://trac.macosforge.org/projects/ruby/changeset/3121 Author: pthomson(a)apple.com Date: 2009-12-14 18:35:38 -0800 (Mon, 14 Dec 2009) Log Message: ----------- Fixed a whole lot of crashes on 32-bit, including issue 448. Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2009-12-15 02:10:31 UTC (rev 3120) +++ MacRuby/trunk/include/ruby/ruby.h 2009-12-15 02:35:38 UTC (rev 3121) @@ -570,13 +570,13 @@ # define RCLASS_RC_FLAGS(m) (*(uint32_t *) ((_PTR_TYPE)(m) + sizeof(uintptr_t) + (sizeof(uint8_t) * 4))) # else # define _PTR_TYPE uint32_t -# define RCLASS_VERSION(m) (*(long *)((_PTR_TYPE)m + (sizeof(void *) * 3))) -# define RCLASS_SET_VERSION(m,f) do { RCLASS_VERSION(m) = f; } while (0) -# define RCLASS_SET_VERSION_FLAG(m,f) (RCLASS_VERSION(m) |= f) +# define RCLASS_VERSION(m) (class_getVersion((Class)m)) +# define RCLASS_SET_VERSION(m,f) (class_setVersion((Class)m, f)) +# define RCLASS_SET_VERSION_FLAG(m,f) (class_setVersion((Class)m, (RCLASS_VERSION(m) | f))) # define RCLASS_SUPER(m) (*(VALUE *)((_PTR_TYPE)m + (sizeof(void *) * 1))) -# define RCLASS_SET_SUPER(m, s) (RCLASS_SUPER(m) = s) -# define _RCLASS_INFO(m) (*(long *)((_PTR_TYPE)m + (sizeof(void *) * 4))) -# define RCLASS_META(m) (_RCLASS_INFO(m) & CLS_META) +# define RCLASS_SET_SUPER(m, s) (class_setSuperclass((Class)m, (Class)s)) +# define RCLASS_META(m) (class_isMetaClass((Class)m)) +# define RCLASS_RC_FLAGS(m) (*(uint32_t *) ((_PTR_TYPE)(m) + sizeof(uintptr_t) + (sizeof(uint8_t) * 4))) # endif # define RCLASS_RUBY(m) ((RCLASS_VERSION(m) & RCLASS_IS_RUBY_CLASS) == RCLASS_IS_RUBY_CLASS) # define RCLASS_MODULE(m) ((RCLASS_VERSION(m) & RCLASS_IS_MODULE) == RCLASS_IS_MODULE)

1 0