Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin' into 1.8.7
Conflicts:
	gems_list.txt
  • Loading branch information
brixen committed Jul 17, 2015
2 parents a4c0ad7 + 9088c10 commit db118c07091bd3654c23e60ca46d3d8ff5ec49c4
Showing with 12 additions and 8 deletions.
  1. +1 −1 kernel/common/thread_group.rb
  2. +1 −2 kernel/common/thread_group_mirror.rb
  3. +2 −2 vm/environment.cpp
  4. +1 −1 vm/llvm/inline_policy.hpp
  5. +1 −1 vm/llvm/jit_builder.cpp
  6. +1 −1 vm/llvm/state.cpp
  7. +5 −0 vm/util/logger.cpp
@@ -17,7 +17,7 @@ def add(thread)
tm = Rubinius::Mirror.reflect thread
tm.group = self

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

self
end
@@ -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
@@ -603,15 +603,15 @@ namespace rubinius {
root_vm->set_call_frame(0);
}

shared->finalizer_handler()->finish(state, gct);

root_vm->set_call_frame(0);

// Hold everyone.
while(!state->stop_the_world()) {
state->checkpoint(gct, 0);
}

shared->finalizer_handler()->finish(state, gct);

NativeMethod::cleanup_thread(state);

state->shared().signals()->stop(state);
@@ -45,7 +45,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;
}

@@ -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;
}

@@ -318,7 +318,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++;

@@ -302,6 +302,11 @@ namespace rubinius {
perms_ = va_arg(varargs, int);

logger_fd_ = ::open(path, LOGGER_OPEN_FLAGS, perms_);

// The umask setting will override our permissions for open().
if(chmod(path, perms_) < 0) {
logger::warn("%s: logger: unable to set mode: %s", strerror(errno), path);
}
}

FileLogger::~FileLogger() {

0 comments on commit db118c0

Please sign in to comment.