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

[3967] MacRuby/trunk
by source_changes＠macosforge.org 28 Apr '10

28 Apr '10

Revision: 3967 http://trac.macosforge.org/projects/ruby/changeset/3967 Author: martinlagardette(a)apple.com Date: 2010-04-27 20:01:10 -0700 (Tue, 27 Apr 2010) Log Message: ----------- Make NSString, NSArray and NSDictionary yamlable Fixes the evil #666 Modified Paths: -------------- MacRuby/trunk/lib/yaml/rubytypes.rb MacRuby/trunk/spec/macruby/core/array_spec.rb MacRuby/trunk/spec/macruby/core/hash_spec.rb MacRuby/trunk/spec/macruby/core/string_spec.rb Modified: MacRuby/trunk/lib/yaml/rubytypes.rb =================================================================== --- MacRuby/trunk/lib/yaml/rubytypes.rb 2010-04-27 05:54:42 UTC (rev 3966) +++ MacRuby/trunk/lib/yaml/rubytypes.rb 2010-04-28 03:01:10 UTC (rev 3967) @@ -82,7 +82,7 @@ def taguri; "!ruby/struct:#{self.class.to_s.sub(/^Struct::/, '')}"; end end -class String +class NSString yaml_as "tag:yaml.org,2002:str" def to_yaml(output = nil) @@ -108,7 +108,7 @@ def taguri; "!ruby/exception:#{self.class}"; end end -class Array +class NSArray yaml_as "tag:yaml.org,2002:seq" def to_yaml(output = nil) @@ -120,7 +120,7 @@ end end -class Hash +class NSDictionary yaml_as "tag:yaml.org,2002:map" def to_yaml(output = nil) Modified: MacRuby/trunk/spec/macruby/core/array_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/array_spec.rb 2010-04-27 05:54:42 UTC (rev 3966) +++ MacRuby/trunk/spec/macruby/core/array_spec.rb 2010-04-28 03:01:10 UTC (rev 3967) @@ -61,4 +61,9 @@ a.size.should == 0 lambda { a << 123 }.should raise_error(RuntimeError) end + + it "can be transformed to yaml using #to_yaml" do + require 'yaml' + NSArray.arrayWithArray([1, 2, 42]).to_yaml.should == "--- \n- 1\n- 2\n- 42\n" + end end Modified: MacRuby/trunk/spec/macruby/core/hash_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/hash_spec.rb 2010-04-27 05:54:42 UTC (rev 3966) +++ MacRuby/trunk/spec/macruby/core/hash_spec.rb 2010-04-28 03:01:10 UTC (rev 3967) @@ -47,6 +47,10 @@ end describe "An NSDictionary object" do + before(:all) do + require 'yaml' + end + it "is an instance of the Hash class" do a = NSDictionary.dictionary a.is_a?(Hash).should == true @@ -61,4 +65,15 @@ a.size.should == 0 lambda { a[42] = 123 }.should raise_error(RuntimeError) end + + it "can be transformed to yaml using #to_yaml" do + NSDictionary.dictionaryWithDictionary({:a => "ok", :c => 42}).to_yaml.should == "--- \n:a: ok\n:c: 42\n" + end + + it "can include Foundation objects and be correctly transformed to yaml" do + a = NSString.stringWithString("a") + ok = NSString.stringWithString("ok") + ary = NSArray.arrayWithArray([42, 21]) + NSDictionary.dictionaryWithDictionary({a => ok, :c => ary}).to_yaml.should == "--- \na: ok\n:c:\n- 42\n- 21\n" + end end Modified: MacRuby/trunk/spec/macruby/core/string_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/string_spec.rb 2010-04-27 05:54:42 UTC (rev 3966) +++ MacRuby/trunk/spec/macruby/core/string_spec.rb 2010-04-28 03:01:10 UTC (rev 3967) @@ -63,4 +63,9 @@ it "forwards the block when calling a ruby method" do NSString.stringWithString("ybuRcaM").sub(/.+/) { |s| s.reverse }.should == "MacRuby" end + + it "can be transformed to yaml using #to_yaml" do + require 'yaml' + NSString.stringWithString("ok").to_yaml.should == "--- ok\n" + end end

1 0

[3966] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 27 Apr '10

27 Apr '10

Revision: 3966 http://trac.macosforge.org/projects/ruby/changeset/3966 Author: lsansonetti(a)apple.com Date: 2010-04-26 22:54:42 -0700 (Mon, 26 Apr 2010) Log Message: ----------- do not try to release NODE_METHOD nodes Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-04-27 05:54:26 UTC (rev 3965) +++ MacRuby/trunk/gc.c 2010-04-27 05:54:42 UTC (rev 3966) @@ -410,8 +410,7 @@ rb_node_release(node->u3.node); break; - case NODE_METHOD: /* 1,2 */ - case NODE_WHILE: + case NODE_WHILE: /* 1,2 */ case NODE_UNTIL: case NODE_AND: case NODE_OR:

