]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Merge "Move debugging options under DevelopmentKeys"
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Tue, 23 Jul 2019 11:49:43 +0000 (11:49 +0000)
committerGerrit Code Review <gerrit2@simantics>
Tue, 23 Jul 2019 11:49:43 +0000 (11:49 +0000)
bundles/org.simantics.desktop.ui/src/org/simantics/desktop/ui/internal/StandardModelledView.java
bundles/org.simantics.scl.db/src/org/simantics/scl/db/SCLFunctions.java
bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/outline/SCLModuleOutlinePage.java

index 689134b84048e39aa0a808a69796b281711538ac..9bc628d0068c65947990fdf2b03bdda9cca5ef0e 100644 (file)
@@ -1,14 +1,20 @@
 package org.simantics.desktop.ui.internal;
 
+import java.util.Collections;
+import java.util.Set;
+
+import org.simantics.project.ontology.ProjectResource;
 import org.simantics.selectionview.StandardPropertyPage;
 import org.simantics.ui.workbench.IPropertyPage;
 import org.simantics.views.swt.ModelledView;
 
 public class StandardModelledView extends ModelledView {
 
+    private static final Set<String> defaultBrowseContexts = Collections.singleton(ProjectResource.URIs.ProjectBrowseContext);
+    
     @Override
     protected IPropertyPage getPropertyPage() {
-        return new StandardPropertyPage(getSite());
+        return new StandardPropertyPage(getSite(), defaultBrowseContexts);
     }
 
 }
index f3d4c34306d71a7bce5c9779ddee01added2ec60..e20dfc471ad9ea28831463f00bc9bfc220d8704a 100644 (file)
@@ -1,6 +1,8 @@
 package org.simantics.scl.db;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.cojen.classfile.TypeDesc;
 import org.simantics.Simantics;
@@ -25,14 +27,24 @@ import org.simantics.db.service.QueryControl;
 import org.simantics.db.service.SerialisationSupport;
 import org.simantics.db.service.VirtualGraphSupport;
 import org.simantics.layer0.utils.triggers.IActivationManager;
+import org.simantics.scl.compiler.elaboration.modules.SCLValue;
 import org.simantics.scl.compiler.environment.specification.EnvironmentSpecification;
+import org.simantics.scl.compiler.errors.DoesNotExist;
 import org.simantics.scl.compiler.errors.Failable;
+import org.simantics.scl.compiler.errors.Failure;
 import org.simantics.scl.compiler.internal.codegen.types.JavaTypeTranslator;
 import org.simantics.scl.compiler.module.Module;
 import org.simantics.scl.compiler.module.repository.ImportFailureException;
 import org.simantics.scl.compiler.runtime.RuntimeEnvironment;
+import org.simantics.scl.compiler.runtime.RuntimeModule;
+import org.simantics.scl.compiler.top.ValueNotFound;
+import org.simantics.scl.compiler.types.TCon;
 import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.Types;
+import org.simantics.scl.compiler.types.exceptions.MatchException;
+import org.simantics.scl.compiler.types.util.MultiFunction;
 import org.simantics.scl.osgi.SCLOsgi;
+import org.simantics.scl.reflection.ValueNotFoundException;
 import org.simantics.scl.runtime.SCLContext;
 import org.simantics.scl.runtime.function.Function;
 import org.simantics.scl.runtime.function.Function1;
@@ -58,8 +70,95 @@ public class SCLFunctions {
             return null;
         }
     }
