]> gerrit.simantics Code Review - simantics/platform.git/blobdiff - bundles/org.simantics/src/org/simantics/SimanticsPlatform.java
Speeding up platform startup time
[simantics/platform.git] / bundles / org.simantics / src / org / simantics / SimanticsPlatform.java
index 1f367dc9abf83d63c8201a95d000145ff8f5d3fe..a4206e7da3e677a947a6b1db5e7033f547f32eaa 100644 (file)
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2018 Association for Decentralized Information Management
  * in Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -110,9 +110,10 @@ import org.simantics.project.management.PlatformUtil;
 import org.simantics.project.management.ServerManager;
 import org.simantics.project.management.ServerManagerFactory;
 import org.simantics.project.management.WorkspaceUtil;
+import org.simantics.scl.compiler.module.repository.ModuleRepository;
+import org.simantics.scl.osgi.SCLOsgi;
 import org.simantics.utils.FileUtils;
 import org.simantics.utils.datastructures.Pair;
-import org.simantics.utils.logging.TimeLogger;
 import org.simantics.utils.strings.EString;
 import org.simantics.utils.threads.ExecutorWorker;
 import org.simantics.utils.threads.ThreadUtils;
@@ -397,8 +398,7 @@ public class SimanticsPlatform implements LifecycleListener {
                             sb.append("Conflict with "+problem.first+" and "+problem.second+".\n");
                         }
                         throw new PlatformException(sb.toString());
