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

[3461] MacRuby/trunk
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3461 http://trac.macosforge.org/projects/ruby/changeset/3461 Author: lsansonetti(a)apple.com Date: 2010-02-09 14:39:29 -0800 (Tue, 09 Feb 2010) Log Message: ----------- when doing an assignment from thread X to thread Y's stack, defeat the thread-local collector by making X take ownership of the object Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/dispatcher.cpp MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-02-09 02:06:07 UTC (rev 3460) +++ MacRuby/trunk/compiler.cpp 2010-02-09 22:39:29 UTC (rev 3461) @@ -148,6 +148,7 @@ debugTrapFunc = NULL; getFFStateFunc = NULL; setFFStateFunc = NULL; + takeOwnershipFunc = NULL; VoidTy = Type::getVoidTy(context); Int1Ty = Type::getInt1Ty(context); @@ -3454,8 +3455,52 @@ assert(node->nd_value != NULL); Value *new_val = compile_node(node->nd_value); + + const int type = nd_type(node); + if ((type == NODE_DASGN || type == NODE_DASGN_CURR) + && running_block != NULL) { + // Dynamic variables assignments inside a block are a + // little bit complicated: if we are creating new objects + // we do need to defeat the thread-local collector by + // taking ownership of the objects, otherwise the TLC might + // prematurely collect them. This is because the assignment + // is done into another thread's stack, which is not + // honored by the TLC. + Value *flag = new BitCastInst(running_block, Int32PtrTy, + "", bb); + flag = new LoadInst(flag, "", bb); + Value *flagv = ConstantInt::get(Int32Ty, VM_BLOCK_THREAD); + flag = BinaryOperator::CreateAnd(flag, flagv, "", bb); + Value *is_thread = new ICmpInst(*bb, ICmpInst::ICMP_EQ, + flag, flagv); + + Function *f = bb->getParent(); + BasicBlock *is_thread_bb = + BasicBlock::Create(context, "", f); + BasicBlock *merge_bb = + BasicBlock::Create(context, "", f); + + BranchInst::Create(is_thread_bb, merge_bb, + is_thread, bb); + + bb = is_thread_bb; + if (takeOwnershipFunc == NULL) { + takeOwnershipFunc = + cast<Function>(module->getOrInsertFunction( + "rb_vm_take_ownership", + VoidTy, RubyObjTy, NULL)); + } + + std::vector<Value *> params; + params.push_back(new_val); + CallInst::Create(takeOwnershipFunc, params.begin(), + params.end(), "", bb); + BranchInst::Create(merge_bb, bb); + + bb = merge_bb; + } + new StoreInst(new_val, compile_lvar_slot(node->nd_vid), bb); - return new_val; } break; Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-02-09 02:06:07 UTC (rev 3460) +++ MacRuby/trunk/compiler.h 2010-02-09 22:39:29 UTC (rev 3461) @@ -197,9 +197,9 @@ Function *setCurrentClassFunc; Function *getCacheFunc; Function *debugTrapFunc; - // flip-flop Function *getFFStateFunc; Function *setFFStateFunc; + Function *takeOwnershipFunc; Constant *zeroVal; Constant *oneVal; Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-02-09 02:06:07 UTC (rev 3460) +++ MacRuby/trunk/dispatcher.cpp 2010-02-09 22:39:29 UTC (rev 3461) @@ -1573,6 +1573,16 @@ vm->pop_current_block(); + rb_vm_block_t *top_b = vm->current_block(); + if (top_b == NULL) { + if (vm != RoxorVM::main) { + top_b = GetThreadPtr(vm->get_thread())->body; + } + } + if (top_b != NULL && (top_b->flags & VM_BLOCK_THREAD)) { + b->flags |= VM_BLOCK_THREAD; + } + struct Finally { RoxorVM *vm; rb_vm_block_t *b; @@ -1582,6 +1592,7 @@ } ~Finally() { vm->add_current_block(b); + b->flags &= ~VM_BLOCK_THREAD; } } finalizer(vm, b); @@ -1696,6 +1707,10 @@ aot_block = true; } + if (parent_block != NULL && (parent_block->flags & VM_BLOCK_THREAD)) { + flags |= VM_BLOCK_THREAD; + } + if (!cached) { if ((flags & VM_BLOCK_IFUNC) == VM_BLOCK_IFUNC) { b->imp = (IMP)function; Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-02-09 02:06:07 UTC (rev 3460) +++ MacRuby/trunk/vm.cpp 2010-02-09 22:39:29 UTC (rev 3461) @@ -4598,6 +4598,18 @@ extern "C" void +rb_vm_take_ownership(VALUE obj) +{ + // This function allows the given object's ownership to be transfered to + // the current thread. It is used when objects are allocated from a + // thread but assigned into another thread's stack, which is prohibited by + // the thread-local collector. + GC_RETAIN(obj); + GC_RELEASE(obj); +} + +extern "C" +void rb_vm_thread_pre_init(rb_vm_thread_t *t, rb_vm_block_t *body, int argc, const VALUE *argv, void *vm) { @@ -4607,12 +4619,13 @@ GC_WB(&t->body, body); rb_vm_block_make_detachable_proc(body); - // Remove the thread-local bit of all dynamic variables. + // Take ownership of all dynamic variables, mark the block as + // being run from a thread. for (int i = 0; i < body->dvars_size; i++) { VALUE *dvar = body->dvars[i]; - GC_RETAIN(*dvar); - GC_RELEASE(*dvar); + rb_vm_take_ownership(*dvar); } + body->flags |= VM_BLOCK_THREAD; } else { t->body = NULL; Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-02-09 02:06:07 UTC (rev 3460) +++ MacRuby/trunk/vm.h 2010-02-09 22:39:29 UTC (rev 3461) @@ -26,24 +26,26 @@ struct rb_vm_local *next; } rb_vm_local_t; -#define VM_BLOCK_PROC 0x0001 // block is a Proc object -#define VM_BLOCK_LAMBDA 0x0002 // block is a lambda -#define VM_BLOCK_ACTIVE 0x0004 // block is active (being executed) -#define VM_BLOCK_METHOD 0x0008 // block is created from Method -#define VM_BLOCK_IFUNC 0x0010 // block is created from rb_vm_create_block() -#define VM_BLOCK_EMPTY 0x0012 // block has an empty body +#define VM_BLOCK_PROC (1<<0) // block is a Proc object +#define VM_BLOCK_LAMBDA (1<<1) // block is a lambda +#define VM_BLOCK_ACTIVE (1<<2) // block is active (being executed) +#define VM_BLOCK_METHOD (1<<3) // block is created from Method +#define VM_BLOCK_IFUNC (1<<4) // block is created from rb_vm_create_block() +#define VM_BLOCK_EMPTY (1<<5) // block has an empty body +#define VM_BLOCK_THREAD (1<<6) // block is being executed as a Thread +#define VM_BLOCK_AOT (1<<10) // block is created by the AOT compiler + // (temporary) -#define VM_BLOCK_AOT 0x1000 // block is created by the AOT compiler (temporary) - typedef struct rb_vm_block { - VALUE proc; // a reference to a Proc object, or nil + int flags; // IMPORTANT: this field should always be at the beginning. + // Look at how rb_vm_take_ownership() is called in compiler.cpp. + VALUE proc; // a reference to a Proc object, or nil. VALUE self; VALUE klass; VALUE userdata; // if VM_BLOCK_IFUNC, contains the user data, otherwise // contains the key used in the blocks cache. rb_vm_arity_t arity; IMP imp; - int flags; rb_vm_local_t *locals; struct rb_vm_var_uses **parent_var_uses; struct rb_vm_block *parent_block;

