Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0b831872de7f
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a1df78d2346d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 19, 2016

  1. Fixed Enumerator::Generator naming.

    @brixen
    brixen committed Jun 19, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    IkumaTadokoro ikuma-t
    SSH Key Fingerprint: v79/GQ8zewonDd5a8VwYuEE1fWdxVM6lrtr5AHogajk
    Verified
    Learn about vigilant mode
    Copy the full SHA
    57661f7 View commit details

  2. Only process Threads for locked objects. 

    There is still more cruft here to clean up.
    @brixen
    brixen committed Jun 19, 2016
    Copy the full SHA
    a1df78d View commit details
Showing with 8 additions and 6 deletions.
  1. +2 −2 core/enumerator.rb
  2. +6 −4 machine/thread_nexus.cpp
4 changes: 2 additions & 2 deletions core/enumerator.rb
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ def initialize(receiver_or_size=undefined, method_name=:each, *method_args, &blo
size = receiver_or_size
end

receiver = EnumeratorObject.new(&block)
receiver = Generator.new(&block)
else
if undefined.equal? receiver_or_size
raise ArgumentError, "Enumerator#initialize requires a block when called without arguments"
@@ -184,7 +184,7 @@ def <<(*args)
end
end

class EnumeratorObject
class Generator
include Enumerable

def initialize(&block)
10 changes: 6 additions & 4 deletions machine/thread_nexus.cpp
View file
Original file line number Diff line number Diff line change
@@ -93,10 +93,12 @@ namespace rubinius {
if(VM* vm = (*i)->as_vm()) {
if(vm == current) continue;

if(Thread* thread = vm->thread()) {
if(!thread->nil_p()) {
thread->unlock_after_fork(state);
thread->stopped();
if(vm->kind() == memory::ManagedThread::eThread) {
if(Thread* thread = vm->thread()) {
if(!thread->nil_p()) {
thread->unlock_after_fork(state);
thread->stopped();
}
}
}