-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Truffle] Abstract the safepoint mechanism so other features can re-u…
…se it.
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
- 9.0.4.0
- 9.0.3.0
- 9.0.1.0
- 9.0.0.0
- 9.0.0.0.rc2
- 9.0.0.0.rc1
- 9.0.0.0.pre2
- 9.0.0.0.pre1
1 parent
4b2c130
commit 9951841
Showing
12 changed files
with
879 additions
and
691 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
658 changes: 658 additions & 0 deletions
658
core/src/main/java/org/jruby/truffle/nodes/debug/ProxyNode.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
607 changes: 18 additions & 589 deletions
607
core/src/main/java/org/jruby/truffle/nodes/debug/RubyWrapper.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
core/src/main/java/org/jruby/truffle/runtime/subsystems/SafePointManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /* | ||
| * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This | ||
| * code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
| * redistribute it and/or modify it under the terms of the: | ||
| * | ||
| * Eclipse Public License version 1.0 | ||
| * GNU General Public License version 2 | ||
| * GNU Lesser General Public License version 2.1 | ||
| */ | ||
| package org.jruby.truffle.runtime.subsystems; | ||
|
|
||
| import com.oracle.truffle.api.Assumption; | ||
| import com.oracle.truffle.api.CompilerAsserts; | ||
| import com.oracle.truffle.api.CompilerDirectives; | ||
| import com.oracle.truffle.api.Truffle; | ||
| import com.oracle.truffle.api.nodes.InvalidAssumptionException; | ||
| import org.jruby.truffle.runtime.RubyContext; | ||
| import org.jruby.truffle.runtime.util.Consumer; | ||
|
|
||
| import java.util.concurrent.BrokenBarrierException; | ||
| import java.util.concurrent.CyclicBarrier; | ||
| import java.util.concurrent.locks.Lock; | ||
| import java.util.concurrent.locks.ReentrantLock; | ||
|
|
||
| public class SafepointManager { | ||
|
|
||
| private final RubyContext context; | ||
|
|
||
| private final Lock lock = new ReentrantLock(); | ||
| @CompilerDirectives.CompilationFinal private Assumption assumption = Truffle.getRuntime().createAssumption(); | ||
| private CyclicBarrier barrier; | ||
| private int liveThreads = 1; | ||
| private Consumer<Boolean> action; | ||
|
|
||
| public SafepointManager(RubyContext context) { | ||
| this.context = context; | ||
| } | ||
|
|
||
| public void enterThread() { | ||
| CompilerAsserts.neverPartOfCompilation(); | ||
|
|
||
| try { | ||
| lock.lock(); | ||
| liveThreads++; | ||
| } finally { | ||
| lock.unlock(); | ||
| } | ||
| } | ||
|
|
||
| public void leaveThread() { | ||
| CompilerAsserts.neverPartOfCompilation(); | ||
|
|
||
| try { | ||
| lock.lock(); | ||
|
|
||
| poll(); | ||
|
|
||
| liveThreads--; | ||
| } finally { | ||
| lock.unlock(); | ||
| } | ||
| } | ||
|
|
||
| public void poll() { | ||
| try { | ||
| assumption.check(); | ||
| } catch (InvalidAssumptionException e) { | ||
| context.outsideGlobalLock(new Runnable() { | ||
|
|
||
| @Override | ||
| public void run() { | ||
| while (true) { | ||
| try { | ||
| barrier.await(); | ||
| break; | ||
| } catch (BrokenBarrierException e) { | ||
| throw new RuntimeException(e); | ||
| } catch (InterruptedException e) { | ||
| } | ||
| } | ||
|
|
||
| action.accept(false); | ||
|
|
||
| while (true) { | ||
| try { | ||
| barrier.await(); | ||
| break; | ||
| } catch (BrokenBarrierException e) { | ||
| throw new RuntimeException(e); | ||
| } catch (InterruptedException e) { | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| }); | ||
| } | ||
| } | ||
|
|
||
| public void pauseAllThreadsAndExecute(final Consumer<Boolean> action) { | ||
| CompilerAsserts.neverPartOfCompilation(); | ||
|
|
||
| context.outsideGlobalLock(new Runnable() { | ||
|
|
||
| @Override | ||
| public void run() { | ||
| try { | ||
| lock.lock(); | ||
|
|
||
| SafepointManager.this.action = action; | ||
|
|
||
| barrier = new CyclicBarrier(liveThreads); | ||
|
|
||
| assumption.invalidate(); | ||
|
|
||
| while (true) { | ||
| try { | ||
| barrier.await(); | ||
| break; | ||
| } catch (BrokenBarrierException e) { | ||
| throw new RuntimeException(e); | ||
| } catch (InterruptedException e) { | ||
| } | ||
| } | ||
|
|
||
| action.accept(true); | ||
|
|
||
| while (true) { | ||
| try { | ||
| barrier.await(); | ||
| break; | ||
| } catch (BrokenBarrierException e) { | ||
| throw new RuntimeException(e); | ||
| } catch (InterruptedException e) { | ||
| } | ||
| } | ||
|
|
||
| assumption = Truffle.getRuntime().createAssumption(); | ||
| } finally { | ||
| lock.unlock(); | ||
| } | ||
| } | ||
|
|
||
| }); | ||
| } | ||
|
|
||
| } |
16 changes: 16 additions & 0 deletions
16
core/src/main/java/org/jruby/truffle/runtime/util/Consumer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved. This | ||
| * code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
| * redistribute it and/or modify it under the terms of the: | ||
| * | ||
| * Eclipse Public License version 1.0 | ||
| * GNU General Public License version 2 | ||
| * GNU Lesser General Public License version 2.1 | ||
| */ | ||
| package org.jruby.truffle.runtime.util; | ||
|
|
||
| public interface Consumer<T> { | ||
|
|
||
| void accept(T value); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9951841There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reverted that commit since jruby/core does not compile anymore and it is not possible to very my fix for mvn -Posgi on travis if nothing compiles. hope that is OK for you - I looked like there were just classes missing on the classpath.
9951841There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, thanks. I should build from clean before I commit - sometimes Maven doesn't seem to get the recompilation of generated sources quite right.
9951841There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The problem was a file renamed by changing the case of one letter - turns out this upsets either OS X or Git, not sure which.