1 0

[3965] MacRuby/trunk
by source_changes＠macosforge.org 27 Apr '10

27 Apr '10

Revision: 3965 http://trac.macosforge.org/projects/ruby/changeset/3965 Author: lsansonetti(a)apple.com Date: 2010-04-26 22:54:26 -0700 (Mon, 26 Apr 2010) Log Message: ----------- more missing write barriers Modified Paths: -------------- MacRuby/trunk/st.c MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/st.c =================================================================== --- MacRuby/trunk/st.c 2010-04-27 03:07:18 UTC (rev 3964) +++ MacRuby/trunk/st.c 2010-04-27 05:54:26 UTC (rev 3965) @@ -356,7 +356,7 @@ head->back = entry;\ }\ else {\ - table->head = entry;\ + GC_WB(&table->head, entry);\ entry->fore = entry;\ entry->back = entry;\ }\ @@ -458,7 +458,7 @@ if ((ptr = table->head) != 0) { do { hash_val = ptr->hash % new_num_bins; - ptr->next = new_bins[hash_val]; + GC_WB(&ptr->next, new_bins[hash_val]); GC_WB(&new_bins[hash_val], ptr); } while ((ptr = ptr->fore) != table->head); } @@ -493,6 +493,8 @@ entry = alloc(st_table_entry); assert(entry != NULL); *entry = *ptr; + GC_WB(&entry->key, ptr->key); + GC_WB(&entry->record, ptr->record); hash_val = entry->hash % num_bins; GC_WB(&entry->next, new_table->bins[hash_val]); GC_WB(&new_table->bins[hash_val], entry); @@ -500,7 +502,8 @@ prev = entry; *tail = entry; tail = &entry->fore; - } while ((ptr = ptr->fore) != old_table->head); + } while ((ptr = ptr->fore) != old_table->head && ptr != NULL); + GC_WB(&new_table->head, new_table->head); entry = new_table->head; entry->back = prev; *tail = entry; Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-27 03:07:18 UTC (rev 3964) +++ MacRuby/trunk/vm.cpp 2010-04-27 05:54:26 UTC (rev 3965) @@ -3395,8 +3395,8 @@ b->arity.real = 1; b->flags = VM_BLOCK_PROC; b->imp = (IMP)rb_vm_block_curry; - b->dvars[0] = (VALUE *)proc; - b->dvars[1] = (VALUE *)passed; + GC_WB(&b->dvars[0], (VALUE *)proc); + GC_WB(&b->dvars[1], (VALUE *)passed); b->dvars[2] = (VALUE *)arity; return rb_proc_alloc_with_block(rb_cProc, b);

1 0

[3964] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 27 Apr '10

27 Apr '10

Revision: 3964 http://trac.macosforge.org/projects/ruby/changeset/3964 Author: lsansonetti(a)apple.com Date: 2010-04-26 20:07:18 -0700 (Mon, 26 Apr 2010) Log Message: ----------- added missing write barriers Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-27 01:01:13 UTC (rev 3963) +++ MacRuby/trunk/vm.cpp 2010-04-27 03:07:18 UTC (rev 3964) @@ -3121,7 +3121,7 @@ return; use_found: - rb_vm_kept_local *locals = (rb_vm_kept_local *)malloc( + rb_vm_kept_local *locals = (rb_vm_kept_local *)xmalloc( sizeof(rb_vm_kept_local)*lvars_size); va_list ar; @@ -3129,7 +3129,7 @@ for (int i = 0; i < lvars_size; ++i) { locals[i].name = va_arg(ar, ID); locals[i].stack_address = va_arg(ar, VALUE *); - locals[i].new_address = (VALUE *)xmalloc(sizeof(VALUE)); + GC_WB(&locals[i].new_address, (VALUE *)xmalloc(sizeof(VALUE))); GC_WB(locals[i].new_address, *locals[i].stack_address); } va_end(ar); @@ -3180,7 +3180,6 @@ use_index = 0; free(old_current); } - free(locals); } static inline rb_vm_local_t **

1 0

[3963] MacRuby/trunk/range.c
by source_changes＠macosforge.org 27 Apr '10

27 Apr '10

