X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Fmodule%2Frepository%2FModuleRepository.java;h=089f2c26c95469e639176ed9f50136b91a9c46c7;hp=5078d00802ba7fb257c37daa13cf49c43eb51e37;hb=4e753de3df98d5411f8329205c0e03f2e13e3c1d;hpb=969bd23cab98a79ca9101af33334000879fb60c5 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java index 5078d0080..089f2c26c 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/repository/ModuleRepository.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import org.simantics.scl.compiler.common.exceptions.InternalCompilerError; +import org.simantics.scl.compiler.compilation.CompilationContext; import org.simantics.scl.compiler.elaboration.modules.SCLValue; import org.simantics.scl.compiler.environment.ConcreteEnvironment; import org.simantics.scl.compiler.environment.Environment; @@ -24,6 +24,7 @@ import org.simantics.scl.compiler.errors.Success; import org.simantics.scl.compiler.module.ImportDeclaration; import org.simantics.scl.compiler.module.Module; import org.simantics.scl.compiler.module.options.ModuleCompilationOptionsAdvisor; +import org.simantics.scl.compiler.module.repository.UpdateListener.Observable; import org.simantics.scl.compiler.runtime.RuntimeEnvironment; import org.simantics.scl.compiler.runtime.RuntimeEnvironmentImpl; import org.simantics.scl.compiler.runtime.RuntimeModule; @@ -67,9 +68,9 @@ public class ModuleRepository { PENDING_MODULES.get().remove(moduleName); } - private class ModuleEntry implements UpdateListener { + private class ModuleEntry extends UpdateListener implements Observable { final String moduleName; - WeakHashMap listeners = new WeakHashMap(); + THashSet listeners = new THashSet(); ModuleSource source; Failable compilationResult; @@ -80,14 +81,20 @@ public class ModuleRepository { } synchronized void addListener(UpdateListener listener) { - if(listener != null) - listeners.put(listener, null); + if(listener == null || listeners == null) + return; + listeners.add(listener); + listener.addObservable(this); + } + + public synchronized void removeListener(UpdateListener listener) { + if (listeners == null) + return; + listeners.remove(listener); } @Override public void notifyAboutUpdate() { - if (listeners == null) - return; ArrayList externalListeners = new ArrayList(); notifyAboutUpdate(externalListeners); for(UpdateListener listener : externalListeners) @@ -95,18 +102,26 @@ public class ModuleRepository { } synchronized void notifyAboutUpdate(ArrayList externalListeners) { + stopListening(); + if (listeners == null) + return; if(moduleCache.get(moduleName) == this) { moduleCache.remove(moduleName); if(SCLCompilerConfiguration.TRACE_MODULE_UPDATE) { System.out.println("Invalidate " + moduleName); - for(UpdateListener l : listeners.keySet()) + for(UpdateListener l : listeners) System.out.println(" " + l); } - for(UpdateListener l : listeners.keySet()) + THashSet listenersCopy = listeners; + listeners = null; + for(UpdateListener l : listenersCopy) + l.stopListening(); + for(UpdateListener l : listenersCopy) if(l instanceof ModuleEntry) ((ModuleEntry)l).notifyAboutUpdate(externalListeners); - else + else { externalListeners.add(l); + } } } @@ -145,7 +160,7 @@ public class ModuleRepository { Collection dependencies = module.getDependencies(); THashMap moduleEntries; try { - moduleEntries = getModuleEntries(dependencies.toArray(new ImportDeclaration[dependencies.size()]), null); + moduleEntries = getModuleEntries(null, dependencies.toArray(new ImportDeclaration[dependencies.size()]), null); } catch (ImportFailureException e) { throw new InternalCompilerError(e); } @@ -159,7 +174,7 @@ public class ModuleRepository { if(parentModule != null) parentModules.add(parentModule); }*/ - RuntimeModule rm = new RuntimeModule(module, parentModules, source.getClassLoader()); + RuntimeModule rm = new RuntimeModule(module, parentModules, module.getParentClassLoader()); ModuleInitializer initializer = module.getModuleInitializer(); if(initializer != null) try { @@ -176,12 +191,17 @@ public class ModuleRepository { return runtimeModule; } - public void dispose() { - listeners.clear(); + public synchronized void dispose() { + if (listeners != null) + listeners.clear(); listeners = null; + stopListening(); source = null; compilationResult = null; - runtimeModule.getResult().dispose(); + if (runtimeModule != null) { + if (runtimeModule.didSucceed()) + runtimeModule.getResult().dispose(); + } runtimeModule = null; } @@ -215,7 +235,7 @@ public class ModuleRepository { public Failable getRuntimeModule(String moduleName) { return getRuntimeModule(moduleName, null); } - + private ModuleEntry getModuleEntry(String moduleName, UpdateListener listener) { /* It is deliberate that the following code does not try to prevent * simultaneous compilation of the same module. This is because in @@ -235,22 +255,32 @@ public class ModuleRepository { } private THashMap getModuleEntries( + CompilationContext compilationContext, ImportDeclaration[] imports, UpdateListener listener) throws ImportFailureException { THashMap result = new THashMap(); Collection failures = null; + THashSet originalImports = new THashSet(); ArrayList stack = new ArrayList(imports.length); - for(ImportDeclaration import_ : imports) + for(ImportDeclaration import_ : imports) { stack.add(import_); + originalImports.add(import_.moduleName); + } while(!stack.isEmpty()) { ImportDeclaration import_ = stack.remove(stack.size()-1); if(!result.containsKey(import_.moduleName)) { - ModuleEntry entry = getModuleEntry(import_.moduleName, listener); + boolean originalImport = originalImports.contains(import_.moduleName); + ModuleEntry entry = getModuleEntry(import_.moduleName, originalImport ? listener : null); Failable compilationResult = entry.compilationResult; if(compilationResult.didSucceed()) { result.put(import_.moduleName, entry); stack.addAll(compilationResult.getResult().getDependencies()); + if(originalImport) { + String deprecation = compilationResult.getResult().getDeprecation(); + if(deprecation != null && compilationContext != null) + compilationContext.errorLog.logWarning(import_.location, "Deprecated module " + import_.moduleName + (deprecation.isEmpty() ? "." : ": " + deprecation)); + } } else { if(failures == null) @@ -296,7 +326,14 @@ public class ModuleRepository { public Environment createEnvironment( ImportDeclaration[] imports, UpdateListener listener) throws ImportFailureException { - THashMap entries = getModuleEntries(imports, listener); + return createEnvironment(null, imports, listener); + } + + public Environment createEnvironment( + CompilationContext compilationContext, + ImportDeclaration[] imports, + UpdateListener listener) throws ImportFailureException { + THashMap entries = getModuleEntries(compilationContext, imports, listener); THashMap moduleMap = mapEntriesToModules(entries); return createEnvironment(moduleMap, imports); } @@ -326,14 +363,15 @@ public class ModuleRepository { ImportDeclaration[] imports, ClassLoader parentClassLoader, UpdateListener listener) throws ImportFailureException { - THashMap entries = getModuleEntries(imports, listener); + THashMap entries = getModuleEntries(null, imports, listener); THashMap moduleMap = mapEntriesToModules(entries); Environment environment = createEnvironment(moduleMap, imports); THashMap runtimeModuleMap = mapEntriesToRuntimeModules(entries); return new RuntimeEnvironmentImpl(environment, parentClassLoader, runtimeModuleMap); } - private static Environment createEnvironment(THashMap moduleMap, + private static Environment createEnvironment( + THashMap moduleMap, ImportDeclaration[] imports) { NamespaceSpec spec = new NamespaceSpec(); for(ImportDeclaration import_ : imports) @@ -458,6 +496,6 @@ public class ModuleRepository { public void setAdvisor(ModuleCompilationOptionsAdvisor advisor) { this.advisor = advisor; } - + } \ No newline at end of file