+
+    public static Function resolveFunction(RuntimeModule rm, String function) throws ValueNotFound {
+        return (Function)rm.getValue(function);
+    }
+    
+    private static SCLValue resolveSCLValue(RuntimeModule rm, String function) throws ValueNotFound {
+        return rm.getModule().getValue(function);
+    }
+    
+    private static RuntimeModule resolveRuntimeModule(String module) throws ValueNotFound {
+        Failable<RuntimeModule> f = SCLOsgi.MODULE_REPOSITORY.getRuntimeModule(module);
+        if(f.didSucceed())
+            return f.getResult();
+        else if(f == DoesNotExist.INSTANCE)
+            throw new ValueNotFound("Didn't find module " + module);
+        else
+            throw new ValueNotFound(((Failure)f).toString());
+    }
+    
+    private static List<TCon> getEffects(SCLValue value) throws ValueNotFoundException, ValueNotFound, MatchException {
+    
+        Type type = value.getType();
+        MultiFunction mfun = Types.matchFunction(type, 1);
+        ArrayList<TCon> concreteEffects = new ArrayList<>();
+        mfun.effect.collectConcreteEffects(concreteEffects);
+        return concreteEffects;
+        
+    }
+
+    public static List<TCon> getEffects(RuntimeModule rm, String function) throws ValueNotFoundException, ValueNotFound, MatchException {
+        return getEffects(resolveSCLValue(rm, function));
+    }
+
+    public static List<TCon> getEffects(String module, String function) throws ValueNotFoundException, ValueNotFound, MatchException {
+        return getEffects(resolveSCLValue(resolveRuntimeModule(module), function));
+    }
+    
+    private static <T> T evaluate(Function function, Object ... args) {
+        return (T)function.applyArray(args);
+    }
+
+    private static <T> T evaluate(RuntimeModule rm, String function, Object ... args) throws ValueNotFound {
+        return evaluate(resolveFunction(rm, function));
+    }
+
+    public static <T> T evaluate(String module, String function, Object ... args) throws ValueNotFound {
+        return evaluate(resolveRuntimeModule(module), function, args);
+    }
+
+    public static <T> T evaluateDB(String module, String function, Object ... args) throws DatabaseException {
+        try {
+            RuntimeModule rm = resolveRuntimeModule(module);
+            List<TCon> effects = getEffects(resolveSCLValue(rm, function));
+            Function f = resolveFunction(rm, function);
+            if(effects.contains(Types.WRITE_GRAPH)) {
+                return syncWrite(f, args);
+            } else if(effects.contains(Types.READ_GRAPH)) {
+                return syncRead(f, args);
+            } else {
+                return evaluate(f, args);
+            }
+        } catch (ValueNotFound e) {
+            throw new DatabaseException("SCL Value not found: " + e.name);
+        } catch (Throwable t) {
+            if (t instanceof DatabaseException)
+                throw (DatabaseException) t;
+            throw new DatabaseException(t);
+        }
+    }
     