Revision: 3963 http://trac.macosforge.org/projects/ruby/changeset/3963 Author: lsansonetti(a)apple.com Date: 2010-04-26 18:01:13 -0700 (Mon, 26 Apr 2010) Log Message: ----------- added missing write barriers Modified Paths: -------------- MacRuby/trunk/range.c Modified: MacRuby/trunk/range.c =================================================================== --- MacRuby/trunk/range.c 2010-04-26 03:32:23 UTC (rev 3962) +++ MacRuby/trunk/range.c 2010-04-27 01:01:13 UTC (rev 3963) @@ -57,8 +57,8 @@ } SET_EXCL(range, exclude_end); - RSTRUCT(range)->as.ary[0] = beg; - RSTRUCT(range)->as.ary[1] = end; + GC_WB(&RANGE_BEG(range), beg); + GC_WB(&RANGE_END(range), end); } VALUE

1 0

[3962] MacRuby/trunk
by source_changes＠macosforge.org 26 Apr '10

26 Apr '10

Revision: 3962 http://trac.macosforge.org/projects/ruby/changeset/3962 Author: lsansonetti(a)apple.com Date: 2010-04-25 20:32:23 -0700 (Sun, 25 Apr 2010) Log Message: ----------- added support for anonymous structs Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp MacRuby/trunk/compiler.cpp MacRuby/trunk/objc.h MacRuby/trunk/spec/macruby/fixtures/method.m MacRuby/trunk/spec/macruby/language/objc_method_spec.rb MacRuby/trunk/vm.h Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/bridgesupport.cpp 2010-04-26 03:32:23 UTC (rev 3962) @@ -526,6 +526,168 @@ return true; } +rb_vm_bs_boxed_t * +RoxorCore::register_anonymous_bs_struct(const char *type) +{ + if (strlen(type) < 3 || type[0] != _C_STRUCT_B || type[1] != '?' + || type[2] != '=') { + // Does not look like an anonymous struct... + return NULL; + } + + // Prepare the list of field types. + std::vector<std::string> s_types; + char buf[100]; + const char *p = &type[3]; + while (*p != _C_STRUCT_E) { + p = GetFirstType(p, buf, sizeof buf); + assert(*p != '\0'); + s_types.push_back(buf); + } + + // Prepare the BridgeSupport structure. + bs_element_struct_t *bs_struct = (bs_element_struct_t *) + malloc(sizeof(bs_element_struct_t)); + bs_struct->name = (char *)"?"; + bs_struct->type = strdup(type); + bs_struct->fields_count = s_types.size(); + assert(bs_struct->fields_count > 0); + bs_struct->fields = (bs_element_struct_field_t *) + malloc(sizeof(bs_element_struct_field_t) * bs_struct->fields_count); + for (unsigned i = 0; i < bs_struct->fields_count; i++) { + bs_element_struct_field_t *field = &bs_struct->fields[i]; + field->name = (char *)"?"; + field->type = strdup(s_types.at(i).c_str()); + } + bs_struct->opaque = true; + + // Prepare the boxed structure. + rb_vm_bs_boxed_t *boxed = (rb_vm_bs_boxed_t *) + malloc(sizeof(rb_vm_bs_boxed_t)); + boxed->bs_type = BS_ELEMENT_STRUCT; + boxed->as.s = bs_struct; + boxed->type = NULL; // Lazy + boxed->klass = rb_cBoxed; // This type has no class + + // Register it to the runtime. + bs_boxed[type] = boxed; + return boxed; +} + +static inline long +rebuild_new_struct_ary(const StructType *type, VALUE orig, VALUE new_ary) +{ + long n = 0; + + for (StructType::element_iterator iter = type->element_begin(); + iter != type->element_end(); + ++iter) { + + const Type *ftype = *iter; + + if (ftype->getTypeID() == Type::StructTyID) { + long i, n2; + VALUE tmp; + + n2 = rebuild_new_struct_ary(cast<StructType>(ftype), orig, new_ary); + tmp = rb_ary_new(); + for (i = 0; i < n2; i++) { + if (RARRAY_LEN(orig) == 0) { + return 0; + } + rb_ary_push(tmp, rb_ary_shift(orig)); + } + rb_ary_push(new_ary, tmp); + } + n++; + } + + return n; +} + +extern "C" +void +rb_vm_get_struct_fields(VALUE rval, VALUE *buf, rb_vm_bs_boxed_t *bs_boxed) +{ + if (TYPE(rval) == T_ARRAY) { + unsigned n = RARRAY_LEN(rval); + if (n < bs_boxed->as.s->fields_count) { + rb_raise(rb_eArgError, + "not enough elements in array `%s' to create " \ + "structure `%s' (%d for %d)", + RSTRING_PTR(rb_inspect(rval)), bs_boxed->as.s->name, n, + bs_boxed->as.s->fields_count); + } + + if (n > bs_boxed->as.s->fields_count) { + VALUE new_rval = rb_ary_new(); + VALUE orig = rval; + rval = rb_ary_dup(rval); + rebuild_new_struct_ary(cast<StructType>(bs_boxed->type), rval, + new_rval); + n = RARRAY_LEN(new_rval); + if (RARRAY_LEN(rval) != 0 || n != bs_boxed->as.s->fields_count) { + rb_raise(rb_eArgError, + "too much elements in array `%s' to create " \ + "structure `%s' (%ld for %d)", + RSTRING_PTR(rb_inspect(orig)), + bs_boxed->as.s->name, RARRAY_LEN(orig), + bs_boxed->as.s->fields_count); + } + rval = new_rval; + } + + for (unsigned i = 0; i < n; i++) { + buf[i] = RARRAY_AT(rval, i); + } + } + else { + if (!rb_obj_is_kind_of(rval, bs_boxed->klass)) { + rb_raise(rb_eTypeError, + "expected instance of `%s', got `%s' (%s)", + rb_class2name(bs_boxed->klass), + RSTRING_PTR(rb_inspect(rval)), + rb_obj_classname(rval)); + } + + if (bs_boxed->klass == rb_cBoxed) { + // An anonymous type... + // Let's check that the given boxed object matches the types. + rb_vm_bs_boxed_t *rval_bs_boxed = + locate_bs_boxed(CLASS_OF(rval), true); + assert(rval_bs_boxed != NULL); + + if (rval_bs_boxed->as.s->fields_count + != bs_boxed->as.s->fields_count) { + rb_raise(rb_eTypeError, + "expected instance of Boxed with %d fields, got %d", + bs_boxed->as.s->fields_count, + rval_bs_boxed->as.s->fields_count); + } + + for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) { + if (strcmp(bs_boxed->as.s->fields[i].type, + rval_bs_boxed->as.s->fields[i].type) != 0) { + rb_raise(rb_eTypeError, + "field %d of given instance of `%s' does not match " \ + "the type expected (%s, got %s)", + i, + rb_class2name(bs_boxed->klass), + bs_boxed->as.s->fields[i].type, + rval_bs_boxed->as.s->fields[i].type); + } + } + } + + VALUE *data; + Data_Get_Struct(rval, VALUE, data); + + for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) { + buf[i] = data[i]; + } + } +} + static VALUE rb_boxed_objc_type(VALUE rcv, SEL sel) { @@ -797,7 +959,16 @@ RoxorCore::find_bs_struct(std::string type) { rb_vm_bs_boxed_t *boxed = find_bs_boxed(type); - return boxed == NULL ? NULL : boxed->is_struct() ? boxed : NULL; + if (boxed != NULL) { + if (boxed->is_struct()) { + return boxed; + } + return NULL; + } + + // Given structure type does not exist... but it may be an anonymous + // type (like {?=qq}) which is sometimes present in BridgeSupport files... + return register_anonymous_bs_struct(type.c_str()); } rb_vm_bs_boxed_t * @@ -1079,7 +1250,6 @@ case BS_ELEMENT_CFTYPE: { - bs_element_cftype_t *bs_cftype = (bs_element_cftype_t *)value; std::map<std::string, bs_element_cftype_t *>::iterator iter = bs_cftypes.find(bs_cftype->type); @@ -1132,7 +1302,8 @@ char *error = NULL; const bool ok = bs_parser_parse(bs_parser, path, framework_path, - (bs_parse_options_t)options, __bs_parse_cb, rb_cObject_dict, &error); + (bs_parse_options_t)options, __bs_parse_cb, rb_cObject_dict, + &error); if (!ok) { rb_raise(rb_eRuntimeError, "%s", error); } Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/compiler.cpp 2010-04-26 03:32:23 UTC (rev 3962) @@ -6029,17 +6029,6 @@ return f; } -static inline const char * -GetFirstType(const char *p, char *buf, size_t buflen) -{ - const char *p2 = SkipFirstType(p); - const size_t len = p2 - p; - assert(len < buflen); - strncpy(buf, p, len); - buf[len] = '\0'; - return SkipStackSize(p2); -} - static inline void convert_error(const char type, VALUE val) { @@ -6248,92 +6237,7 @@ return *cptr; } -static inline long -rebuild_new_struct_ary(const StructType *type, VALUE orig, VALUE new_ary) -{ - long n = 0; - - for (StructType::element_iterator iter = type->element_begin(); - iter != type->element_end(); - ++iter) { - - const Type *ftype = *iter; - - if (ftype->getTypeID() == Type::StructTyID) { - long i, n2; - VALUE tmp; - - n2 = rebuild_new_struct_ary(cast<StructType>(ftype), orig, new_ary); - tmp = rb_ary_new(); - for (i = 0; i < n2; i++) { - if (RARRAY_LEN(orig) == 0) { - return 0; - } - rb_ary_push(tmp, rb_ary_shift(orig)); - } - rb_ary_push(new_ary, tmp); - } - n++; - } - - return n; -} - -extern "C" void -rb_vm_get_struct_fields(VALUE rval, VALUE *buf, rb_vm_bs_boxed_t *bs_boxed) -{ - if (TYPE(rval) == T_ARRAY) { - unsigned n = RARRAY_LEN(rval); - if (n < bs_boxed->as.s->fields_count) { - rb_raise(rb_eArgError, - "not enough elements in array `%s' to create " \ - "structure `%s' (%d for %d)", - RSTRING_PTR(rb_inspect(rval)), bs_boxed->as.s->name, n, - bs_boxed->as.s->fields_count); - } - - if (n > bs_boxed->as.s->fields_count) { - VALUE new_rval = rb_ary_new(); - VALUE orig = rval; - rval = rb_ary_dup(rval); - rebuild_new_struct_ary(cast<StructType>(bs_boxed->type), rval, - new_rval); - n = RARRAY_LEN(new_rval); - if (RARRAY_LEN(rval) != 0 || n != bs_boxed->as.s->fields_count) { - rb_raise(rb_eArgError, - "too much elements in array `%s' to create " \ - "structure `%s' (%ld for %d)", - RSTRING_PTR(rb_inspect(orig)), - bs_boxed->as.s->name, RARRAY_LEN(orig), - bs_boxed->as.s->fields_count); - } - rval = new_rval; - } - - for (unsigned i = 0; i < n; i++) { - buf[i] = RARRAY_AT(rval, i); - } - } - else { - if (!rb_obj_is_kind_of(rval, bs_boxed->klass)) { - rb_raise(rb_eTypeError, - "expected instance of `%s', got `%s' (%s)", - rb_class2name(bs_boxed->klass), - RSTRING_PTR(rb_inspect(rval)), - rb_obj_classname(rval)); - } - - VALUE *data; - Data_Get_Struct(rval, VALUE, data); - - for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) { - buf[i] = data[i]; - } - } -} - -void RoxorCompiler::compile_get_struct_fields(Value *val, Value *buf, rb_vm_bs_boxed_t *bs_boxed) { @@ -6530,8 +6434,10 @@ case _C_FPTR_B: { - GlobalVariable *proc_gvar = new GlobalVariable(*RoxorCompiler::module, - RubyObjTy, false, GlobalValue::InternalLinkage, nilVal, ""); + GlobalVariable *proc_gvar = + new GlobalVariable(*RoxorCompiler::module, + RubyObjTy, false, GlobalValue::InternalLinkage, + nilVal, ""); new StoreInst(val, proc_gvar, bb); char buf[100]; @@ -6799,7 +6705,7 @@ Value * RoxorCompiler::compile_conversion_to_ruby(const char *type, - const Type *llvm_type, Value *val) + const Type *llvm_type, Value *val) { const char *func_name = NULL; Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/objc.h 2010-04-26 03:32:23 UTC (rev 3962) @@ -151,6 +151,17 @@ } } +static inline const char * +GetFirstType(const char *p, char *buf, size_t buflen) +{ + const char *p2 = SkipFirstType(p); + const size_t len = p2 - p; + assert(len < buflen); + strncpy(buf, p, len); + buf[len] = '\0'; + return SkipStackSize(p2); +} + static inline unsigned int TypeArity(const char *type) { Modified: MacRuby/trunk/spec/macruby/fixtures/method.m =================================================================== --- MacRuby/trunk/spec/macruby/fixtures/method.m 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/spec/macruby/fixtures/method.m 2010-04-26 03:32:23 UTC (rev 3962) @@ -720,6 +720,16 @@ return ptr == NULL; } +typedef struct { + CGFloat f1; + CGFloat f2; +} anon_struct; + +- (BOOL)methodAcceptingAnonymousStructure:(anon_struct)s +{ + return s.f1 == 42 && s.f2 == 4200; +} + extern id objc_msgSend(id self, SEL op, ...); - (void)methodAcceptingSEL:(SEL)sel target:(id)target Modified: MacRuby/trunk/spec/macruby/language/objc_method_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2010-04-26 03:32:23 UTC (rev 3962) @@ -426,6 +426,22 @@ end @o.methodAcceptingSEL('foo:arg1:arg2:', target:o) end + + it "accepting an anonymous structure should be given a Boxed object that matches the types" do + @o.methodSignatureForSelector(:'methodAcceptingAnonymousStructure:').getArgumentTypeAtIndex(2).should == '{?=dd}' + + @o.methodAcceptingAnonymousStructure(NSPoint.new(42, 4200)).should == 1 + @o.methodAcceptingAnonymousStructure(NSSize.new(42, 4200)).should == 1 + @o.methodAcceptingAnonymousStructure([42, 4200]).should == 1 + @o.methodAcceptingAnonymousStructure(NSPoint.new(42, 4201)).should == 0 + @o.methodAcceptingAnonymousStructure(NSSize.new(42, 4201)).should == 0 + @o.methodAcceptingAnonymousStructure([42, 4201]).should == 0 + + lambda { @o.methodAcceptingAnonymousStructure([42]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingAnonymousStructure([42, 4200, 42]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingAnonymousStructure(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingAnonymousStructure(NSRange.new(42, 4200)) }.should raise_error(TypeError) + end end describe "A pure MacRuby method" do Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-04-24 20:12:57 UTC (rev 3961) +++ MacRuby/trunk/vm.h 2010-04-26 03:32:23 UTC (rev 3962) @@ -847,6 +847,7 @@ private: bool register_bs_boxed(bs_element_type_t type, void *value); void register_bs_class(bs_element_class_t *bs_class); + rb_vm_bs_boxed_t *register_anonymous_bs_struct(const char *type); }; #define GET_CORE() (RoxorCore::shared)