1 0

[3460] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3460 http://trac.macosforge.org/projects/ruby/changeset/3460 Author: lsansonetti(a)apple.com Date: 2010-02-08 18:06:07 -0800 (Mon, 08 Feb 2010) Log Message: ----------- refresh the nsstring specs Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/constant_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt Modified: MacRuby/trunk/spec/macruby/core/constant_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/constant_spec.rb 2010-02-09 01:08:20 UTC (rev 3459) +++ MacRuby/trunk/spec/macruby/core/constant_spec.rb 2010-02-09 02:06:07 UTC (rev 3460) @@ -3,7 +3,7 @@ describe "A BridgeSupport constant" do it "of type 'id' is available as an Object in Ruby" do - ConstantObject.class.should == NSString + ConstantObject.is_a?(String).should == true ConstantObject.should == 'foo' end Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt 2010-02-09 01:08:20 UTC (rev 3459) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/string_tags.txt 2010-02-09 02:06:07 UTC (rev 3460) @@ -1,3 +1,5 @@ critical:The NSString class can be subclassed and later instantiated critical:An NSString object can have a singleton class +critical:An NSString object is immutable +fails:An NSString object is an instance of the NSString class fails:A String object can match() a Regex

1 0

[3459] MacRuby/trunk/array.c
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3459 http://trac.macosforge.org/projects/ruby/changeset/3459 Author: lsansonetti(a)apple.com Date: 2010-02-08 17:08:20 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Array#sample: raise an exception if given count is negative, get rid of bad allocas Modified Paths: -------------- MacRuby/trunk/array.c Modified: MacRuby/trunk/array.c =================================================================== --- MacRuby/trunk/array.c 2010-02-09 00:44:23 UTC (rev 3458) +++ MacRuby/trunk/array.c 2010-02-09 01:08:20 UTC (rev 3459) @@ -2833,6 +2833,9 @@ } rb_scan_args(argc, argv, "1", &nv); n = NUM2LONG(nv); + if (n < 0) { + rb_raise(rb_eArgError, "negative count"); + } len = RARRAY_LEN(ary); if (n > len) { n = len; @@ -2884,20 +2887,22 @@ memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j)); sorted[j] = idx[i] = k; } - VALUE *elems = (VALUE *)alloca(sizeof(VALUE) * n); + VALUE *elems = (VALUE *)malloc(sizeof(VALUE) * n); for (i = 0; i < n; i++) { elems[i] = RARRAY_AT(ary, idx[i]); } result = rb_ary_new4(n, elems); + free(elems); } else { - VALUE *elems = (VALUE *)alloca(sizeof(VALUE) * n); + VALUE *elems = (VALUE *)malloc(sizeof(VALUE) * n); for (i = 0; i < n; i++) { j = (long)(rb_genrand_real() * (len - i)) + i; nv = RARRAY_AT(ary, j); elems[i] = nv; } result = rb_ary_new4(n, elems); + free(elems); } return result;

