eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2025-01-08 07:54:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes threading issue in DependencyChecker

Browse Source
This commit is contained in:
konsoletyper 2014-01-10 15:30:41 +04:00
parent 2214433d6c
commit ca29e10aeb
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
teavm-core/src/main/java/org/teavm/dependency/DependencyChecker.java
View File

@ -106,7 +106,9 @@ public class DependencyChecker {
} }
void schedule(final Runnable runnable) { void schedule(final Runnable runnable) {
activeTaskCount.incrementAndGet(); synchronized (activeTaskMonitor) {
activeTaskCount.incrementAndGet();
}
try { try {
executor.execute(new Runnable() { executor.execute(new Runnable() {
@Override public void run() { @Override public void run() {
@ -117,8 +119,8 @@ public class DependencyChecker {
exceptionOccured.compareAndSet(null, e); exceptionOccured.compareAndSet(null, e);
executor.shutdownNow(); executor.shutdownNow();
} }
if (activeTaskCount.decrementAndGet() == 0) { synchronized (activeTaskMonitor) {
synchronized (activeTaskMonitor) { if (activeTaskCount.decrementAndGet() == 0) {
activeTaskMonitor.notifyAll(); activeTaskMonitor.notifyAll();
} }
} }
@ -131,11 +133,11 @@ public class DependencyChecker {
public void checkDependencies() { public void checkDependencies() {
while (true) { while (true) {
if (activeTaskCount.get() == 0 || exceptionOccured.get() != null) {
break;
}
try { try {
synchronized (activeTaskMonitor) { synchronized (activeTaskMonitor) {
if (activeTaskCount.get() == 0 || exceptionOccured.get() != null) {
break;
}
activeTaskMonitor.wait(); activeTaskMonitor.wait();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {

2
teavm-core/src/main/java/org/teavm/model/resource/ClassRefsRenamer.java
View File

@ -252,7 +252,7 @@ class ClassRefsRenamer implements InstructionVisitor {
@Override @Override
public void visit(InvokeInstruction insn) { public void visit(InvokeInstruction insn) {
String className = classNameMapper.map(insn.getMethod().getClassName()); String className = classNameMapper.map(insn.getMethod().getClassName());
ValueType[] signature = insn.getMethod().getSignature(); ValueType[] signature = insn.getMethod().getSignature();
for (int i = 0; i < signature.length; ++i) { for (int i = 0; i < signature.length; ++i) {
signature[i] = rename(signature[i]); signature[i] = rename(signature[i]);