1 0

[3961] MacRuby/trunk/bs.c
by source_changes＠macosforge.org 24 Apr '10

24 Apr '10

Revision: 3961 http://trac.macosforge.org/projects/ruby/changeset/3961 Author: lsansonetti(a)apple.com Date: 2010-04-24 13:12:57 -0700 (Sat, 24 Apr 2010) Log Message: ----------- when checking if a given path has already been loaded, do a case insensitive search Modified Paths: -------------- MacRuby/trunk/bs.c Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2010-04-23 20:42:56 UTC (rev 3960) +++ MacRuby/trunk/bs.c 2010-04-24 20:12:57 UTC (rev 3961) @@ -446,12 +446,17 @@ if (callback == NULL) return false; + /* check if the given framework path has not been loaded already */ cf_path = CFStringCreateWithFileSystemRepresentation(kCFAllocatorMalloc, path); - if (CFArrayContainsValue(parser->loaded_paths, CFRangeMake(0, CFArrayGetCount(parser->loaded_paths)), cf_path)) { - /* already loaded */ - CFRelease(cf_path); - return true; + for (unsigned i = 0, count = CFArrayGetCount(parser->loaded_paths); + i < count; i++) { + CFStringRef s = CFArrayGetValueAtIndex(parser->loaded_paths, i); + if (CFStringCompare(cf_path, s, kCFCompareCaseInsensitive) + == kCFCompareEqualTo) { + /* already loaded */ + return true; + } } //printf("parsing %s\n", path);