1 0

[3458] MacRuby/trunk/thread.c
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3458 http://trac.macosforge.org/projects/ruby/changeset/3458 Author: lsansonetti(a)apple.com Date: 2010-02-08 16:44:23 -0800 (Mon, 08 Feb 2010) Log Message: ----------- don't always assume that a thread as a group Modified Paths: -------------- MacRuby/trunk/thread.c Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2010-02-09 00:27:14 UTC (rev 3457) +++ MacRuby/trunk/thread.c 2010-02-09 00:44:23 UTC (rev 3458) @@ -59,7 +59,11 @@ rb_vm_thread_pre_init(t, b, argc, argv, rb_vm_create_vm()); // The thread's group is always the parent's one. - rb_thgroup_add(GetThreadPtr(rb_vm_current_thread())->group, thread); + // The parent group might be nil (ex. if created from GCD). + VALUE group = GetThreadPtr(rb_vm_current_thread())->group; + if (group != Qnil) { + rb_thgroup_add(group, thread); + } // Retain the Thread object to avoid a potential GC, the corresponding // release is done in rb_vm_thread_run(). @@ -1257,15 +1261,17 @@ rb_thread_remove_from_group(VALUE thread) { rb_vm_thread_t *t = GetThreadPtr(thread); - rb_thread_group_t *tg = GetThreadGroupPtr(t->group); - thgroup_lock(tg); - if (rb_ary_delete(tg->threads, thread) != thread) { - printf("trying to remove a thread (%p) from a group that doesn't "\ - "contain it\n", (void *)thread); - abort(); + if (t->group != Qnil) { + rb_thread_group_t *tg = GetThreadGroupPtr(t->group); + thgroup_lock(tg); + if (rb_ary_delete(tg->threads, thread) != thread) { + printf("trying to remove a thread (%p) from a group that doesn't "\ + "contain it\n", (void *)thread); + abort(); + } + thgroup_unlock(tg); + t->group = Qnil; } - thgroup_unlock(tg); - t->group = Qnil; } /*

1 0

[3457] MacRuby/trunk/load.c
by source_changes＠macosforge.org 09 Feb '10

09 Feb '10

Revision: 3457 http://trac.macosforge.org/projects/ruby/changeset/3457 Author: lsansonetti(a)apple.com Date: 2010-02-08 16:27:14 -0800 (Mon, 08 Feb 2010) Log Message: ----------- revert bad change introduced by thibault Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2010-02-08 23:49:25 UTC (rev 3456) +++ MacRuby/trunk/load.c 2010-02-09 00:27:14 UTC (rev 3457) @@ -227,7 +227,7 @@ if (*name_cstr == '/' || *name_cstr == '.') { // Given name is an absolute path. name = rb_file_expand_path(name, Qnil); - return check_path(name_cstr, out, type); + return check_path(RSTRING_PTR(name), out, type); } // Given name is not an absolute path, we need to go through $:.

1 0