-                    }
-                    else if(!session.syncRequest( analyzer.queryExternalDependenciesSatisfied )) {
+                    } else if(!session.syncRequest( analyzer.queryExternalDependenciesSatisfied )) {
                         Collection<IdentityNode> unsatisfiedDependencies = analyzer.getUnsatisfiedDependencies();
                         StringBuilder sb = new StringBuilder();
                         for (IdentityNode dep: unsatisfiedDependencies) {
@@ -410,6 +410,10 @@ public class SimanticsPlatform implements LifecycleListener {
                         throw new PlatformException(sb.toString());
                     }
 
+                    message = "Analyzed graph bundles";
+                    monitor.subTask(message);
+                    LOGGER.info(message);
+
                     List<GraphBundle> sortedBundles = analyzer.getSortedGraphs();
                     if(!sortedBundles.isEmpty()) {
 
@@ -488,6 +492,9 @@ public class SimanticsPlatform implements LifecycleListener {
                 }
                 session.getService(XSupport.class).setServiceMode(false, false);
             }
+            message = "Ontologies synchronized";
+            monitor.subTask(message);
+            LOGGER.info(message);
             monitor.worked(100);
         } catch (IOException e) {
             throw new PlatformException(e);
@@ -784,8 +791,6 @@ public class SimanticsPlatform implements LifecycleListener {
     {
 
         assert(!running);
-        TimeLogger.log("Beginning of SimanticsPlatform.startUp");
-
         LOGGER.info("Beginning of SimanticsPlatform.startUp");
 
         SubMonitor monitor = SubMonitor.convert(progressMonitor, 1000);
@@ -797,15 +802,19 @@ public class SimanticsPlatform implements LifecycleListener {
 
         // 0. Consult all startup extensions before doing anything with the workspace.
         StartupExtensions.consultStartupExtensions();
-        TimeLogger.log("Consulted platform pre-startup extensions");
+        LOGGER.info("Consulted platform pre-startup extensions");
 
         // 0.1. Clear all temporary files
         Simantics.clearTemporaryDirectory();
-        TimeLogger.log("Cleared temporary directory");
+        LOGGER.info("Cleared temporary directory");
 
         // 0.2 Clear VariableRepository.repository static map which holds references to SessionImplDb
         VariableRepository.clear();
 
+        // 0.2.1 Activate org.simantics.scl.osgi to prime the SCL compiler early.
+        @SuppressWarnings("unused")
+        ModuleRepository modRepo = SCLOsgi.MODULE_REPOSITORY;
+
         // 0.3 Handle baseline database before opening db
         @SuppressWarnings("unused")
         boolean usingBaseline = handleBaselineDatabase();
@@ -813,8 +822,8 @@ public class SimanticsPlatform implements LifecycleListener {
         // 1. Assert there is a database at <workspace>/db
         SessionDescriptor sessionDescriptor = setupDatabase(databaseDriverId, monitor.newChild(200, SubMonitor.SUPPRESS_NONE), workspacePolicy, userAgent);
         session = sessionDescriptor.getSession();
-        TimeLogger.log("Database setup complete");
-        
+        LOGGER.info("Database setup complete");
+
         // 2. Delete all indexes if we cannot be certain they are up-to-date
         //    A full index rebuild will be done later, before project activation.
         XSupport support = session.getService(XSupport.class);
@@ -828,7 +837,6 @@ public class SimanticsPlatform implements LifecycleListener {
 
         // 3. Assert all graphs, and correct versions, are installed to the database
         synchronizeOntologies(monitor.newChild(400, SubMonitor.SUPPRESS_NONE), ontologyPolicy, requireSynchronize);
-        TimeLogger.log("Synchronized ontologies");
 
         // 4. Assert simantics.cfg exists
         boolean installProject = assertConfiguration(monitor.newChild(25, SubMonitor.SUPPRESS_NONE),workspacePolicy);
@@ -838,7 +846,7 @@ public class SimanticsPlatform implements LifecycleListener {
 
         // 6. Install all features into project, if in debug mode
         updateInstalledGroups(monitor.newChild(25), true); //installProject);
-        TimeLogger.log("Installed all features into project");
+        LOGGER.info("Installed all features into project");
 
         // 7. Assert L0.Session in database for this session
         assertSessionModel(monitor.newChild(25, SubMonitor.SUPPRESS_NONE));
@@ -846,19 +854,21 @@ public class SimanticsPlatform implements LifecycleListener {
         session.getService(XSupport.class).setServiceMode(false, false);
 
         try {
-            monitor.setTaskName("Flush query cache");
+            String message = "Flush query cache";
+            monitor.setTaskName(message);
+            LOGGER.info(message);
             session.syncRequest((Write) graph -> {
                 QueryControl qc = graph.getService(QueryControl.class);
                 qc.flush(graph);
             });
-            TimeLogger.log("Flushed queries");
         } catch (DatabaseException e) {
             LOGGER.error("Flushing queries failed.", e);
         }
         boolean loadProject = true;
         try {
-
-            monitor.setTaskName("Open database session");
+            String message = "Open database session";
+            monitor.setTaskName(message);
+            LOGGER.info(message);
                sessionContext = SimanticsPlatform.INSTANCE.createSessionContext(true);
                // This must be before setSessionContext since some listeners might query this
             sessionContext.setHint(SimanticsKeys.KEY_PROJECT, SimanticsPlatform.INSTANCE.projectResource);
@@ -866,6 +876,8 @@ public class SimanticsPlatform implements LifecycleListener {
             Simantics.setSessionContext(sessionContext);
 
             // 1. Put ResourceBinding that throws an exception to General Bindings
+            message = "Put ResourceBinding that throws an exception to General Bindings";
+            LOGGER.info(message);
             simanticsBindings = new SimanticsBindings();
             Bindings.classBindingFactory.addFactory( simanticsBindings );
 
@@ -873,11 +885,15 @@ public class SimanticsPlatform implements LifecycleListener {
             session.registerService(Databoard.class, Bindings.databoard);
 
             // Register datatype bindings
+            message = "Register datatype bindings";
+            LOGGER.info(message);
             Bindings.defaultBindingFactory.getRepository().put(RGB.Integer.BINDING.type(), RGB.Integer.BINDING);
             Bindings.defaultBindingFactory.getRepository().put(Font.BINDING.type(), Font.BINDING);
 
             if (support.rolledback() || sessionDescriptor.isFreshDatabase()) {
-                monitor.setTaskName("Rebuilding all indexes");
+                message = "Rebuilding all indexes";
+                LOGGER.info(message);
+                monitor.setTaskName(message);
                 try {
                     session.getService(IndexedRelations.class).fullRebuild(monitor.newChild(100), session);
                 } catch (IndexException e) {
@@ -888,17 +904,21 @@ public class SimanticsPlatform implements LifecycleListener {
             }
 
             if(loadProject) {
-                TimeLogger.log("Load project");
-                monitor.setTaskName("Load project");
+                message = "Load project";
+                monitor.setTaskName(message);
+                LOGGER.info(message);
                 project = Projects.loadProject(sessionContext.getSession(), SimanticsPlatform.INSTANCE.projectResource);
                 sessionContext.setHint(ProjectKeys.KEY_PROJECT, project);
                 monitor.worked(100);
-                TimeLogger.log("Loading projects complete");
+                message = "Loading projects complete";
+                LOGGER.info(message);
 
-                monitor.setTaskName("Activate project");
+                message = "Activate project";
+                monitor.setTaskName(message);
+                LOGGER.info(message);
                 project.activate();
                 monitor.worked(100);
-                TimeLogger.log("Project activated");
+                LOGGER.info("Project activated");
             }
 
         } catch (DatabaseException e) {
@@ -920,7 +940,7 @@ public class SimanticsPlatform implements LifecycleListener {
         // the user from undoing any initialization operations performed
         // by the platform startup.
         SimanticsPlatform.INSTANCE.discardSessionUndoHistory();
-        TimeLogger.log("Discarded session undo history");
+        LOGGER.info("Discarded session undo history");
 
         return sessionContext;
 
@@ -930,10 +950,12 @@ public class SimanticsPlatform implements LifecycleListener {
         try {
             // Construct and initialize SessionContext from Session.
             SessionContext sessionContext = SessionContext.create(session, init);
-            TimeLogger.log("Session context created");
+            String message = "Session context created";
+            LOGGER.info(message);
             if (init) {
                 sessionContext.registerServices();
-                TimeLogger.log("Session services registered");
+                message = "Session services registered";
+                LOGGER.info(message);
             }
             return sessionContext;
         } catch (DatabaseException e) {