-    public static void asyncRead(final Function f) throws DatabaseException {
+    public static <T> T evaluateGraph(String module, String function, Object graph, Object ... args) throws DatabaseException {
+        final SCLContext context = SCLContext.getCurrent();
+        SCLContext.push(context);
+        Object oldGraph = context.put(GRAPH, graph);
+        try {
+            return evaluateDB(module, function, args);
+        } finally {
+            context.put(GRAPH, oldGraph);
+            SCLContext.pop();
+        }
+    }
+
+    private static Object[] NO_ARGS = new Object[] { Tuple0.INSTANCE };
+
+    public static <T> void asyncRead(final Function f) throws DatabaseException {    
+        asyncRead(f, NO_ARGS);
+    }
+
+    public static void asyncRead(final Function f, final Object ... args) throws DatabaseException {
         final SCLContext context = SCLContext.createDerivedContext();
         Simantics.getSession().asyncRequest(new ReadRequest() {
             @Override
@@ -76,10 +175,14 @@ public class SCLFunctions {
     }
     
     public static <T> T syncRead(final Function f) throws DatabaseException {
+        return syncRead(f, NO_ARGS);
+    }
+    
+    public static <T> T syncRead(final Function f, final Object ... args) throws DatabaseException {
         final SCLContext context = SCLContext.getCurrent();
         Object graph = context.get(GRAPH);
         if (graph != null) {
-            return (T)f.apply(Tuple0.INSTANCE);
+            return (T)f.applyArray(args);
         } else {
             return Simantics.getSession().syncRequest(new Read<T>() {
                 @Override
@@ -96,8 +199,12 @@ public class SCLFunctions {
             });
         }
     }
-    
+
     public static void asyncWrite(final Function f) throws DatabaseException {
+        asyncWrite(f, NO_ARGS);
+    }
+
+    public static void asyncWrite(final Function f, final Object ... args) throws DatabaseException {
         SCLContext context = SCLContext.createDerivedContext();
         if (Simantics.peekSession() != null) {
             Simantics.getSession().asyncRequest(new WriteRequest() {
@@ -106,7 +213,7 @@ public class SCLFunctions {
                     SCLContext.push(context);
                     context.put(GRAPH, graph);
                     try {
-                        f.apply(Tuple0.INSTANCE);
+                        f.apply(args);
                     } finally {
                         SCLContext.pop();
                     }
@@ -118,6 +225,10 @@ public class SCLFunctions {
     }
     
     public static <T> T syncWrite(final Function f) throws DatabaseException {
+        return syncWrite(f, NO_ARGS);
+    }
+
+    public static <T> T syncWrite(final Function f, final Object ... args) throws DatabaseException {
         final SCLContext context = SCLContext.getCurrent();
         Object graph = context.get(GRAPH);
         if (graph != null) {
@@ -131,7 +242,7 @@ public class SCLFunctions {
                     SCLReportingHandler oldPrinter = (SCLReportingHandler)context.put(SCLReportingHandler.REPORTING_HANDLER, printer);
                     ReadGraph oldGraph = (ReadGraph)context.put(GRAPH, graph);
                     try {
-                        return (T)f.apply(Tuple0.INSTANCE);
+                        return (T)f.apply(args);
                     } finally {
                         context.put(GRAPH, oldGraph);
                         context.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
@@ -144,13 +255,13 @@ public class SCLFunctions {
     
     public static <T> T delayedSyncWrite(final Function f) throws DatabaseException {
         final SCLContext context = SCLContext.getCurrent();
-       final DataContainer<T> dc = new DataContainer<T>(null);
+        final DataContainer<T> dc = new DataContainer<T>(null);
 
         DelayedWriteRequest request = new DelayedWriteRequest() {
             @Override
             public void perform(WriteGraph graph) throws DatabaseException {
-               final SCLContext context = SCLContext.getCurrent();
-               SCLContext.push(context);
+                final SCLContext context = SCLContext.getCurrent();
+                SCLContext.push(context);
                 ReadGraph oldGraph = (ReadGraph)context.put(GRAPH, graph);
                 try {
                     dc.set((T)f.apply(Tuple0.INSTANCE));
@@ -160,18 +271,18 @@ public class SCLFunctions {
                 }
             }
         };
-       
+    
         Object graph = context.get(GRAPH);
         if (graph != null) {
             if (graph instanceof WriteGraph) {
-               ((WriteGraph)graph).syncRequest(request);
+                ((WriteGraph)graph).syncRequest(request);
             } else {
-               throw new DatabaseException("Caller is inside a read transaction.");
+                throw new DatabaseException("Caller is inside a read transaction.");
             }
         } else {
             Simantics.getSession().syncRequest(request);
         }
-       return dc.get();
+        return dc.get();
     }
 
     public static <T> T virtualSyncWriteMem(WriteGraph graph, String virtualGraphId, final Function f) throws DatabaseException {
@@ -217,7 +328,7 @@ public class SCLFunctions {
             @Override
             public T perform(ReadGraph graph) throws DatabaseException {
                 return Variables.getVariable(graph, uri).getValue(graph);
-            }            
+            }
         });
     }
     
@@ -226,7 +337,7 @@ public class SCLFunctions {
             @Override
             public void perform(WriteGraph graph) throws DatabaseException {
                 Variables.getVariable(graph, uri).setValue(graph, value);
-            }            
+            }
         });
     }
     
@@ -257,23 +368,23 @@ public class SCLFunctions {
     
     public static class SCLUnaryRead extends BinaryRead<Function1<Object,Object>, Object, Object> {
 
-               public SCLUnaryRead(Function1<Object, Object> parameter1, Object parameter2) {
-                       super(parameter1, parameter2);
-               }
+        public SCLUnaryRead(Function1<Object, Object> parameter1, Object parameter2) {
+             super(parameter1, parameter2);
+        }
+
+        @Override
+        public Object perform(ReadGraph graph) throws DatabaseException {
+            return Simantics.applySCLRead(graph, parameter, parameter2);
+        }
 
-               @Override
-               public Object perform(ReadGraph graph) throws DatabaseException {
-                       return Simantics.applySCLRead(graph, parameter, parameter2);
-               }
-       
     }
     
     public static Object unaryQuery(ReadGraph graph, Function1<Object,Object> fn, Object value) throws DatabaseException {
-       return graph.syncRequest(new SCLUnaryRead(fn, value));
+        return graph.syncRequest(new SCLUnaryRead(fn, value));
     }
 
     public static Object unaryQueryCached(ReadGraph graph, Function1<Object,Object> fn, Object value) throws DatabaseException {
-       return graph.syncRequest(new SCLUnaryRead(fn, value), TransientCacheAsyncListener.<Object>instance());
+        return graph.syncRequest(new SCLUnaryRead(fn, value), TransientCacheAsyncListener.<Object>instance());
     }
     
 
@@ -318,15 +429,15 @@ public class SCLFunctions {
     }
 
     public static Object possibleFromDynamic(Type expectedType, String moduleName, Object value) {
-       
+    
         try {
 
-               
+        
             Failable<Module> failable = SCLOsgi.MODULE_REPOSITORY.getModule(moduleName);
             Module module = failable.getResult();
             
-               RuntimeEnvironment env = SCLOsgi.MODULE_REPOSITORY.createRuntimeEnvironment(
-                               EnvironmentSpecification.of(moduleName, ""), module.getParentClassLoader());
+            RuntimeEnvironment env = SCLOsgi.MODULE_REPOSITORY.createRuntimeEnvironment(
+            EnvironmentSpecification.of(moduleName, ""), module.getParentClassLoader());
 
             JavaTypeTranslator tr = new JavaTypeTranslator(env.getEnvironment());
             TypeDesc desc = tr.toTypeDesc(expectedType);
@@ -342,22 +453,22 @@ public class SCLFunctions {
 
     public static void restrictQueries(ReadGraph graph, int amount, int step, int maxTimeInMs) {
 
-               QueryControl qc = graph.getService(QueryControl.class);
-               long start = System.currentTimeMillis();
-               while(true) {
-                       int current = qc.count();
-                       if(current < amount) return;
-                       qc.gc(graph, step);
-                       long duration = System.currentTimeMillis() - start;
-                       if(duration > maxTimeInMs) return;
-               }
+        QueryControl qc = graph.getService(QueryControl.class);
+        long start = System.currentTimeMillis();
+        while(true) {
+            int current = qc.count();
+            if(current < amount) return;
+            qc.gc(graph, step);
+            long duration = System.currentTimeMillis() - start;
+            if(duration > maxTimeInMs) return;
+        }
 
     }
 
     public static int countQueries(ReadGraph graph) {
 
-               QueryControl qc = graph.getService(QueryControl.class);
-               return qc.count();
+        QueryControl qc = graph.getService(QueryControl.class);
+        return qc.count();
 
     }
     
index 80e34c3746565f70cdf625cfcde5b19e5e2326a9..f19081754e71b1fc2bc034ca1be8d6345c7e9ff1 100644 (file)
@@ -30,6 +30,7 @@ import org.simantics.scl.osgi.SCLOsgi;
 import org.simantics.scl.ui.Activator;
 import org.simantics.scl.ui.editor2.SCLModuleEditor2;
 import org.simantics.scl.ui.editor2.SCLModuleEditorInput;
+import org.simantics.utils.ui.SWTUtils;
 
 public class SCLModuleOutlinePage extends ContentOutlinePage {
 
@@ -69,16 +70,20 @@ public class SCLModuleOutlinePage extends ContentOutlinePage {
 
             @Override
             public void notifyAboutUpdate() {
-                parent.getDisplay().asyncExec(() -> {
+                if (parent.isDisposed())
+                    return;
+                
+                Failable<Module> module = SCLOsgi.MODULE_REPOSITORY.getModule(moduleSource.getModuleName(), updateListener);
+                SWTUtils.asyncExec(parent, () -> {
                     if (!outlineViewer.getControl().isDisposed()) {
+                        outlineViewer.setInput(module.didSucceed() ? module.getResult() : null);
                         outlineViewer.refresh();
                     }
                 });
             }
         };
-        Failable<Module> module = SCLOsgi.MODULE_REPOSITORY.getModule(moduleSource.getModuleName(), updateListener);
-        Module result = module.getResult();
-        outlineViewer.setInput(result);
+        
+        updateListener.notifyAboutUpdate();
     }
 
     @Override