X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=inline;f=bundles%2Forg.simantics.project%2Fsrc%2Forg%2Fsimantics%2Fproject%2Fmanagement%2FPlatformUtil.java;h=af59dbfc164bdd60a859011597bd334a7b406e49;hb=c00d1429bda8dc27461e1576f4be028b43149758;hp=344b2d6cf94a6d43c446ea07bb073ed241fd4507;hpb=bf495713dbc9dec325f3929889466fa6cd58b541;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java b/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
index 344b2d6cf..af59dbfc1 100644
--- a/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
+++ b/bundles/org.simantics.project/src/org/simantics/project/management/PlatformUtil.java
@@ -26,6 +26,7 @@ import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -51,12 +52,12 @@ import org.simantics.graph.compiler.CompilationResult;
 import org.simantics.graph.compiler.GraphCompiler;
 import org.simantics.graph.compiler.GraphCompilerPreferences;
 import org.simantics.graph.compiler.ValidationMode;
+import org.simantics.graph.compiler.internal.ltk.FileSource;
+import org.simantics.graph.compiler.internal.ltk.ISource;
+import org.simantics.graph.compiler.internal.ltk.Problem;
 import org.simantics.graph.representation.Extensions;
 import org.simantics.graph.representation.TransferableGraph1;
 import org.simantics.graph.representation.TransferableGraphFileReader;
-import org.simantics.ltk.FileSource;
-import org.simantics.ltk.ISource;
-import org.simantics.ltk.Problem;
 import org.simantics.scl.reflection.OntologyVersions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -217,11 +218,23 @@ public class PlatformUtil {
 				LOGGER.error("Extraction to " + fileName + " failed from url " + url, e);
 			}
 		} else {
-			LOGGER.error("Unsupported URL protocol '" + url + "' for FastLZ native library file '" + fileName);
+			LOGGER.error("Unsupported URL protocol '" + url + "' for reading as file '" + fileName + "'");
 		}	
 		return null;
 	}
 
+	public static Collection<URL> getTGFiles(Bundle b) {
+		Enumeration<URL> enu = b.findEntries("/", "*.tg", false);
+		if (enu == null)
+			return Collections.emptyList();
+		if (!enu.hasMoreElements())
+			return Collections.emptyList();
+		ArrayList<URL> result = new ArrayList<>();
+		while (enu.hasMoreElements())
+			result.add(enu.nextElement());
+		return result;
+	}
+
 	public static void compile(Bundle b) throws Exception {
 
 		Collection<ISource> sources = new ArrayList<>();
@@ -229,10 +242,10 @@ public class PlatformUtil {
 
 		for (Bundle b2 : getBundles()) {
 			if(b.equals(b2)) continue;
-			URL url = b2.getEntry("graph.tg");
-			if (url==null) continue;
-			File graphFile = url2file(FileLocator.resolve(b2.getEntry("/graph.tg")), b2.toString());
-			dependencies.add(GraphCompiler.read(graphFile));
+			for (URL url : getTGFiles(b2)) {
+				File graphFile = url2file(url, b2.toString() + url.toString());
+				dependencies.add(GraphCompiler.read(graphFile));
+			}
 		}
 
 		File bundleFile = FileLocator.getBundleFile(b);
@@ -312,22 +325,18 @@ public class PlatformUtil {
 		AtomicReference<IOException> problem = new AtomicReference<>();
 
 		Collection<GraphBundle> gbundles = Arrays.stream(getBundles())
-				// #7806: Due to databoard Binding/Serializer construction process thread-unsafety
-				// not even the DataContainer.readHeader invocations can run in parallel, most likely
-				// due to recurring serializer construction for Variant datatypes.
-				// Therefore, we must disable parallel loading for now.
-				//.parallel()
+				.parallel()
 				.map(b -> {
 					try {
-						return problem.get() == null ? getGraph(b) : null;
+						return problem.get() == null ? getGraphs(b) : Collections.<GraphBundleEx>emptyList();
 					} catch (IOException e) {
-						if (LOGGER.isDebugEnabled())
+						if (LOGGER.isWarnEnabled())
 							LOGGER.debug("Could not get graph from bundle {}", b, e);
 						problem.set(e);
-						return null;
+						return Collections.<GraphBundleEx>emptyList();
 					}
 				})
-				.filter(Objects::nonNull)
+				.flatMap(Collection::stream)
 				.collect(Collectors.toList());
 
 		if (problem.get() != null)
@@ -348,6 +357,28 @@ public class PlatformUtil {
 		return getGraph( bundle );
 	}
 
+	public static Collection<GraphBundleEx> getGraphs(Bundle bundle) throws IOException {
+		return getTGFiles(bundle).stream()
+			.map(url -> {
+				try {
+					GraphBundleEx result = tryGetOnDemandGraph(bundle, url);
+					return result != null ? result : getCompleteGraph(bundle, url);
+				} catch (IOException e) {
+					if (LOGGER.isWarnEnabled())
+						LOGGER.warn("Could not get graph from bundle url {}", url, e);
+					return null;
+				}
+			})
+			.filter(Objects::nonNull)
+			.collect(Collectors.toList());
+	}
+
+	private static String tgFileId(Bundle bundle, URL url) {
+		String urlString = url.toString();
+		String file = urlString.substring(urlString.lastIndexOf("/") + 1);
+		return bundle.getSymbolicName() + "_" + file;
+	}
+
 	/**
 	 * Read the graph in a graph bundle. Graph is read from "graph.tg" file in the root.
 	 * 
@@ -365,7 +396,7 @@ public class PlatformUtil {
 
 	private static GraphBundleEx getCompleteGraph(Bundle bundle, URL url) throws IOException {
 		try {
-			String id = bundle.getSymbolicName();
+			String id = tgFileId(bundle, url);
 			return new GraphBundleEx(
 					getBundleName(bundle, id),
 					readTG(url),
@@ -405,7 +436,7 @@ public class PlatformUtil {
 				}
 			};
 
-			String id = bundle.getSymbolicName();
+			String id = tgFileId(bundle, url);
 
 			return new GraphBundleEx(
 					getBundleName(bundle, id),