Merge remote-tracking branch 'origin' into 1.8.7

Conflicts: gems_list.txt
rubinius · Jul 17, 2015 · db118c0 · db118c0
2 parents a4c0ad7 + 9088c10
commit db118c0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
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() {