1 0

[3960] MacRuby/trunk/spec/macruby/core/kvc_spec.rb
by source_changes＠macosforge.org 23 Apr '10

23 Apr '10

Revision: 3960 http://trac.macosforge.org/projects/ruby/changeset/3960 Author: martinlagardette(a)apple.com Date: 2010-04-23 13:42:56 -0700 (Fri, 23 Apr 2010) Log Message: ----------- Alloc KVC specs to pass on 10.6 Use `removeObject:`instead of `removeObjectIdenticalTo:` to compare with `isEqual:` instead of pointer value Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/kvc_spec.rb Modified: MacRuby/trunk/spec/macruby/core/kvc_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2010-04-23 02:19:30 UTC (rev 3959) +++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2010-04-23 20:42:56 UTC (rev 3960) @@ -90,7 +90,7 @@ w.valueForKey("kvcOrderedCollection").should == [1, 20, 3, 40, 5, 60, 70, 8] w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectAtIndex(1) - w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectIdenticalTo(40) + w.mutableArrayValueForKey("kvcOrderedCollection").removeObject(40) w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectsAtIndexes( NSIndexSet.indexSetWithIndex(3)) w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectsInRange(

1 0

[3959] MacRuby/trunk/spec/macruby/core/thread_spec.rb
by source_changes＠macosforge.org 23 Apr '10

