Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin' into 1.8.7
Browse files Browse the repository at this point in the history
brixen committed Apr 26, 2015
2 parents 5252fc0 + 6ce75ef commit baedc00
Showing 2 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions kernel/common/autoload.rb
Original file line number Diff line number Diff line change
@@ -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

3 changes: 2 additions & 1 deletion vm/internal_threads.cpp
Original file line number Diff line number Diff line change
@@ -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();
}
}

0 comments on commit baedc00

Please sign in to comment.