Merge remote-tracking branch 'origin' into 1.8.7

brixen · brixen · commit db118c07091b · 2015-07-17T10:56:47.000-07:00
Conflicts:
	gems_list.txt
diff --git a/kernel/common/thread_group.rb b/kernel/common/thread_group.rb
@@ -17,7 +17,7 @@ def add(thread)
     tm = Rubinius::Mirror.reflect thread
     tm.group = self
 
-    @threads << thread
+    Rubinius.synchronize(@threads) { @threads << thread }
 
     self
   end
diff --git a/kernel/common/thread_group_mirror.rb b/kernel/common/thread_group_mirror.rb
@@ -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
diff --git a/vm/environment.cpp b/vm/environment.cpp
@@ -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);
diff --git a/vm/llvm/inline_policy.hpp b/vm/llvm/inline_policy.hpp
@@ -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;
       }
 
diff --git a/vm/llvm/jit_builder.cpp b/vm/llvm/jit_builder.cpp
@@ -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;
     }
 
diff --git a/vm/llvm/state.cpp b/vm/llvm/state.cpp
@@ -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++;
 
diff --git a/vm/util/logger.cpp b/vm/util/logger.cpp
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -603,15 +603,15 @@ namespace rubinius {`
`603`	`603`	`root_vm->set_call_frame(0);`
`604`	`604`	`}`
`605`	`605`
`606`		`- shared->finalizer_handler()->finish(state, gct);`
`607`		`-`
`608`	`606`	`root_vm->set_call_frame(0);`
`609`	`607`
`610`	`608`	`// Hold everyone.`
`611`	`609`	`while(!state->stop_the_world()) {`
`612`	`610`	`state->checkpoint(gct, 0);`
`613`	`611`	`}`
`614`	`612`
	`613`	`+ shared->finalizer_handler()->finish(state, gct);`
	`614`	`+`
`615`	`615`	`NativeMethod::cleanup_thread(state);`
`616`	`616`
`617`	`617`	`state->shared().signals()->stop(state);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ namespace rubinius {`
`45`	`45`	`try {`
`46`	`46`	`eval.drive(mcode);`
`47`	`47`	`} catch(LLVMState::CompileError& e) {`
`48`		`- utilities::logger::warn("JIT: inline evaluator: compile error: %s", e.error());`
	`48`	`+ utilities::logger::info("JIT: inline evaluator: compile error: %s", e.error());`
`49`	`49`	`return false;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ namespace jit {`
`572`	`572`	`try {`
`573`	`573`	`walker.run<Walker>(cb);`
`574`	`574`	`} catch(LLVMState::CompileError &e) {`
`575`		`- utilities::logger::warn("JIT: builder: generate body: compile error: %s", e.error());`
	`575`	`+ utilities::logger::info("JIT: builder: generate body: compile error: %s", e.error());`
`576`	`576`	`return false;`
`577`	`577`	`}`
`578`	`578`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ namespace rubinius {`
`318`	`318`	`continue;`
`319`	`319`	`}`
`320`	`320`	`} catch(LLVMState::CompileError& e) {`
`321`		`- utilities::logger::warn("JIT: compile error: %s", e.error());`
	`321`	`+ utilities::logger::info("JIT: compile error: %s", e.error());`
`322`	`322`
`323`	`323`	`vm()->metrics().jit.methods_failed++;`
`324`	`324`