[3456] MacRuby/trunk/load.c
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3456 http://trac.macosforge.org/projects/ruby/changeset/3456 Author: martinlagardette(a)apple.com Date: 2010-02-08 15:49:25 -0800 (Mon, 08 Feb 2010) Log Message: ----------- - Removing an old limitation of 32bit macruby being unable to load rbo files - Should fix #579 Modified Paths: -------------- MacRuby/trunk/load.c Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2010-02-08 23:05:40 UTC (rev 3455) +++ MacRuby/trunk/load.c 2010-02-08 23:49:25 UTC (rev 3456) @@ -227,7 +227,7 @@ if (*name_cstr == '/' || *name_cstr == '.') { // Given name is an absolute path. name = rb_file_expand_path(name, Qnil); - return check_path(RSTRING_PTR(name), out, type); + return check_path(name_cstr, out, type); } // Given name is not an absolute path, we need to go through $:. @@ -392,11 +392,7 @@ const char *var_load_path = "$:"; ID id_load_path = rb_intern(var_load_path); -#if __LP64__ rbo_enabled = !ruby_is_miniruby && getenv("VM_DISABLE_RBO") == NULL; -#else - rbo_enabled = false; // rbo are only 64-bit for now. -#endif rb_define_virtual_variable("$:", rb_vm_load_path, 0); rb_alias_variable((rb_intern)("$-I"), id_load_path);

1 0

[3455] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3455 http://trac.macosforge.org/projects/ruby/changeset/3455 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:05:40 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Create and pass spec for Enumerable#p_find Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:29 UTC (rev 3454) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:40 UTC (rev 3455) @@ -31,41 +31,50 @@ # Parallel +collect+ plus +inject+ # Accumulates from +initial+ via +op+ (default = '+') + # Note: each object can only run one mapreduce at a time def p_mapreduce(initial, op=:+, &block) + raise ArgumentError if not initial.respond_to? op + # Since exceptions from a Dispatch block can act funky @mapreduce_q ||= Dispatch::Queue.new("enumerable.p_mapreduce.#{object_id}") - # Ideally should set from within a Dispatch.once to avoid race - raise ArgumentError if not initial.respond_to? op - # Since exceptions from a Dispatch block act funky + # Ideally should run from within a Dispatch.once to avoid race @mapreduce_q.sync do - @result = initial - q = Dispatch.queue_for(@result) - p_each do |obj| + @mapreduce_result = initial + q = Dispatch.queue_for(@mapreduce_result) + self.p_each do |obj| val = block.call(obj) - q.async { @result = @result.send(op, val) } + q.async { @mapreduce_result = @mapreduce_result.send(op, val) } end q.sync {} - return @result # can return from inside the block + return @mapreduce_result end end - # Parallel +select+; will return array of objects for which # +&block+ returns true. def p_find_all(&block) found_all = Dispatch.wrap(Array) self.p_each { |obj| found_all << obj if block.call(obj) } - found_all._done # will this leak? + found_all._done_ end # Parallel +detect+; will return -one- match for +&block+ # but it may not be the 'first' # Only useful if the test block is very expensive to run + # Note: each object can only run one find at a time + 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? + @find_q ||= Dispatch::Queue.new("enumerable.p_find.#{object_id}") + @find_q.sync do + @find_result = nil + q = Dispatch.queue_for(@find_result) + self.p_each do |obj| + if @find_result.nil? + found = block.call(obj) + q.async { @find_result = obj if found } + end + end + q.sync {} #if @find_result.nil? + return @find_result end - found._done # will this leak? end end Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:05:29 UTC (rev 3454) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:05:40 UTC (rev 3455) @@ -39,25 +39,18 @@ @ary.p_each_with_index {|v, i| temp = v**i; @q.sync {@sum2 += temp} } @sum2.should == @sum1 end - - it "should execute concurrently" do - true.should == true - end end describe :p_map do it "exists on objects that support Enumerable" do @ary.respond_to?(:p_map).should == true end + it "should behave like map" do map1 = @ary.map {|v| v*v} map2 = @ary.p_map {|v| v*v} map2.should == map1 end - - it "should execute concurrently" do - true.should == true - end end describe :p_mapreduce do @@ -85,11 +78,37 @@ sum2 = @ary.p_mapreduce(0, :|) {|v| v**2} sum2.should == sum1 end - - it "should execute concurrently" do - true.should == true + end + + describe :p_find_all do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_find_all).should == true + end + + it "should behave like find_all" do + found1 = @ary.find_all {|v| v.odd?} + found2 = @ary.p_find_all {|v| v.odd?} + found2.sort.should == found1 end end + describe :p_find do + it "exists on objects that support Enumerable" do + @ary.respond_to?(:p_find).should == true + end + + it "returns nil if nothing found" do + found2 = @ary.p_find {|v| false} + found2.should.nil? + end + + it "returns one element that matches the condition" do + found1 = @ary.find_all {|v| v.odd?} + found2 = @ary.p_find {|v| v.odd?} + found2.should_not.nil? + found1.include? found2 + end + end + end end \ No newline at end of file

