Merge remote-tracking branch 'origin' into 1.8.7

rubinius · Apr 26, 2015 · baedc00 · baedc00
2 parents 5252fc0 + 6ce75ef
commit baedc00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/kernel/common/autoload.rb b/kernel/common/autoload.rb
@@ -49,10 +49,12 @@ def call(under, honor_require=false)
   end
 
   def resolve
-    unless @loaded && @thread == Thread.current
-      @loaded = true
-      @thread = Thread.current
-      Rubinius::CodeLoader.require @path
+    Rubinius.synchronize(self) do
+      unless @loaded && @thread == Thread.current
+        @loaded = true
+        @thread = Thread.current
+        Rubinius::CodeLoader.require @path
+      end
     end
   end
 

diff --git a/vm/internal_threads.cpp b/vm/internal_threads.cpp
@@ -76,7 +76,8 @@ namespace rubinius {
 
     if(int error = pthread_create(&vm_->os_thread(), &attrs,
           InternalThread::run, (void*)this)) {
-      logger::error("%s: %s: create thread failed", strerror(error), name_.c_str());
+      logger::fatal("%s: %s: create thread failed", strerror(error), name_.c_str());
+      ::abort();
     }
   }