MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Constant info callback client-side (compile-server).

Browse Source
This commit is contained in:
Dmitry Boulytchev
2012-05-02 22:44:15 +04:00
parent 732f72ffea
commit 895175bfbc
3 changed files with 118 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleLevelBuilder.java
+1 -1
View File
@@ -83,7 +83,7 @@ public abstract class ModuleLevelBuilder extends Builder {
final ModulesBasedFileFilter moduleBasedFilter = new ModulesBasedFileFilter(context, chunk);
final boolean incremental = globalMappings.differentiate(
delta, removedPaths, filesToCompile, allCompiledFiles, allAffectedFiles, moduleBasedFilter
delta, removedPaths, filesToCompile, allCompiledFiles, allAffectedFiles, moduleBasedFilter, null
);
if (LOG.isDebugEnabled()) {
jps/model/src/org/jetbrains/ether/dependencyView/Callbacks.java
+29 -2
View File
@@ -2,7 +2,9 @@ package org.jetbrains.ether.dependencyView;
import org.jetbrains.asm4.ClassReader;
import java.io.File;
import java.util.Collection;
import java.util.concurrent.Future;
/**
* Created by IntelliJ IDEA.
@@ -14,9 +16,34 @@ import java.util.Collection;
public class Callbacks {
public interface Backend {
Collection<String> getClassFiles();
void associate(String classFileName, String sourceFileName, ClassReader cr);
void registerConstantUsage(String className, String fieldName, String fieldOwner);
void registerImports(String className, Collection<String> imports, Collection<String> staticImports);
}
public static class ConstantAffection {
private final boolean myKnown;
private final Collection<File> myAffectedFiles;
public ConstantAffection(final Collection<File> affectedFiles) {
myAffectedFiles = affectedFiles;
myKnown = true;
}
public ConstantAffection() {
myKnown = false;
myAffectedFiles = null;
}
public boolean isKnown(){
return myKnown;
}
public Collection<File> getAffectedFiles (){
return myAffectedFiles;
}
}
public interface ConstantAffectionResolver {
Future<ConstantAffection> request(final String owner, final String name);
}
}
jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+88 -32
View File
@@ -19,6 +19,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.lang.annotation.RetentionPolicy;
import java.util.*;
import java.util.concurrent.Future;
/**
* Created by IntelliJ IDEA.
@@ -842,8 +843,80 @@ public class Mappings {
final Collection<File> filesToCompile,
final Collection<File> compiledFiles,
final Collection<File> affectedFiles,
DependentFilesFilter filter) {
final DependentFilesFilter filter,
final Callbacks.ConstantAffectionResolver lastResort) {
synchronized (myLock) {
class DelayedWorks {
class Triple {
final int owner;
final FieldRepr field;
final Future<Callbacks.ConstantAffection> affection;
private Triple(final int owner, final FieldRepr field, final Future<Callbacks.ConstantAffection> affection) {
this.owner = owner;
this.field = field;
this.affection = affection;
}
private Triple(final int owner, final FieldRepr field) {
this.owner = owner;
this.field = field;
this.affection = null;
}
Callbacks.ConstantAffection getAffection() {
if (affection == null) {
return null;
}
try {
return affection.get();
}
catch (Exception e) {
throw new RuntimeException(e);
}
}
}
final Collection<Triple> myQueue = new LinkedList<Triple>();
void addConstantWork(final int owner, final FieldRepr field) {
myQueue.add(lastResort != null
? new Triple(owner, field, lastResort.request(myContext.getValue(owner), myContext.getValue(field.name)))
: new Triple(owner, field));
}
boolean doWork(final Collection<File> affectedFiles) {
debug("Starting delayed works.");
for (final Triple t : myQueue) {
final Callbacks.ConstantAffection affection = t.getAffection();
debug("Class: ", t.owner);
debug("Field: ", t.field.name);
if (affection == null || ! affection.isKnown()) {
debug("No external dependency information available.");
debug("Trying to soften non-incremental decision.");
if (!incrementalDecision(t.owner, t.field, affectedFiles, filter)) {
debug("No luck.");
debug("End of delayed work, returning false.");
return false;
}
} else {
debug("External dependency information retrieved.");
affectedFiles.addAll(affection.getAffectedFiles());
}
}
debug("End of delayed work, returning true.");
return true;
}
}
final DelayedWorks works = new DelayedWorks();
debug("Begin of Differentiate:");
delta.runPostPasses();
@@ -1406,10 +1479,12 @@ public class Mappings {
if ((f.access & Opcodes.ACC_PRIVATE) == 0 && (f.access & mask) == mask && f.hasValue()) {
debug("Field had value and was (non-private) final static => a switch to non-incremental mode requested");
if (!incrementalDecision(it.name, f, affectedFiles, filter)) {
debug("End of Differentiate, returning false");
return false;
}
works.addConstantWork(it.name, f);
//if (!incrementalDecision(it.name, f, affectedFiles, filter)) {
// debug("End of Differentiate, returning false");
// return false; // Here!
//}
}
final TIntHashSet propagated = u.propagateFieldAccess(f.name, it.name);
@@ -1432,10 +1507,12 @@ public class Mappings {
if (harmful || valueChanged || (accessChanged && !d.weakedAccess())) {
debug("Inline field changed it's access or value => a switch to non-incremental mode requested");
if (!incrementalDecision(it.name, field, affectedFiles, filter)) {
debug("End of Differentiate, returning false");
return false;
}
works.addConstantWork(it.name, field);
//if (!incrementalDecision(it.name, field, affectedFiles, filter)) {
// debug("End of Differentiate, returning false");
// return false; // Here!
//}
}
}
@@ -1604,8 +1681,8 @@ public class Mappings {
}
}
debug("End of Differentiate, returning true");
return true;
debug("End of Differentiate.");
return works.doWork(affectedFiles);
}
}
@@ -1809,22 +1886,6 @@ public class Mappings {
public Callbacks.Backend getCallback() {
return new Callbacks.Backend() {
public Collection<String> getClassFiles() {
final Set<String> result = new HashSet<String>();
synchronized (myLock) {
myClassToSourceFile.forEachEntry(new TIntIntProcedure() {
@Override
public boolean execute(int s, int b) {
result.add(myContext.getValue(s));
return true;
}
});
}
return result;
}
public void associate(final String classFileName, final String sourceFileName, final ClassReader cr) {
synchronized (myLock) {
final int classFileNameS = myContext.get(classFileName);
@@ -1874,11 +1935,6 @@ public class Mappings {
}
}
@Override
public void registerConstantUsage(final String className, final String fieldName, final String fieldOwner) {
//To change body of implemented methods use File | Settings | File Templates.
}
@Override
public void registerImports(final String className, final Collection<String> imports, Collection<String> staticImports) {
for (final String s : staticImports) {