1 0

[3454] MacRuby/trunk/lib/dispatch/enumerable.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3454 http://trac.macosforge.org/projects/ruby/changeset/3454 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:05:29 -0800 (Mon, 08 Feb 2010) Log Message: ----------- wrap Enumerable#p_mapreduce in serial queue to protect @result Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:16 UTC (rev 3453) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:29 UTC (rev 3454) @@ -31,19 +31,21 @@ # Parallel +collect+ plus +inject+ # Accumulates from +initial+ via +op+ (default = '+') - def p_mapreduce(result, op=:+, &block) - raise ArgumentError if not result.respond_to? op + def p_mapreduce(initial, op=:+, &block) + @mapreduce_q ||= Dispatch::Queue.new("enumerable.p_mapreduce.#{object_id}") + # Ideally should set from within a Dispatch.once to avoid race + raise ArgumentError if not initial.respond_to? op # Since exceptions from a Dispatch block act funky - @result = result - q = Dispatch.queue_for(@result) - self.p_each do |obj| - val = block.call(obj) - q.async do - @result = @result.send(op, val) + @mapreduce_q.sync do + @result = initial + q = Dispatch.queue_for(@result) + p_each do |obj| + val = block.call(obj) + q.async { @result = @result.send(op, val) } end + q.sync {} + return @result # can return from inside the block end - q.sync {} - @result end

1 0

[3453] MacRuby/trunk
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3453 http://trac.macosforge.org/projects/ruby/changeset/3453 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:05:16 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Enumerable::p_mapdispatch works, but may not be thread safe Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:07 UTC (rev 3452) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:16 UTC (rev 3453) @@ -34,15 +34,16 @@ def p_mapreduce(result, op=:+, &block) raise ArgumentError if not result.respond_to? op # Since exceptions from a Dispatch block act funky - q = Dispatch.queue_for(result) + @result = result + q = Dispatch.queue_for(@result) self.p_each do |obj| val = block.call(obj) q.async do - result = result.send(op, val) + @result = @result.send(op, val) end end q.sync {} - result + @result end Modified: MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:05:07 UTC (rev 3452) +++ MacRuby/trunk/spec/macruby/library/dispatch/enumerable_spec.rb 2010-02-08 23:05:16 UTC (rev 3453) @@ -67,8 +67,8 @@ it "should behave like an unordered map" do map1 = @ary.map {|v| v*v} - map2 = @ary.p_mapreduce([]) {|v| v*v} - map1.should == map2.sort + map2 = @ary.p_mapreduce([]) {|v| [v*v]} + map2.sort.should == map1 end it "should accumulate any object that takes :<< " do

1 0

[3452] MacRuby/trunk/lib/dispatch/enumerable.rb
by source_changes＠macosforge.org 08 Feb '10

08 Feb '10

Revision: 3452 http://trac.macosforge.org/projects/ruby/changeset/3452 Author: ernest.prabhakar(a)gmail.com Date: 2010-02-08 15:05:07 -0800 (Mon, 08 Feb 2010) Log Message: ----------- Another attempt at mapreduce, using local variables Modified Paths: -------------- MacRuby/trunk/lib/dispatch/enumerable.rb Modified: MacRuby/trunk/lib/dispatch/enumerable.rb =================================================================== --- MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:04:57 UTC (rev 3451) +++ MacRuby/trunk/lib/dispatch/enumerable.rb 2010-02-08 23:05:07 UTC (rev 3452) @@ -31,22 +31,18 @@ # Parallel +collect+ plus +inject+ # Accumulates from +initial+ via +op+ (default = '+') - def p_mapreduce(initial, op=:+, &block) - raise ArgumentError if not initial.respond_to? op + def p_mapreduce(result, op=:+, &block) + raise ArgumentError if not result.respond_to? op # Since exceptions from a Dispatch block act funky - q = Dispatch.queue_for(initial) - ivar = "@#{Dispatch.label_for(initial)}" - p ivar - self.instance_variable_set(ivar, initial) #is creating an ivar thread-safe? + q = Dispatch.queue_for(result) self.p_each do |obj| val = block.call(obj) q.async do - sum = self.instance_variable_get(ivar).send(op, val) - self.instance_variable_set(ivar, sum) + result = result.send(op, val) end end q.sync {} - self.send(:remove_instance_variable, ivar) + result end

1 0