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: aa7814191b3c
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9088c10dd6f6
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 17, 2015

  1. Synchronize ThreadGroup#add. Closes #3467. 

    Ruby generally makes no guarantees about thread safety, however, many
accidental "guarantees" are assumed by Ruby programmers because of MRI's
global interpreter lock.

Rubinius makes internal operaions thread safe but generally does not make any
thread safety guarantees for common Ruby objects like Array or Hash instances.
It's perfectly possible to "corrupt" an Array by concurrently modifying it
without synchronization.

ThreadGroup presents an interesting case, however, because it is arguably a
system structure. The API of ThreadGroup is minimal, consisting of these
methods: add, enclose, enclosed?, list.

Of these, only add presents a thread safety issue from the perspective of a
potentially "corrupted" structure (ie the list of Threads in the group). It's
possible for one Thread to enclose the group and another to get 'false' when
calling #enclosed? "after" the other Thread called #enclose. That's not a case
we are concerned with. The case of calling #add (which will implicitly also
remove the Thread from another group if it is a member) should probably be
thread safe.

For this reason, we add synchronization around adding (and removing) a Thread
from a ThreadGroup.
    @brixen
    brixen committed Jul 17, 2015
    Copy the full SHA
    cddadf0 View commit details

  2. Switched JIT log warnings to info.

    @brixen
    brixen committed Jul 17, 2015
    Copy the full SHA
    9088c10 View commit details
Showing with 5 additions and 6 deletions.
  1. +1 −1 kernel/common/thread_group.rb
  2. +1 −2 kernel/common/thread_group_mirror.rb
  3. +1 −1 vm/llvm/inline_policy.hpp
  4. +1 −1 vm/llvm/jit_builder.cpp
  5. +1 −1 vm/llvm/state.cpp
2 changes: 1 addition & 1 deletion kernel/common/thread_group.rb
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ def add(thread)
tm = Rubinius::Mirror.reflect thread
tm.group = self

@threads << thread
Rubinius.synchronize(@threads) { @threads << thread }

self
end
3 changes: 1 addition & 2 deletions kernel/common/thread_group_mirror.rb
View file
Original file line number Diff line number Diff line change
@@ -5,9 +5,8 @@ class ThreadGroup < Mirror

def remove(thread)
ary = Rubinius.invoke_primitive :object_get_ivar, @object, :@threads
ary.delete thread
Rubinius.synchronize(ary) { ary.delete thread }
end

end
end
end
2 changes: 1 addition & 1 deletion vm/llvm/inline_policy.hpp
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ namespace rubinius {
try {
eval.drive(mcode);
} catch(LLVMState::CompileError& e) {
utilities::logger::warn("JIT: inline evaluator: compile error: %s", e.error());
utilities::logger::info("JIT: inline evaluator: compile error: %s", e.error());
return false;
}

2 changes: 1 addition & 1 deletion vm/llvm/jit_builder.cpp
View file
Original file line number Diff line number Diff line change
@@ -572,7 +572,7 @@ namespace jit {
try {
walker.run<Walker>(cb);
} catch(LLVMState::CompileError &e) {
utilities::logger::warn("JIT: builder: generate body: compile error: %s", e.error());
utilities::logger::info("JIT: builder: generate body: compile error: %s", e.error());
return false;
}

2 changes: 1 addition & 1 deletion vm/llvm/state.cpp
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,7 @@ namespace rubinius {
continue;
}
} catch(LLVMState::CompileError& e) {
utilities::logger::warn("JIT: compile error: %s", e.error());
utilities::logger::info("JIT: compile error: %s", e.error());

vm()->metrics().jit.methods_failed++;