23 Apr '10

Revision: 3959 http://trac.macosforge.org/projects/ruby/changeset/3959 Author: lsansonetti(a)apple.com Date: 2010-04-22 19:19:30 -0700 (Thu, 22 Apr 2010) Log Message: ----------- added a few specs around NSThread/NSOperation Added Paths: ----------- MacRuby/trunk/spec/macruby/core/thread_spec.rb Added: MacRuby/trunk/spec/macruby/core/thread_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/thread_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/thread_spec.rb 2010-04-23 02:19:30 UTC (rev 3959) @@ -0,0 +1,83 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +class TestThreadTarget + attr_reader :value + + def start1(mutex) + mutex.lock + @value = 42 + end + + def start2(n) + (n * 10000).times { foo } + end + + def foo; 42; end +end + +describe "NSThreads" do + it "allows to perform a selector on a new background thread" do + target = TestThreadTarget.new + mutex = Mutex.new + mutex.lock + t = NSThread.alloc.initWithTarget(target, selector: :"start1:", object: mutex) + t.executing?.should == false + target.value.should == nil + t.start + t.executing?.should == true + mutex.unlock + while t.executing?; end + t.finished?.should == true + target.value.should == 42 + end + + it "can call into MacRuby methods in a reentrant way" do + target = TestThreadTarget.new + thrs = [] + n = 9 + while n >= 0 + t = NSThread.alloc.initWithTarget(target, selector: :"start2:", object: n) + t.start + n -= 1 + thrs << t + end + + thrs.each do |t| + while t.executing?; end + t.finished?.should == true + end + end +end + +class TestOperation < NSOperation + attr_accessor :value + + def main + (@value * 1000).times { foo } + end + + def foo; 42; end +end + +# NOTE: we aren't really testing the whole NSOperation API here, just making +# sure the basic stuff is working. NSOperation on recent Mac OS X versions is +# anyway supposed to use GCD which is well covered already. +describe "NSOperations" do + it "allows to share a group of threads for concurrent logic" do + queue = NSOperationQueue.new + queue.maxConcurrentOperationCount = 10 + + ops = [] + 100.times do |i| + op = TestOperation.new + op.value = i + op.executing?.should == false + queue.addOperation(op) + ops << op + end + + queue.waitUntilAllOperationsAreFinished + queue.operations.size.should == 0 + ops.each { |op| op.finished?.should == true } + end +end

