New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treat deadlocks as circular require - as MRI does it #3370

Merged
merged 1 commit into from Mar 3, 2016

Conversation

Projects
None yet
3 participants
@mkristian
Member

mkristian commented Oct 5, 2015

#3341 has two simple tests which produces deadlocks on the current master branch.

this PR does fix it to the extend that I do not see deadlocks anymore.

@headius please review and I would some input on tests, i.e. it should be possible to run those tests from #3341 on CI but I am not if this makes sense

@headius

This comment has been minimized.

Show comment
Hide comment
@headius

headius Oct 5, 2015

Member

I'll have a look.

Member

headius commented Oct 5, 2015

I'll have a look.

improve RequireLock to better match its semantic
this eventually fixes #3341 in the sense that both testcases
do not produce deadlocks anymore.

Sponsored by Lookout Inc.

@mkristian mkristian changed the title from fixes two possible deadlocks to treat deadlocks as circular require - as MRI does it Oct 8, 2015

@kares kares added this to the JRuby 9.1.0.0 milestone Feb 5, 2016

headius added a commit that referenced this pull request Mar 3, 2016

Merge pull request #3370 from jruby/deadlock
treat deadlocks as circular require - as MRI does it

@headius headius merged commit 16e5792 into master Mar 3, 2016

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details

@headius headius deleted the deadlock branch Mar 3, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment