Fixed race condition in getValues/Relations/EntityTypes

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / module / LazyModule.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
index a5399e88f1f642c2212ee7004b8d60f8757df441..ce3b7cc5fd22ff49fd4b2a01c5205d3647c2f82e 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/module/LazyModule.java
@@ -2,17 +2,22 @@ package org.simantics.scl.compiler.module;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
+import org.simantics.scl.compiler.constants.Constant;
+import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
 import org.simantics.scl.compiler.elaboration.modules.Documentation;
 import org.simantics.scl.compiler.elaboration.modules.SCLValue;
-import org.simantics.scl.compiler.elaboration.modules.TypeAlias;
 import org.simantics.scl.compiler.elaboration.modules.TypeClass;
 import org.simantics.scl.compiler.elaboration.modules.TypeClassInstance;
-import org.simantics.scl.compiler.elaboration.modules.TypeConstructor;
+import org.simantics.scl.compiler.elaboration.modules.TypeDescriptor;
 import org.simantics.scl.compiler.elaboration.relations.SCLEntityType;
 import org.simantics.scl.compiler.elaboration.relations.SCLRelation;
 import org.simantics.scl.compiler.elaboration.rules.MappingRelation;
 import org.simantics.scl.compiler.elaboration.rules.TransformationRule;
+import org.simantics.scl.compiler.errors.CompilationError;
 import org.simantics.scl.compiler.internal.codegen.effects.EffectConstructor;
 import org.simantics.scl.compiler.top.ModuleInitializer;
 import org.simantics.scl.compiler.types.TCon;
@@ -22,10 +27,10 @@ import gnu.trove.map.hash.THashMap;
 
 public abstract class LazyModule implements Module {
 
-    String moduleName;
-    private THashMap<String, SCLValue> values = new THashMap<String, SCLValue>();
-    private THashMap<String, SCLRelation> relations = new THashMap<String, SCLRelation>();
-    private THashMap<String, SCLEntityType> entityTypes = new THashMap<String, SCLEntityType>();
+    private final String moduleName;
+    private final ConcurrentHashMap<String, SCLValue> values = new ConcurrentHashMap<String, SCLValue>();
+    private final ConcurrentHashMap<String, SCLRelation> relations = new ConcurrentHashMap<String, SCLRelation>();
+    private final ConcurrentHashMap<String, SCLEntityType> entityTypes = new ConcurrentHashMap<String, SCLEntityType>();
     
     protected abstract SCLValue createValue(String name);
     
@@ -59,35 +64,28 @@ public abstract class LazyModule implements Module {
     public void findValuesForPrefix(final Collection<SCLValue> values, final String prefix) {          
     }
 
+    private final Function<String, SCLValue> createValue = this::createValue;
+    
     @Override
     public SCLValue getValue(String name) {
-        if(values.containsKey(name))
-            return values.get(name);
-        else {
-            SCLValue value = createValue(name);
-            values.put(name, value);
-            return value;
-        }
+        return values.computeIfAbsent(name, createValue);
+    }
+    
+    @Override
+    public List<Constant> getFieldAccessors(String name) {
+        return null;
     }
     
+    private final Function<String, SCLRelation> createRelation = this::createRelation;
+    
     public SCLRelation getRelation(String name) {
-        if(relations.containsKey(name))
-            return relations.get(name);
-        else {
-            SCLRelation relation = createRelation(name);
-            relations.put(name, relation);
-            return relation;
-        }
+        return relations.computeIfAbsent(name, createRelation);
     }
     
+    private final Function<String, SCLEntityType> createEntityType = this::createEntityType;
+    
     public SCLEntityType getEntityType(String name) {
-        if(entityTypes.containsKey(name))
-            return entityTypes.get(name);
-        else {
-            SCLEntityType entityType = createEntityType(name);
-            entityTypes.put(name, entityType);
-            return entityType;
-        }
+        return entityTypes.computeIfAbsent(name, createEntityType);
     } 
 
     @Override
@@ -101,7 +99,7 @@ public abstract class LazyModule implements Module {
     }
 
     @Override
-    public TypeConstructor getTypeConstructor(String name) {
+    public TypeDescriptor getTypeDescriptor(String name) {
         return null;
     }
 
@@ -126,17 +124,27 @@ public abstract class LazyModule implements Module {
     }
     
     @Override
-    public TypeAlias getTypeAlias(String name) {
+    public Collection<TransformationRule> getRules() {
+        return Collections.emptyList();
+    }
+    
+    @Override
+    public THashMap<String, BranchPoint[]> getBranchPoints() {
         return null;
     }
     
     @Override
-    public Collection<TransformationRule> getRules() {
-        return Collections.emptyList();
+    public CompilationError[] getWarnings() {
+        return CompilationError.EMPTY_ARRAY;
     }
     
     @Override
-    public THashMap<String, BranchPoint[]> getBranchPoints() {
+    public CHRRuleset getRuleset(String name) {
+        return null;
+    }
+    
+    @Override
+    public String getDeprecation() {
         return null;
     }
 }