1 0

[3958] MacRuby/trunk
by source_changes＠macosforge.org 23 Apr '10

23 Apr '10

Revision: 3958 http://trac.macosforge.org/projects/ruby/changeset/3958 Author: lsansonetti(a)apple.com Date: 2010-04-22 17:49:34 -0700 (Thu, 22 Apr 2010) Log Message: ----------- the VM is now multithreaded-aware by default Modified Paths: -------------- MacRuby/trunk/gc.c MacRuby/trunk/gcd.c MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-04-22 07:50:59 UTC (rev 3957) +++ MacRuby/trunk/gc.c 2010-04-23 00:49:34 UTC (rev 3958) @@ -748,7 +748,6 @@ rb_objc_finalizer_finalize(void *rcv, SEL sel) { rb_vm_finalizer_t *f = (rb_vm_finalizer_t *)rcv; - rb_vm_set_multithreaded(true); rb_vm_call_finalizer(f); rb_vm_unregister_finalizer(f); if (rb_objc_finalizer_finalize_super != NULL) { Modified: MacRuby/trunk/gcd.c =================================================================== --- MacRuby/trunk/gcd.c 2010-04-22 07:50:59 UTC (rev 3957) +++ MacRuby/trunk/gcd.c 2010-04-23 00:49:34 UTC (rev 3958) @@ -362,7 +362,6 @@ if (block == NULL) { rb_raise(rb_eArgError, "block not given"); } - rb_vm_set_multithreaded(true); #if GCD_BLOCKS_COPY_DVARS block = rb_vm_dup_block(block); for (int i = 0; i < block->dvars_size; i++) { @@ -1150,7 +1149,7 @@ rb_dispatch_begin_thread(void) { if (old_dispatch_begin_thread_4GC != NULL) { - (*old_dispatch_begin_thread_4GC)(); + (*old_dispatch_begin_thread_4GC)(); } rb_vm_register_current_alien_thread(); } @@ -1159,7 +1158,7 @@ rb_dispatch_end_thread(void) { if (old_dispatch_end_thread_4GC != NULL) { - (*old_dispatch_end_thread_4GC)(); + (*old_dispatch_end_thread_4GC)(); } rb_vm_unregister_current_alien_thread(); } @@ -1173,7 +1172,6 @@ dispatch_end_thread_4GC = rb_dispatch_end_thread; } - void Init_Dispatch(void) { Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-04-22 07:50:59 UTC (rev 3957) +++ MacRuby/trunk/vm.cpp 2010-04-23 00:49:34 UTC (rev 3958) @@ -298,7 +298,6 @@ RoxorCore::RoxorCore(void) { running = false; - multithreaded = false; abort_on_exception = false; pthread_assert(pthread_mutex_init(&gl, 0)); @@ -4455,26 +4454,10 @@ void * rb_vm_create_vm(void) { - GET_CORE()->set_multithreaded(true); - return (void *)new RoxorVM(*GET_VM()); } -extern "C" -bool -rb_vm_is_multithreaded(void) -{ - return GET_CORE()->get_multithreaded(); -} - -extern "C" void -rb_vm_set_multithreaded(bool flag) -{ - GET_CORE()->set_multithreaded(flag); -} - -void RoxorCore::register_thread(VALUE thread) { RoxorCoreLock lock; @@ -4988,6 +4971,8 @@ RoxorVM::main = new RoxorVM(); pthread_assert(pthread_key_create(&RoxorVM::vm_thread_key, NULL)); + pthread_assert(pthread_setspecific(RoxorVM::vm_thread_key, + (void *)RoxorVM::main)); setup_builtin_stubs(); @@ -5109,7 +5094,7 @@ void RoxorVM::setup_from_current_thread(void) { - pthread_setspecific(RoxorVM::vm_thread_key, (void *)this); + pthread_assert(pthread_setspecific(RoxorVM::vm_thread_key, (void *)this)); rb_vm_thread_t *t = (rb_vm_thread_t *)xmalloc(sizeof(rb_vm_thread_t)); rb_vm_thread_pre_init(t, NULL, 0, NULL, (void *)this); @@ -5124,10 +5109,10 @@ void rb_vm_register_current_alien_thread(void) { - // This callback is not used, we prefer to create RoxorVM objects - // lazily (in RoxorVM::current()), for performance reasons, because the - // callback is called *a lot* and most of the time from various parts of - // the system which will never ask us to execute Ruby code. + // The creation of RoxorVM objects is done lazily (in RoxorVM::current()) + // for performance reason, because the callback is called *a lot* and most + // of the time from various parts of the system which will never ask us to + // execute Ruby code. #if 0 if (GET_CORE()->get_running()) { printf("registered alien thread %p\n", pthread_self()); @@ -5141,9 +5126,18 @@ void rb_vm_unregister_current_alien_thread(void) { + if (!GET_CORE()->get_running()) { + return; + } + + pthread_t self = pthread_self(); + if (GetThreadPtr(RoxorVM::main->get_thread())->thread == self) { + // Do not unregister the main thread. + return; + } + // Check if the current pthread has been registered. RoxorCoreLock lock; - pthread_t self = pthread_self(); VALUE ary = GET_CORE()->get_threads(); bool need_to_unregister = false; for (int i = 0; i < RARRAY_LEN(ary); i++) { Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-04-22 07:50:59 UTC (rev 3957) +++ MacRuby/trunk/vm.h 2010-04-23 00:49:34 UTC (rev 3958) @@ -425,9 +425,6 @@ Class rb_vm_set_current_class(Class klass); Class rb_vm_get_current_class(void); -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 @@ -620,7 +617,6 @@ // State. bool running; - bool multithreaded; bool abort_on_exception; VALUE loaded_features; VALUE load_path; @@ -689,7 +685,6 @@ ~RoxorCore(void); ACCESSOR(running, bool); - ACCESSOR(multithreaded, bool); ACCESSOR(abort_on_exception, bool); ACCESSOR(default_random, VALUE); READER(loaded_features, VALUE); @@ -706,14 +701,10 @@ int trap_level_for_signal(int signal); void lock(void) { - if (multithreaded) { - assert(pthread_mutex_lock(&gl) == 0); - } + assert(pthread_mutex_lock(&gl) == 0); } void unlock(void) { - if (multithreaded) { - assert(pthread_mutex_unlock(&gl) == 0); - } + assert(pthread_mutex_unlock(&gl) == 0); } void register_thread(VALUE thread); @@ -894,21 +885,17 @@ static pthread_key_t vm_thread_key; static force_inline RoxorVM *current(void) { - if (GET_CORE()->get_multithreaded()) { - void *vm = pthread_getspecific(vm_thread_key); - if (vm == NULL) { - // The value does not exist yet, which means we are called - // from a thread that was not created by MacRuby directly - // (potentially the GC thread or Cocoa). In this case, we - // create a new VM object just for this thread. - // XXX the VM object is never detroyed. - RoxorVM *new_vm = new RoxorVM(); - new_vm->setup_from_current_thread(); - return new_vm; - } - return (RoxorVM *)vm; + void *vm = pthread_getspecific(vm_thread_key); + if (vm == NULL) { + // The value does not exist yet, which means we are called + // from a thread that was not created by MacRuby directly + // (potentially the GC thread or Cocoa). In this case, we + // create a new VM object just for this thread. + RoxorVM *new_vm = new RoxorVM(); + new_vm->setup_from_current_thread(); + return new_vm; } - return RoxorVM::main; + return (RoxorVM *)vm; } private:

1 0