From 0e10b76b1c4d4d1828ac93ab2933acfa03785f78 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Mon, 5 Sep 2016 23:47:11 +0300 Subject: [PATCH 01/16] Include acorn db in db.client feature and make it the default db driver refs #6596 Change-Id: I3be497696e5f0876387de5e6b5fb05144df2670b --- bundles/org.simantics.acorn/META-INF/MANIFEST.MF | 6 +----- bundles/org.simantics.acorn/OSGI-INF/component.xml | 2 +- .../project/management/ServerManagerFactory.java | 4 ++-- .../internal/SimanticsWorkbenchAdvisor.java | 2 +- .../src/org/simantics/SimanticsPlatform.java | 6 +++--- .../org.simantics.db.client.feature/feature.xml | 14 ++++++++++++++ 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF index 24f576bdc..9152acafd 100644 --- a/bundles/org.simantics.acorn/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.acorn/META-INF/MANIFEST.MF @@ -4,17 +4,13 @@ Bundle-Name: Acorn Database for Simantics Bundle-SymbolicName: org.simantics.acorn Bundle-Version: 1.1.2.qualifier Bundle-Vendor: Semantum Oy -Require-Bundle: org.apache.log4j;visibility:=reexport, - org.simantics.db;bundle-version="0.8.0";visibility:=reexport, - org.simantics.db.common;bundle-version="0.8.0";visibility:=reexport, - gnu.trove3;bundle-version="3.0.0", +Require-Bundle: gnu.trove3;bundle-version="3.0.0", gnu.trove2;bundle-version="2.0.4", org.simantics.db.impl;bundle-version="0.8.0", org.simantics.db.server;bundle-version="1.0.0", org.simantics.compressions;bundle-version="1.0.0", org.simantics.backup, org.eclipse.core.runtime;bundle-version="3.11.1", - org.simantics.fastlz;bundle-version="1.2.1", org.simantics.db.procore Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.simantics.acorn/OSGI-INF/component.xml b/bundles/org.simantics.acorn/OSGI-INF/component.xml index 75dd81fd9..5b88ac3c0 100644 --- a/bundles/org.simantics.acorn/OSGI-INF/component.xml +++ b/bundles/org.simantics.acorn/OSGI-INF/component.xml @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java index 3bde5dc42..4a673b97d 100644 --- a/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java +++ b/bundles/org.simantics.project/src/org/simantics/project/management/ServerManagerFactory.java @@ -33,8 +33,8 @@ public class ServerManagerFactory { public static ServerManager create(String databaseId, String address) throws IOException, DatabaseException { Driver driver = Manager.getDriver(databaseId); if (driver == null) - throw new IllegalArgumentException("Database driver for ID " + databaseId + " Could not be found!"); - System.out.println("ServerManagerFactory.create called with databaseId=" + databaseId + " and driver is " + driver.toString()); + throw new IllegalArgumentException("Database driver with ID " + databaseId + " could not be found!"); + System.out.println("ServerManagerFactory.create called with id " + databaseId + ", driver is " + driver.toString()); DatabaseUserAgent agent = Manager.getUserAgent(databaseId); if (agent != null) driver.setDatabaseUserAgent(address, agent); diff --git a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java index 2d054eaa7..362102172 100644 --- a/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java +++ b/bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java @@ -134,7 +134,7 @@ public class SimanticsWorkbenchAdvisor extends WorkbenchAdvisor { /** * Default database ID */ - private static final String DEFAULT_DATABASE_ID = "procore"; + private static final String DEFAULT_DATABASE_ID = "acorn"; /** * The arguments received by the application. diff --git a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java index 89a5d3dbd..611cfa575 100644 --- a/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java +++ b/bundles/org.simantics/src/org/simantics/SimanticsPlatform.java @@ -39,8 +39,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.osgi.service.resolver.BundleDescription; -import org.simantics.SimanticsPlatform.OntologyRecoveryPolicy; -import org.simantics.SimanticsPlatform.RecoveryPolicy; import org.simantics.databoard.Bindings; import org.simantics.databoard.Databoard; import org.simantics.datatypes.literal.Font; @@ -286,7 +284,9 @@ public class SimanticsPlatform implements LifecycleListener { // Check hash of transferable graph to know whether to update or not. if (platformBundle.getHashcode() == existingBundle.getHashcode()) continue; - System.out.println("Ontology hashcodes does not match! platformBundle" + platformBundle.getName() + ".getHashCode()=" + platformBundle.getHashcode() + " existingBundle" + existingBundle.getName() + ".getHashCode()=" + existingBundle.getHashcode()); + System.out.println("Ontology hashcodes do not match: platform bundle=" + + platformBundle.getVersionedId() + ", hash=" + platformBundle.getHashcode() + + "; existing bundle=" + existingBundle.getVersionedId() + ", hash=" + existingBundle.getHashcode()); reinstallTGs.put(platformBundle, existingBundle); } } diff --git a/features/org.simantics.db.client.feature/feature.xml b/features/org.simantics.db.client.feature/feature.xml index d6101139c..14ecb0bf6 100644 --- a/features/org.simantics.db.client.feature/feature.xml +++ b/features/org.simantics.db.client.feature/feature.xml @@ -73,6 +73,13 @@ install-size="0" version="0.0.0"/> + + + + -- 2.43.2 From 4db56eafb0d9c5894839fced337dafe3b110ab9d Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 6 Sep 2016 15:06:33 +0300 Subject: [PATCH 02/16] Added missing bundles to pom.xml. Missing: org.simantics.acorn, org.simantics.backup{,.db,.ontology}. refs #6475 --- bundles/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bundles/pom.xml b/bundles/pom.xml index 4641096f8..da82d2e0c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -43,9 +43,13 @@ com.famfamfam.silk org.simantics org.simantics.action.ontology + org.simantics.acorn org.simantics.annotation.ontology org.simantics.annotation.ui org.simantics.application + org.simantics.backup + org.simantics.backup.db + org.simantics.backup.ontology org.simantics.basicexpression org.simantics.browsing.ui org.simantics.browsing.ui.common -- 2.43.2 From 11c9c84985a71ff11b54b1a26703ecc7d127bbde Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 6 Sep 2016 15:24:10 +0300 Subject: [PATCH 03/16] Fixed og.simantics.backup.ontology/build.properties It contained an extra plugin.xml row which doesn't exist. refs #6475 --- bundles/org.simantics.backup.ontology/build.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bundles/org.simantics.backup.ontology/build.properties b/bundles/org.simantics.backup.ontology/build.properties index 022de1735..ecdc7c302 100644 --- a/bundles/org.simantics.backup.ontology/build.properties +++ b/bundles/org.simantics.backup.ontology/build.properties @@ -1,6 +1,5 @@ source.. = src/ output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ +bin.includes = META-INF/,\ .,\ graph.tg -- 2.43.2 From d856e4346e0d911421ee11c26834aa1b926908ec Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 7 Sep 2016 10:09:22 +0300 Subject: [PATCH 04/16] Re-implement URIStringUtils escape and unescape using Unicode Now escape only performs the absolute minimum amount of escaping necessary. All String inputs are treated directly as UTF-16 characters and only the smallest amount of 7-bit US-ASCII characters are escaped. These characters are " ", "%", "#", "/" and "&". All other unicode chars (> 127) are written directly as is into the escaped output. The main effect of this change is that Simantics database URIs will contain much less escaped characters than before. Since we always deal with Java String (Unicode) character sequences in Simantics and these URIs are only valid within Simantics, this approach doesn't really cause any problems for us. This implementation is not in accordance with RFC 2396 - Uniform Resource Identifiers (URI): Generic Syntax but it works for us. refs #6673 Change-Id: I5279f68993a087b856d58c36d63427562ea1d1e4 --- .../databoard/util/URIStringUtils.java | 189 +++++++----------- 1 file changed, 71 insertions(+), 118 deletions(-) diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java index 1cd658ba9..a11579f07 100644 --- a/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java +++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/util/URIStringUtils.java @@ -45,8 +45,7 @@ package org.simantics.databoard.util; -import java.nio.charset.Charset; -import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @@ -194,13 +193,14 @@ public final class URIStringUtils { return name; } - final private static int HTTP_POSITION = "http://".length(); + final private static String HTTP_PREFIX = "http://"; + final private static int HTTP_POSITION = HTTP_PREFIX.length(); public static String[] splitURI(String uri) { int nextPathSeparator = uri.lastIndexOf(URIStringUtils.NAMESPACE_PATH_SEPARATOR); if (nextPathSeparator == -1) return null; if (nextPathSeparator == HTTP_POSITION - 1) { - if(uri.startsWith("http://")) return new String[] { "http://", uri.substring(HTTP_POSITION, uri.length()) }; + if(uri.startsWith(HTTP_PREFIX)) return new String[] { HTTP_PREFIX, uri.substring(HTTP_POSITION, uri.length()) }; else return null; } return new String[] { @@ -208,12 +208,10 @@ public final class URIStringUtils { uri.substring(nextPathSeparator + 1, uri.length()) }; } - + public static List splitURISCL(String uri) { String[] result = splitURI(uri); - ArrayList list = new ArrayList(result.length); - for(String s : result) list.add(s); - return list; + return Arrays.asList(result); } /** @@ -263,8 +261,7 @@ public final class URIStringUtils { public static String escapeURI(String localName) { if (localName == null) throw new NullPointerException("null local name"); - String result = encode(localName); - return result; + return encode(localName); } /** @@ -276,8 +273,7 @@ public final class URIStringUtils { * @return the joined namespace */ public static String appendURINamespace(String namespace, String suffix) { - //return namespace + NAMESPACE_PATH_SEPARATOR + suffix; - return new StringBuffer(namespace.length() + 1 + suffix.length()) + return new StringBuilder(namespace.length() + 1 + suffix.length()) .append(namespace) .append(NAMESPACE_PATH_SEPARATOR) .append(suffix) @@ -293,9 +289,8 @@ public final class URIStringUtils { * @return the joined URI */ public static String makeURI(String namespace, String localName) { - //return namespace + NAMESPACE_LOCAL_SEPARATOR + escapeURI(localName); String escapedLocalName = escapeURI(localName); - return new StringBuffer(namespace.length() + 1 + escapedLocalName.length()) + return new StringBuilder(namespace.length() + 1 + escapedLocalName.length()) .append(namespace) .append(NAMESPACE_LOCAL_SEPARATOR) .append(escapedLocalName) @@ -332,99 +327,59 @@ public final class URIStringUtils { } - final private static Charset UTF8 = Charset.forName("UTF-8"); - final private static Charset ASCII = Charset.forName("US-ASCII"); - /* * RFC 3986 section 2.2 Reserved Characters (January 2005) * !*'();:@&=+$,/?#[] */ - private static boolean[] UNESCAPED_US_ASCII_CHARS = new boolean[128]; + private static boolean[] ESCAPED_US_ASCII_CHARS = new boolean[128]; static { - for(char ch='A';ch <= 'Z';++ch) - UNESCAPED_US_ASCII_CHARS[ch] = true; - for(char ch='a';ch <= 'z';++ch) - UNESCAPED_US_ASCII_CHARS[ch] = true; - for(char ch='0';ch <= '9';++ch) - UNESCAPED_US_ASCII_CHARS[ch] = true; - UNESCAPED_US_ASCII_CHARS[';'] = true; - UNESCAPED_US_ASCII_CHARS['?'] = true; - UNESCAPED_US_ASCII_CHARS[':'] = true; - UNESCAPED_US_ASCII_CHARS['@'] = true; - UNESCAPED_US_ASCII_CHARS['='] = true; - UNESCAPED_US_ASCII_CHARS['+'] = true; - UNESCAPED_US_ASCII_CHARS['$'] = true; - UNESCAPED_US_ASCII_CHARS['.'] = true; - UNESCAPED_US_ASCII_CHARS[','] = true; - UNESCAPED_US_ASCII_CHARS['-'] = true; - UNESCAPED_US_ASCII_CHARS['_'] = true; - UNESCAPED_US_ASCII_CHARS['!'] = true; - UNESCAPED_US_ASCII_CHARS['~'] = true; - UNESCAPED_US_ASCII_CHARS['*'] = true; - UNESCAPED_US_ASCII_CHARS['\''] = true; - UNESCAPED_US_ASCII_CHARS['('] = true; - UNESCAPED_US_ASCII_CHARS[')'] = true; - UNESCAPED_US_ASCII_CHARS['['] = true; - UNESCAPED_US_ASCII_CHARS[']'] = true; + ESCAPED_US_ASCII_CHARS[' '] = true; + // IMPORTANT NOTE: every time escape is invoked, all input needs to be escaped, + // i.e. escape("%01") should result in "%2501", not "%01". + // escape and unescape form a bijection, where neither + // of them is an idempotent operation. + ESCAPED_US_ASCII_CHARS['%'] = true; + // '#' and '/' are URL segment/fragment delimiters, need to be escaped in names. + ESCAPED_US_ASCII_CHARS['#'] = true; + ESCAPED_US_ASCII_CHARS['/'] = true; + // Escape '&' characters to avoid them being interpreted as SGML entities. + ESCAPED_US_ASCII_CHARS['&'] = true; } - private static boolean needsEscaping(String unicode) { + private static int needsEscaping(String unicode) { int len = unicode.length(); + int escapeCount = 0; for (int i = 0; i < len; ++i) { char ch = unicode.charAt(i); - if (ch >= 128 || !UNESCAPED_US_ASCII_CHARS[ch]) - return true; + if (ch < 128 && ESCAPED_US_ASCII_CHARS[ch]) + ++escapeCount; } - return false; + return escapeCount; } - /* Copied and modified from Jena 2.4 com.hp.hpl.jena.util.URIref */ private static String encode(String unicode) { - boolean needsEscapes = needsEscaping(unicode); - if (!needsEscapes) + int needsEscapes = needsEscaping(unicode); + if (needsEscapes == 0) return unicode; - byte utf8[] = unicode.getBytes(UTF8); - byte rsltAscii[] = new byte[utf8.length * 6]; + int len = unicode.length(); + char result[] = new char[(len - needsEscapes) + needsEscapes * 3]; int in = 0; int out = 0; - while (in < utf8.length) { - byte inCh = utf8[in]; - if (inCh >= 0 && inCh < 128 && UNESCAPED_US_ASCII_CHARS[inCh]) { - rsltAscii[out] = inCh; - out++; - in++; + while (in < len) { + char inCh = unicode.charAt(in++); + if (inCh >= 128 || !ESCAPED_US_ASCII_CHARS[inCh]) { + result[out++] = inCh; } else { - switch (inCh) { - case (byte)' ': - rsltAscii[out++] = (byte) '%'; - rsltAscii[out++] = '2'; - rsltAscii[out++] = '0'; - in++; - break; - case (byte) '%': - // [lehtonen] NOTE: all input needs to be escaped, i.e. "%01" should result in "%2501", not "%01". - // escape+unescape is a bijection, not an idempotent operation. - // Fall through to escape '%' as '%25' - case (byte) '#': - case (byte) '/': - // Fall through to escape '/' - case (byte)'&': - // Fall through to escape '&' characters to avoid them - // being interpreted as SGML entities. - default: - rsltAscii[out++] = (byte) '%'; - // Get rid of sign ... - int c = (inCh) & 255; - rsltAscii[out++] = hexEncode(c / 16); - rsltAscii[out++] = hexEncode(c % 16); - in++; - break; - } + // Only selected 7-bit US-ASCII characters are escaped + int c = inCh & 255; + result[out++] = '%'; + result[out++] = (char) hexEncode(c / 16); + result[out++] = (char) hexEncode(c % 16); } } - return new String(rsltAscii, 0, out, ASCII); + return new String(result, 0, out); } private static boolean needsUnescaping(String unicode) { @@ -432,13 +387,12 @@ public final class URIStringUtils { } /** - * Convert a URI, in US-ASCII, with escaped characters taken from UTF-8, to - * the corresponding Unicode string. On ill-formed input the results are - * undefined, specifically if the unescaped version is not a UTF-8 String, - * some String will be returned. + * Convert a URI, in UTF-16 with escaped characters taken from US-ASCII, to + * the corresponding unescaped Unicode string. On ill-formed input the results are + * undefined. * * @param uri the uri, in characters specified by RFC 2396 + '#'. - * @return the corresponding Unicode String. + * @return the corresponding unescaped Unicode String. * @exception IllegalArgumentException if a % hex sequence is ill-formed. */ public static String unescape(String uri) { @@ -446,26 +400,29 @@ public final class URIStringUtils { if (!needsUnescaping(uri)) return uri; - byte ascii[] = uri.getBytes("US-ASCII"); - byte utf8[] = new byte[ascii.length]; + int len = uri.length(); + String unicode = uri; + char result[] = new char[len]; int in = 0; int out = 0; - while ( in < ascii.length ) { - if (ascii[in] == (byte) '%') { - in++; - utf8[out++] = (byte) (hexDecode(ascii[in]) * 16 | hexDecode(ascii[in + 1])); + while (in < len) { + char inCh = unicode.charAt(in++); + if (inCh == '%') { + char d1 = unicode.charAt(in); + char d2 = unicode.charAt(in+1); + if (d1 > 127 || d2 > 127) + throw new IllegalArgumentException("Invalid hex digit escape sequence in " + uri + " at " + in); + result[out++] = (char) (hexDecode((byte) d1) * 16 | hexDecode((byte) d2)); in += 2; } else { - utf8[out++] = ascii[in++]; + result[out++] = inCh; } } - return new String(utf8, 0, out, "UTF-8"); + return new String(result, 0, out); } catch (IllegalArgumentException e) { throw new IllegalArgumentException("Problem while unescaping string: " + uri, e); - } catch (java.io.UnsupportedEncodingException e) { - throw new Error("The JVM is required to support UTF-8 and US-ASCII encodings."); - } catch (ArrayIndexOutOfBoundsException ee) { - throw new IllegalArgumentException("Incomplete Hex escape sequence in " + uri); + } catch (IndexOutOfBoundsException ee) { + throw new IllegalArgumentException("Incomplete hex digit escape sequence in " + uri); } } @@ -496,40 +453,36 @@ public final class URIStringUtils { * @param args */ public static void main(String[] args) { - String s; - s = "http://www.vtt.fi%2FSome- %25 Namespace/Jotain"; - System.out.println(String.format("escape+unescape: %s -> %s -> %s", s, escape(s), unescape(escape(s)))); - s = "http://www.vtt.fi%2FPSK"; - System.out.println(String.format("unescape: %s -> %s", s, unescape(s))); - s = "http://www.vtt.fi%2FSome-Namespace/Jotain / Muuta"; - System.out.println(String.format("escape: %s -> %s", s, escape(s))); - s = "Jotain / Muuta"; - System.out.println(String.format("escape: %s -> %s", s, escape(s))); - - System.out.println("escapeURI: " + escapeURI("foo/bar/org%2Fnet")); - System.out.println("escapeURI('...#...'): " + escapeURI("foo/bar#org%2Fnet")); - s = makeURI("http://foo.bar.com/foo/bar", "baz/guuk/org%2Fnet"); + String s = makeURI("http://foo.bar.com/foo/bar", "baz/guuk/org%2Fnet"); System.out.println("escapeURI: " + s); System.out.println("getNamespace: " + getNamespace(s)); System.out.println("getLocalName: " + getLocalName(s)); + System.out.println("escapeURI: " + escapeURI("foo/bar/org%2Fnet")); + System.out.println("escapeURI('...#...'): " + escapeURI("foo/bar#org%2Fnet")); + testEscape("/", "%2F"); testEscape("#", "%23"); testEscape("%", "%25"); testEscape("%01", "%2501"); testEscape("%GG", "%25GG"); - testEscape("säätö venttiili", "s%C3%A4%C3%A4t%C3%B6%20venttiili"); - testEscape("säätö", "s%C3%A4%C3%A4t%C3%B6"); + testEscape("säätö venttiili", "säätö%20venttiili"); + testEscape("säätö", "säätö"); + testEscape("Something / Else", "Something%20%2F%20Else"); + testEscape("http://www.vtt.fi%2FSome- %25 Namespace/Something", "http:%2F%2Fwww.vtt.fi%252FSome-%20%2525%20Namespace%2FSomething"); + testEscape("http://www.vtt.fi/PSK", "http:%2F%2Fwww.vtt.fi%2FPSK"); + testEscape("http://www.vtt.fi%2FSome-Namespace/Something / Else", "http:%2F%2Fwww.vtt.fi%252FSome-Namespace%2FSomething%20%2F%20Else"); } private static void testEscape(String unescaped, String expectedEscaped) { String esc = escape(unescaped); String unesc = unescape(esc); - System.out.format("escape('%s')='%s', unescape('%s')='%s'\n", unescaped, esc, esc, unesc); + System.out.format("escape('%s') -> '%s', unescape('%s') -> '%s'", unescaped, esc, esc, unesc); if (!esc.equals(expectedEscaped)) throw new AssertionError("escape('" + unescaped + "') was expected to return '" + expectedEscaped + "' but returned '" + esc + "'"); if (!unesc.equals(unescaped)) throw new AssertionError("unescape(escape('" + unescaped + "'))=unescape(" + esc + ") was expected to return '" + unescaped + "' but returned '" + unesc + "'"); + System.out.println(" OK"); } } -- 2.43.2 From 5edfb19070e58e72bb58283580663f7ae4115938 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 7 Sep 2016 15:50:57 +0300 Subject: [PATCH 05/16] Sync git svn branch with SVN repository r33176. refs #6677 --- .../org/simantics/diagram/flag/FlagUtil.java | 23 +- .../org/simantics/diagram/flag/Joiner.java | 213 ++++++++++-------- .../handler/ConnectionSplitAndJoin.java | 18 +- 3 files changed, 151 insertions(+), 103 deletions(-) diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java index 6f884e06a..27dc9e307 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java @@ -247,14 +247,25 @@ public final class FlagUtil { RemoverUtil.remove(graph, flag); } + /** + * @param graph + * @param flag + * @return true only if the specified flag is joined only + * within the single diagram it resides in + * @throws DatabaseException + */ public static boolean isJoinedInSingleDiagram(ReadGraph graph, Resource flag) throws DatabaseException { - DiagramResource DIA = DiagramResource.getInstance(graph); - Resource counterpart = getPossibleCounterpart(graph, flag); - if (counterpart == null) + Collection counterparts = getCounterparts(graph, flag); + if (counterparts.isEmpty()) return false; - return !Collections.disjoint( - OrderedSetUtils.getOwnerLists(graph, flag, DIA.Diagram), - OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram)); + DiagramResource DIA = DiagramResource.getInstance(graph); + Collection flagDiagrams = OrderedSetUtils.getOwnerLists(graph, flag, DIA.Diagram); + for (Resource counterpart : counterparts) { + if (Collections.disjoint(flagDiagrams, + OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram))) + return false; + } + return true; } public static boolean isJoinedBetweenDiagrams(ReadGraph graph, Resource flag) throws DatabaseException { diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java index cc02b7638..490a770df 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java @@ -1,6 +1,5 @@ package org.simantics.diagram.flag; -import java.util.ArrayDeque; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -33,127 +32,157 @@ public class Joiner { StructuralResource2 STR; ModelingResources MOD; + ConnectionUtil cu; + public Joiner(ReadGraph graph) { this.L0 = Layer0.getInstance(graph); this.DIA = DiagramResource.getInstance(graph); this.STR = StructuralResource2.getInstance(graph); this.MOD = ModelingResources.getInstance(graph); + this.cu = new ConnectionUtil(graph); } public void joinLocal(WriteGraph graph, Collection flags) throws DatabaseException { - ConnectionUtil cu = new ConnectionUtil(graph); - Set visited = new HashSet(); - ArrayDeque todo = new ArrayDeque(flags); - while (!todo.isEmpty()) { - Resource flag1 = todo.poll(); - Resource flag2 = FlagUtil.getPossibleCounterpart(graph, flag1); - if (flag2 == null || !visited.add(flag1) || !visited.add(flag2)) - continue; - - Type type1 = FlagUtil.getFlagType(graph, flag1); - Type type2 = FlagUtil.getFlagType(graph, flag2); - - Resource connector1 = null; - Resource connector2 = null; - - Resource connection1 = null; - Resource connection2 = null; - - // #7781: prevent joining of flags where one of them or both are - // have no connections to them, i.e. are disconnected. - // First ensure that both flags are connected to something, - // even considering joining them. - for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { - connector1 = graph.getPossibleObject(connector, DIA.AreConnected); - connection1 = ConnectionUtil.getConnection(graph, connector1); + // Only those flags that are known to be removed during the joining of + // two flags are added to this set to prevent processing them multiple times. + Set removed = new HashSet(); + for (Resource flag1 : flags) { + Collection flag1Counterparts = FlagUtil.getCounterparts(graph, flag1); + for (Resource flag2 : flag1Counterparts) { + boolean flag1Removed = FlagUtil.countCounterparts(graph, flag1) <= 1; + boolean flag2Removed = FlagUtil.countCounterparts(graph, flag2) <= 1; + if (flag1Removed && !removed.add(flag1)) + continue; + if (flag2Removed && !removed.add(flag2)) + continue; + boolean switchFlags = !flag1Removed && flag2Removed; + Resource f1 = switchFlags ? flag2 : flag1; + Resource f2 = switchFlags ? flag1 : flag2; + joinFlagPair(graph, f1, f2); } - for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { - connector2 = graph.getPossibleObject(connector, DIA.AreConnected); - connection2 = ConnectionUtil.getConnection(graph, connector2); - } - if (connection1 == null || connector1 == null || connection2 == null || connector2 == null) - continue; - - // Disconnect flags from their respective edges - // This code relies on the fact that flag terminals are - // functional and can only be connected once. This implies - // that their :DIA.Connectors cannot have more than one - // AreConnected relation. + } + } + + private boolean joinFlagPair(WriteGraph graph, Resource flag1, Resource flag2) throws DatabaseException { + Type type1 = FlagUtil.getFlagType(graph, flag1); + Type type2 = FlagUtil.getFlagType(graph, flag2); + + Resource connector1 = null; + Resource connector2 = null; + + Resource connection1 = null; + Resource connection2 = null; + + // #7781: prevent joining of flags where one of them or both + // have no connections to them, i.e. are disconnected. + // First ensure that both flags are connected to something, + // even considering joining them. + for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { + connector1 = graph.getPossibleObject(connector, DIA.AreConnected); + connection1 = ConnectionUtil.getConnection(graph, connector1); + } + for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { + connector2 = graph.getPossibleObject(connector, DIA.AreConnected); + connection2 = ConnectionUtil.getConnection(graph, connector2); + } + if (connection1 == null || connector1 == null || connection2 == null || connector2 == null) + return false; + + // If a flag has more than 1 counterpart it must not be + // removed because it is a merged flag that has multiple + // connection joins attached to it. + boolean removeFlag1 = FlagUtil.countCounterparts(graph, flag1) <= 1; + boolean removeFlag2 = FlagUtil.countCounterparts(graph, flag2) <= 1; + + // Disconnect flags from their respective edges + // This code relies on the fact that flag terminals are + // functional and can only be connected once. This implies + // that their :DIA.Connectors cannot have more than one + // AreConnected relation. + if (removeFlag1) { for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { - connector1 = graph.getPossibleObject(connector, DIA.AreConnected); + connector1 = graph.getSingleObject(connector, DIA.AreConnected); connection1 = ConnectionUtil.getConnection(graph, connector1); cu.removeConnectionPart(connector); } + } + if (removeFlag2) { for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { - connector2 = graph.getPossibleObject(connector, DIA.AreConnected); + connector2 = graph.getSingleObject(connector, DIA.AreConnected); connection2 = ConnectionUtil.getConnection(graph, connector2); cu.removeConnectionPart(connector); } + } - // Decide which connection to remove. The strategy is: - // * always keep the connection that has an ElementToComponent relation. - // * if there are no ElementToComponent relations, keep the connection on the OutputFlag side. - // * if flag type information is not available, keep connection1. - Resource connectionToKeep = connection1; - Resource connectionToRemove = connection2; - Resource hasElementToComponent1 = graph.getPossibleObject(connection1, MOD.ElementToComponent); - Resource hasElementToComponent2 = graph.getPossibleObject(connection2, MOD.ElementToComponent); - if (hasElementToComponent1 != null && hasElementToComponent2 != null) - throw new UnsupportedOperationException("Both flag are connected with connections that have mapped components, can't decide which connection to remove in join operation"); - if (hasElementToComponent2 != null - || (type1 != Type.Out && type2 == Type.Out)) { - connectionToKeep = connection2; - connectionToRemove = connection1; - } + // Decide which connection to remove. The strategy is: + // * always keep the connection that has an ElementToComponent relation. + // * if there are no ElementToComponent relations, keep the connection on the OutputFlag side. + // * if flag type information is not available, keep connection1. + Resource connectionToKeep = connection1; + Resource connectionToRemove = connection2; + Resource hasElementToComponent1 = graph.getPossibleObject(connection1, MOD.ElementToComponent); + Resource hasElementToComponent2 = graph.getPossibleObject(connection2, MOD.ElementToComponent); + if (hasElementToComponent1 != null && hasElementToComponent2 != null) + throw new UnsupportedOperationException("Both flag are connected with connections that have mapped components, can't decide which connection to remove in join operation"); + if (hasElementToComponent2 != null + || (type1 != Type.Out && type2 == Type.Out)) { + connectionToKeep = connection2; + connectionToRemove = connection1; + } - // Remove connection join and flags + // Remove connection join and flags when necessary + if (removeFlag1) for (Resource diagram : OrderedSetUtils.getOwnerLists(graph, flag1, DIA.Diagram)) OrderedSetUtils.remove(graph, diagram, flag1); + if (removeFlag2) for (Resource diagram : OrderedSetUtils.getOwnerLists(graph, flag2, DIA.Diagram)) OrderedSetUtils.remove(graph, diagram, flag2); - FlagUtil.disconnectFlag(graph, flag1); - double[] transform1 = graph.getRelatedValue(flag1, DIA.HasTransform, Bindings.DOUBLE_ARRAY); - double[] transform2 = graph.getRelatedValue(flag2, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + FlagUtil.disconnectFlag(graph, flag1); + double[] transform1 = graph.getRelatedValue(flag1, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + double[] transform2 = graph.getRelatedValue(flag2, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + if (removeFlag1) RemoverUtil.remove(graph, flag1); + if (removeFlag2) RemoverUtil.remove(graph, flag2); - // Move connector from connection to remove to other connection - for(Statement connectorStat : graph.getStatements(connectionToRemove, DIA.HasConnector)) { - graph.deny(connectorStat); - graph.claim(connectionToKeep, connectorStat.getPredicate(), connectorStat.getObject()); - } - for(Resource node : graph.getObjects(connectionToRemove, DIA.HasInteriorRouteNode)) { - graph.deny(node, DIA.HasInteriorRouteNode_Inverse, connectionToRemove); - graph.claim(node, DIA.HasInteriorRouteNode_Inverse, connectionToKeep); - } + // Move connector from connection to remove to other connection + for(Statement connectorStat : graph.getStatements(connectionToRemove, DIA.HasConnector)) { + graph.deny(connectorStat); + graph.claim(connectionToKeep, connectorStat.getPredicate(), connectorStat.getObject()); + } + for(Resource node : graph.getObjects(connectionToRemove, DIA.HasInteriorRouteNode)) { + graph.deny(node, DIA.HasInteriorRouteNode_Inverse, connectionToRemove); + graph.claim(node, DIA.HasInteriorRouteNode_Inverse, connectionToKeep); + } - // Remove obsolete connection - cu.removeConnection(connectionToRemove); - - // Reconnect respective edges - if(graph.isInstanceOf(connector1, DIA.RouteLine) && graph.isInstanceOf(connector2, DIA.RouteLine) - && graph.getRelatedValue(connector1, DIA.IsHorizontal) == graph.getRelatedValue(connector2, DIA.IsHorizontal)) { - boolean horizontal = graph.getRelatedValue(connector1, DIA.IsHorizontal); - - double position; - if(horizontal) - position = 0.5 * (transform1[4] + transform2[4]); - else - position = 0.5 * (transform1[5] + transform2[5]); - - Resource intermediateRouteLine = graph.newResource(); - graph.claim(intermediateRouteLine, L0.InstanceOf, DIA.RouteLine); - graph.claimLiteral(intermediateRouteLine, DIA.IsHorizontal, !horizontal); - graph.claimLiteral(intermediateRouteLine, DIA.HasPosition, position); - graph.claim(connectionToKeep, DIA.HasInteriorRouteNode, intermediateRouteLine); - graph.claim(connector1, DIA.AreConnected, intermediateRouteLine); - graph.claim(connector2, DIA.AreConnected, intermediateRouteLine); - } + // Remove obsolete connection + cu.removeConnection(connectionToRemove); + + // Reconnect respective edges + if(graph.isInstanceOf(connector1, DIA.RouteLine) && graph.isInstanceOf(connector2, DIA.RouteLine) + && graph.getRelatedValue(connector1, DIA.IsHorizontal) == graph.getRelatedValue(connector2, DIA.IsHorizontal)) { + boolean horizontal = graph.getRelatedValue(connector1, DIA.IsHorizontal); + + double position; + if(horizontal) + position = 0.5 * (transform1[4] + transform2[4]); else - graph.claim(connector1, DIA.AreConnected, connector2); + position = 0.5 * (transform1[5] + transform2[5]); + + Resource intermediateRouteLine = graph.newResource(); + graph.claim(intermediateRouteLine, L0.InstanceOf, DIA.RouteLine); + graph.claimLiteral(intermediateRouteLine, DIA.IsHorizontal, !horizontal); + graph.claimLiteral(intermediateRouteLine, DIA.HasPosition, position); + graph.claim(connectionToKeep, DIA.HasInteriorRouteNode, intermediateRouteLine); + graph.claim(connector1, DIA.AreConnected, intermediateRouteLine); + graph.claim(connector2, DIA.AreConnected, intermediateRouteLine); } + else + graph.claim(connector1, DIA.AreConnected, connector2); + + return true; } - + public static void joinFlagsLocal(WriteGraph graph, Collection flags) throws DatabaseException { new Joiner(graph).joinLocal(graph, flags); } diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java index 9e7a1637e..d46c42732 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java @@ -29,6 +29,7 @@ import org.simantics.db.Session; import org.simantics.db.WriteGraph; import org.simantics.db.common.request.IndexRoot; import org.simantics.db.common.request.WriteRequest; +import org.simantics.db.common.utils.OrderedSetUtils; import org.simantics.db.exception.DatabaseException; import org.simantics.diagram.content.ConnectionUtil; import org.simantics.diagram.content.EdgeResource; @@ -150,13 +151,20 @@ public class ConnectionSplitAndJoin extends DynamicMenuContribution { Resource r = AdaptionUtils.adaptToSingle(s, Resource.class); if (r == null || !graph.isInstanceOf(r, DIA.Flag)) return Collections.emptyList(); - Resource counterpart = FlagUtil.getPossibleCounterpart(graph, r); - if (counterpart == null) + if (!isConnectedToSomething(graph, r)) return Collections.emptyList(); - if (!FlagUtil.isJoinedInSingleDiagram(graph, r)) - return Collections.emptyList(); - if (!isConnectedToSomething(graph, r) || !isConnectedToSomething(graph, counterpart)) + Collection counterparts = FlagUtil.getCounterparts(graph, r); + if (counterparts.isEmpty()) return Collections.emptyList(); + Collection flagDiagrams = OrderedSetUtils.getOwnerLists(graph, r, DIA.Diagram); + for (Resource counterpart : counterparts) { + boolean joinedWithinSingleDiagram = !Collections.disjoint(flagDiagrams, + OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram)); + if (!joinedWithinSingleDiagram) + return Collections.emptyList(); + if (!isConnectedToSomething(graph, counterpart)) + return Collections.emptyList(); + } result.add(r); } return result; -- 2.43.2 From c78854f7886d52b5375e11b3d6d8daacb12c287e Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Wed, 7 Sep 2016 15:50:57 +0300 Subject: [PATCH 06/16] Sync git svn branch with SVN repository r33176. refs #6677 --- .../org/simantics/diagram/flag/FlagUtil.java | 23 +- .../org/simantics/diagram/flag/Joiner.java | 213 ++++++++++-------- .../handler/ConnectionSplitAndJoin.java | 18 +- 3 files changed, 151 insertions(+), 103 deletions(-) diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java index 6f884e06a..27dc9e307 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagUtil.java @@ -247,14 +247,25 @@ public final class FlagUtil { RemoverUtil.remove(graph, flag); } + /** + * @param graph + * @param flag + * @return true only if the specified flag is joined only + * within the single diagram it resides in + * @throws DatabaseException + */ public static boolean isJoinedInSingleDiagram(ReadGraph graph, Resource flag) throws DatabaseException { - DiagramResource DIA = DiagramResource.getInstance(graph); - Resource counterpart = getPossibleCounterpart(graph, flag); - if (counterpart == null) + Collection counterparts = getCounterparts(graph, flag); + if (counterparts.isEmpty()) return false; - return !Collections.disjoint( - OrderedSetUtils.getOwnerLists(graph, flag, DIA.Diagram), - OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram)); + DiagramResource DIA = DiagramResource.getInstance(graph); + Collection flagDiagrams = OrderedSetUtils.getOwnerLists(graph, flag, DIA.Diagram); + for (Resource counterpart : counterparts) { + if (Collections.disjoint(flagDiagrams, + OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram))) + return false; + } + return true; } public static boolean isJoinedBetweenDiagrams(ReadGraph graph, Resource flag) throws DatabaseException { diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java index cc02b7638..490a770df 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/Joiner.java @@ -1,6 +1,5 @@ package org.simantics.diagram.flag; -import java.util.ArrayDeque; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -33,127 +32,157 @@ public class Joiner { StructuralResource2 STR; ModelingResources MOD; + ConnectionUtil cu; + public Joiner(ReadGraph graph) { this.L0 = Layer0.getInstance(graph); this.DIA = DiagramResource.getInstance(graph); this.STR = StructuralResource2.getInstance(graph); this.MOD = ModelingResources.getInstance(graph); + this.cu = new ConnectionUtil(graph); } public void joinLocal(WriteGraph graph, Collection flags) throws DatabaseException { - ConnectionUtil cu = new ConnectionUtil(graph); - Set visited = new HashSet(); - ArrayDeque todo = new ArrayDeque(flags); - while (!todo.isEmpty()) { - Resource flag1 = todo.poll(); - Resource flag2 = FlagUtil.getPossibleCounterpart(graph, flag1); - if (flag2 == null || !visited.add(flag1) || !visited.add(flag2)) - continue; - - Type type1 = FlagUtil.getFlagType(graph, flag1); - Type type2 = FlagUtil.getFlagType(graph, flag2); - - Resource connector1 = null; - Resource connector2 = null; - - Resource connection1 = null; - Resource connection2 = null; - - // #7781: prevent joining of flags where one of them or both are - // have no connections to them, i.e. are disconnected. - // First ensure that both flags are connected to something, - // even considering joining them. - for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { - connector1 = graph.getPossibleObject(connector, DIA.AreConnected); - connection1 = ConnectionUtil.getConnection(graph, connector1); + // Only those flags that are known to be removed during the joining of + // two flags are added to this set to prevent processing them multiple times. + Set removed = new HashSet(); + for (Resource flag1 : flags) { + Collection flag1Counterparts = FlagUtil.getCounterparts(graph, flag1); + for (Resource flag2 : flag1Counterparts) { + boolean flag1Removed = FlagUtil.countCounterparts(graph, flag1) <= 1; + boolean flag2Removed = FlagUtil.countCounterparts(graph, flag2) <= 1; + if (flag1Removed && !removed.add(flag1)) + continue; + if (flag2Removed && !removed.add(flag2)) + continue; + boolean switchFlags = !flag1Removed && flag2Removed; + Resource f1 = switchFlags ? flag2 : flag1; + Resource f2 = switchFlags ? flag1 : flag2; + joinFlagPair(graph, f1, f2); } - for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { - connector2 = graph.getPossibleObject(connector, DIA.AreConnected); - connection2 = ConnectionUtil.getConnection(graph, connector2); - } - if (connection1 == null || connector1 == null || connection2 == null || connector2 == null) - continue; - - // Disconnect flags from their respective edges - // This code relies on the fact that flag terminals are - // functional and can only be connected once. This implies - // that their :DIA.Connectors cannot have more than one - // AreConnected relation. + } + } + + private boolean joinFlagPair(WriteGraph graph, Resource flag1, Resource flag2) throws DatabaseException { + Type type1 = FlagUtil.getFlagType(graph, flag1); + Type type2 = FlagUtil.getFlagType(graph, flag2); + + Resource connector1 = null; + Resource connector2 = null; + + Resource connection1 = null; + Resource connection2 = null; + + // #7781: prevent joining of flags where one of them or both + // have no connections to them, i.e. are disconnected. + // First ensure that both flags are connected to something, + // even considering joining them. + for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { + connector1 = graph.getPossibleObject(connector, DIA.AreConnected); + connection1 = ConnectionUtil.getConnection(graph, connector1); + } + for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { + connector2 = graph.getPossibleObject(connector, DIA.AreConnected); + connection2 = ConnectionUtil.getConnection(graph, connector2); + } + if (connection1 == null || connector1 == null || connection2 == null || connector2 == null) + return false; + + // If a flag has more than 1 counterpart it must not be + // removed because it is a merged flag that has multiple + // connection joins attached to it. + boolean removeFlag1 = FlagUtil.countCounterparts(graph, flag1) <= 1; + boolean removeFlag2 = FlagUtil.countCounterparts(graph, flag2) <= 1; + + // Disconnect flags from their respective edges + // This code relies on the fact that flag terminals are + // functional and can only be connected once. This implies + // that their :DIA.Connectors cannot have more than one + // AreConnected relation. + if (removeFlag1) { for (Resource connector : graph.getObjects(flag1, STR.IsConnectedTo)) { - connector1 = graph.getPossibleObject(connector, DIA.AreConnected); + connector1 = graph.getSingleObject(connector, DIA.AreConnected); connection1 = ConnectionUtil.getConnection(graph, connector1); cu.removeConnectionPart(connector); } + } + if (removeFlag2) { for (Resource connector : graph.getObjects(flag2, STR.IsConnectedTo)) { - connector2 = graph.getPossibleObject(connector, DIA.AreConnected); + connector2 = graph.getSingleObject(connector, DIA.AreConnected); connection2 = ConnectionUtil.getConnection(graph, connector2); cu.removeConnectionPart(connector); } + } - // Decide which connection to remove. The strategy is: - // * always keep the connection that has an ElementToComponent relation. - // * if there are no ElementToComponent relations, keep the connection on the OutputFlag side. - // * if flag type information is not available, keep connection1. - Resource connectionToKeep = connection1; - Resource connectionToRemove = connection2; - Resource hasElementToComponent1 = graph.getPossibleObject(connection1, MOD.ElementToComponent); - Resource hasElementToComponent2 = graph.getPossibleObject(connection2, MOD.ElementToComponent); - if (hasElementToComponent1 != null && hasElementToComponent2 != null) - throw new UnsupportedOperationException("Both flag are connected with connections that have mapped components, can't decide which connection to remove in join operation"); - if (hasElementToComponent2 != null - || (type1 != Type.Out && type2 == Type.Out)) { - connectionToKeep = connection2; - connectionToRemove = connection1; - } + // Decide which connection to remove. The strategy is: + // * always keep the connection that has an ElementToComponent relation. + // * if there are no ElementToComponent relations, keep the connection on the OutputFlag side. + // * if flag type information is not available, keep connection1. + Resource connectionToKeep = connection1; + Resource connectionToRemove = connection2; + Resource hasElementToComponent1 = graph.getPossibleObject(connection1, MOD.ElementToComponent); + Resource hasElementToComponent2 = graph.getPossibleObject(connection2, MOD.ElementToComponent); + if (hasElementToComponent1 != null && hasElementToComponent2 != null) + throw new UnsupportedOperationException("Both flag are connected with connections that have mapped components, can't decide which connection to remove in join operation"); + if (hasElementToComponent2 != null + || (type1 != Type.Out && type2 == Type.Out)) { + connectionToKeep = connection2; + connectionToRemove = connection1; + } - // Remove connection join and flags + // Remove connection join and flags when necessary + if (removeFlag1) for (Resource diagram : OrderedSetUtils.getOwnerLists(graph, flag1, DIA.Diagram)) OrderedSetUtils.remove(graph, diagram, flag1); + if (removeFlag2) for (Resource diagram : OrderedSetUtils.getOwnerLists(graph, flag2, DIA.Diagram)) OrderedSetUtils.remove(graph, diagram, flag2); - FlagUtil.disconnectFlag(graph, flag1); - double[] transform1 = graph.getRelatedValue(flag1, DIA.HasTransform, Bindings.DOUBLE_ARRAY); - double[] transform2 = graph.getRelatedValue(flag2, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + FlagUtil.disconnectFlag(graph, flag1); + double[] transform1 = graph.getRelatedValue(flag1, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + double[] transform2 = graph.getRelatedValue(flag2, DIA.HasTransform, Bindings.DOUBLE_ARRAY); + if (removeFlag1) RemoverUtil.remove(graph, flag1); + if (removeFlag2) RemoverUtil.remove(graph, flag2); - // Move connector from connection to remove to other connection - for(Statement connectorStat : graph.getStatements(connectionToRemove, DIA.HasConnector)) { - graph.deny(connectorStat); - graph.claim(connectionToKeep, connectorStat.getPredicate(), connectorStat.getObject()); - } - for(Resource node : graph.getObjects(connectionToRemove, DIA.HasInteriorRouteNode)) { - graph.deny(node, DIA.HasInteriorRouteNode_Inverse, connectionToRemove); - graph.claim(node, DIA.HasInteriorRouteNode_Inverse, connectionToKeep); - } + // Move connector from connection to remove to other connection + for(Statement connectorStat : graph.getStatements(connectionToRemove, DIA.HasConnector)) { + graph.deny(connectorStat); + graph.claim(connectionToKeep, connectorStat.getPredicate(), connectorStat.getObject()); + } + for(Resource node : graph.getObjects(connectionToRemove, DIA.HasInteriorRouteNode)) { + graph.deny(node, DIA.HasInteriorRouteNode_Inverse, connectionToRemove); + graph.claim(node, DIA.HasInteriorRouteNode_Inverse, connectionToKeep); + } - // Remove obsolete connection - cu.removeConnection(connectionToRemove); - - // Reconnect respective edges - if(graph.isInstanceOf(connector1, DIA.RouteLine) && graph.isInstanceOf(connector2, DIA.RouteLine) - && graph.getRelatedValue(connector1, DIA.IsHorizontal) == graph.getRelatedValue(connector2, DIA.IsHorizontal)) { - boolean horizontal = graph.getRelatedValue(connector1, DIA.IsHorizontal); - - double position; - if(horizontal) - position = 0.5 * (transform1[4] + transform2[4]); - else - position = 0.5 * (transform1[5] + transform2[5]); - - Resource intermediateRouteLine = graph.newResource(); - graph.claim(intermediateRouteLine, L0.InstanceOf, DIA.RouteLine); - graph.claimLiteral(intermediateRouteLine, DIA.IsHorizontal, !horizontal); - graph.claimLiteral(intermediateRouteLine, DIA.HasPosition, position); - graph.claim(connectionToKeep, DIA.HasInteriorRouteNode, intermediateRouteLine); - graph.claim(connector1, DIA.AreConnected, intermediateRouteLine); - graph.claim(connector2, DIA.AreConnected, intermediateRouteLine); - } + // Remove obsolete connection + cu.removeConnection(connectionToRemove); + + // Reconnect respective edges + if(graph.isInstanceOf(connector1, DIA.RouteLine) && graph.isInstanceOf(connector2, DIA.RouteLine) + && graph.getRelatedValue(connector1, DIA.IsHorizontal) == graph.getRelatedValue(connector2, DIA.IsHorizontal)) { + boolean horizontal = graph.getRelatedValue(connector1, DIA.IsHorizontal); + + double position; + if(horizontal) + position = 0.5 * (transform1[4] + transform2[4]); else - graph.claim(connector1, DIA.AreConnected, connector2); + position = 0.5 * (transform1[5] + transform2[5]); + + Resource intermediateRouteLine = graph.newResource(); + graph.claim(intermediateRouteLine, L0.InstanceOf, DIA.RouteLine); + graph.claimLiteral(intermediateRouteLine, DIA.IsHorizontal, !horizontal); + graph.claimLiteral(intermediateRouteLine, DIA.HasPosition, position); + graph.claim(connectionToKeep, DIA.HasInteriorRouteNode, intermediateRouteLine); + graph.claim(connector1, DIA.AreConnected, intermediateRouteLine); + graph.claim(connector2, DIA.AreConnected, intermediateRouteLine); } + else + graph.claim(connector1, DIA.AreConnected, connector2); + + return true; } - + public static void joinFlagsLocal(WriteGraph graph, Collection flags) throws DatabaseException { new Joiner(graph).joinLocal(graph, flags); } diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java index 9e7a1637e..d46c42732 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/handler/ConnectionSplitAndJoin.java @@ -29,6 +29,7 @@ import org.simantics.db.Session; import org.simantics.db.WriteGraph; import org.simantics.db.common.request.IndexRoot; import org.simantics.db.common.request.WriteRequest; +import org.simantics.db.common.utils.OrderedSetUtils; import org.simantics.db.exception.DatabaseException; import org.simantics.diagram.content.ConnectionUtil; import org.simantics.diagram.content.EdgeResource; @@ -150,13 +151,20 @@ public class ConnectionSplitAndJoin extends DynamicMenuContribution { Resource r = AdaptionUtils.adaptToSingle(s, Resource.class); if (r == null || !graph.isInstanceOf(r, DIA.Flag)) return Collections.emptyList(); - Resource counterpart = FlagUtil.getPossibleCounterpart(graph, r); - if (counterpart == null) + if (!isConnectedToSomething(graph, r)) return Collections.emptyList(); - if (!FlagUtil.isJoinedInSingleDiagram(graph, r)) - return Collections.emptyList(); - if (!isConnectedToSomething(graph, r) || !isConnectedToSomething(graph, counterpart)) + Collection counterparts = FlagUtil.getCounterparts(graph, r); + if (counterparts.isEmpty()) return Collections.emptyList(); + Collection flagDiagrams = OrderedSetUtils.getOwnerLists(graph, r, DIA.Diagram); + for (Resource counterpart : counterparts) { + boolean joinedWithinSingleDiagram = !Collections.disjoint(flagDiagrams, + OrderedSetUtils.getOwnerLists(graph, counterpart, DIA.Diagram)); + if (!joinedWithinSingleDiagram) + return Collections.emptyList(); + if (!isConnectedToSomething(graph, counterpart)) + return Collections.emptyList(); + } result.add(r); } return result; -- 2.43.2 From 0e8cf1e1708870e179330c2f9af2d03589d553ab Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Fri, 9 Sep 2016 15:46:09 +0300 Subject: [PATCH 07/16] Sync git svn branch with SVN repository r33184. refs #6621 refs #6679 refs #6682 --- .../participant/ConnectionBuilder.java | 40 +- .../server/io/IAbstractRequestInterface.java | 1 + .../org.simantics.fileimport/build.properties | 2 +- .../org.simantics.sdk.feature/feature.xml | 14 + releng/org.simantics.target/rmap/SDK.rmap | 1026 ++++++++--------- .../org.simantics.target/rmap/Simantics.rmap | 9 - 6 files changed, 552 insertions(+), 540 deletions(-) diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectionBuilder.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectionBuilder.java index 6b78af1b8..1fcf074cd 100644 --- a/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectionBuilder.java +++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/participant/ConnectionBuilder.java @@ -70,6 +70,7 @@ import org.simantics.g2d.element.handler.EdgeVisuals.EdgeEnd; import org.simantics.g2d.element.impl.Element; import org.simantics.g2d.elementclass.BranchPoint; import org.simantics.g2d.elementclass.FlagClass; +import org.simantics.g2d.elementclass.FlagClass.Type; import org.simantics.layer0.Layer0; import org.simantics.modeling.ModelingResources; import org.simantics.scl.runtime.tuple.Tuple2; @@ -548,6 +549,22 @@ public class ConnectionBuilder { Resource flagConnection = ConnectionUtil.getConnection(graph, flagConnector); Collection flagRouteNodes = graph.getObjects(flagConnector, DIA.AreConnected); + Resource connectionToKeep = attachToConnection; + Resource connectionToRemove = flagConnection; + if (!connectionToKeep.equals(connectionToRemove)) { + Resource hasElementToComponent1 = graph.getPossibleObject(attachToConnection, MOD.ElementToComponent); + Resource hasElementToComponent2 = graph.getPossibleObject(flagConnection, MOD.ElementToComponent); + Type flagType = FlagUtil.getFlagType(graph, flagToRemove); + if (hasElementToComponent1 != null && hasElementToComponent2 != null) + throw new UnsupportedOperationException( + "Both attached connection " + attachToConnection + " and flag connection " + flagConnection + + " have mapped components, can't decide which connection to remove in join operation"); + if (hasElementToComponent2 != null || flagType == Type.Out) { + connectionToKeep = flagConnection; + connectionToRemove = attachToConnection; + } + } + // Remove flag and its connector. graph.deny(flagToConnector); new RemoveElement((Resource)diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE), flagToRemove).perform(graph); @@ -564,19 +581,26 @@ public class ConnectionBuilder { } } - for (Statement routeNode : graph.getStatements(flagConnection, DIA.HasInteriorRouteNode)) { - graph.deny(routeNode); - graph.claim(attachToConnection, routeNode.getPredicate(), routeNode.getObject()); - } - for (Statement connector : graph.getStatements(flagConnection, DIA.HasConnector)) { - graph.deny(connector); - graph.claim(attachToConnection, connector.getPredicate(), connector.getObject()); - } + moveStatements(graph, connectionToRemove, connectionToKeep, DIA.HasInteriorRouteNode); + moveStatements(graph, connectionToRemove, connectionToKeep, DIA.HasConnector); + + // Remove obsolete connection + if (!connectionToKeep.equals(connectionToRemove)) + cu.removeConnection(connectionToRemove); CommentMetadata cm = graph.getMetadata(CommentMetadata.class); graph.addMetadata(cm.add("Joined connection to disconnected flag")); } + private void moveStatements(WriteGraph graph, Resource source, Resource target, Resource movedRelation) throws DatabaseException { + if (!source.equals(target)) { + for (Statement s : graph.getStatements(source, movedRelation)) { + graph.deny(s); + graph.claim(target, s.getPredicate(), s.getObject()); + } + } + } + private Collection removeUntilOrientedRouteline(WriteGraph graph, boolean expectedOrientation, Resource routeNode) throws DatabaseException { List result = new ArrayList<>(2); Deque work = new ArrayDeque<>(2); diff --git a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/IAbstractRequestInterface.java b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/IAbstractRequestInterface.java index 5253b3ed9..041953490 100644 --- a/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/IAbstractRequestInterface.java +++ b/bundles/org.simantics.document.server.io/src/org/simantics/document/server/io/IAbstractRequestInterface.java @@ -15,4 +15,5 @@ public interface IAbstractRequestInterface { public void subscribeDocument(String document, String sessionGUID, IDocumentListener documentListener); public IJSONResult readChanges(String uri, String sessionGUID, int sequenceNumber); public void initializeDocument(String documentURI, String sessionGUID, CommandContext context); + public void onPoll(String sessionGUID); } diff --git a/bundles/org.simantics.fileimport/build.properties b/bundles/org.simantics.fileimport/build.properties index a98f3f123..a26ce7b6b 100644 --- a/bundles/org.simantics.fileimport/build.properties +++ b/bundles/org.simantics.fileimport/build.properties @@ -1,7 +1,7 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ - OSGI-INF/FileReferenceFileImport.xml,\ + OSGI-INF/, OSGI-INF/FileReferenceFileImport.xml,\ OSGI-INF/LibraryFolderFileImport.xml,\ scl/ diff --git a/features/org.simantics.sdk.feature/feature.xml b/features/org.simantics.sdk.feature/feature.xml index 41c08423a..ee4a899a1 100644 --- a/features/org.simantics.sdk.feature/feature.xml +++ b/features/org.simantics.sdk.feature/feature.xml @@ -144,4 +144,18 @@ id="org.simantics.document.linking" version="0.0.0"/> + + + + diff --git a/releng/org.simantics.target/rmap/SDK.rmap b/releng/org.simantics.target/rmap/SDK.rmap index 71eeaa710..30cba0d39 100644 --- a/releng/org.simantics.target/rmap/SDK.rmap +++ b/releng/org.simantics.target/rmap/SDK.rmap @@ -1,123 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://www.eclipse.org/buckminster/RMap-1.0" + xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" + xmlns:pv="http://www.eclipse.org/buckminster/Provider-1.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -135,40 +135,40 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -186,8 +186,8 @@ - - + + @@ -195,31 +195,31 @@ - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - - + + + @@ -271,204 +271,204 @@ - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -486,56 +486,56 @@ - - - - + + + + - - - + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + @@ -554,156 +554,138 @@ - - - - + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + + + + + + + --> + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -711,9 +693,9 @@ - - - + + + diff --git a/releng/org.simantics.target/rmap/Simantics.rmap b/releng/org.simantics.target/rmap/Simantics.rmap index bddbcf45a..da0e1ec2a 100644 --- a/releng/org.simantics.target/rmap/Simantics.rmap +++ b/releng/org.simantics.target/rmap/Simantics.rmap @@ -2,15 +2,6 @@ - - -- 2.43.2 From bf5f69c1aadb4405167e5bf03c58cc83f0ef6b20 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Mon, 12 Sep 2016 23:17:54 +0300 Subject: [PATCH 08/16] Refresh native part of org.simantics.fastlz compilation instructions. Added Visual Studio 2012 solution/project for compiling with Microsoft Platform SDK for Windows Server 2003 R2. Renamed libfastlz-darwin-x86_64.jnilib to libfastlz-darwin-x86_64.dylib since .dylib is what System.mapLibraryName adds to library names. Also updated compile.sh to produce .dylib on Darwin. Removed LZ4 codes from the native codebase, they are already elsewhere and don't belong here anymore. refs #6675 Change-Id: I8dc95c5f91bc906c627b47e32ee1b9d1b6a4cb6d Signed-off-by: Tuukka Lehtonen --- .../impl/DecompressingInputStream.java | 8 +- bundles/org.simantics.fastlz/LICENSE | 36 +- bundles/org.simantics.fastlz/README.txt | 6 +- bundles/org.simantics.fastlz/native/Makefile | 20 - .../native/compile-x64.bat | 4 +- .../native/compile-x86.bat | 4 +- .../org.simantics.fastlz/native/compile.bat | 4 +- .../org.simantics.fastlz/native/compile.sh | 4 +- .../org.simantics.fastlz/native/jniWrapper.c | 68 -- bundles/org.simantics.fastlz/native/lz4.c | 819 ------------------ bundles/org.simantics.fastlz/native/lz4.h | 120 --- .../native/lz4_format_description.txt | 121 --- bundles/org.simantics.fastlz/native/lz4hc.c | 663 -------------- bundles/org.simantics.fastlz/native/lz4hc.h | 60 -- .../native/vs2012/fastlz.sln | 26 + .../native/vs2012/fastlz.vcxproj | 188 ++++ .../native/vs2012/fastlz.vcxproj.filters | 30 + ...4.jnilib => libfastlz-darwin-x86_64.dylib} | Bin .../fastlz/java/FastLZJavaInputStream.java | 5 + .../simantics/fastlz/FastLZBasicTests.java | 1 - 20 files changed, 267 insertions(+), 1920 deletions(-) delete mode 100644 bundles/org.simantics.fastlz/native/Makefile delete mode 100644 bundles/org.simantics.fastlz/native/lz4.c delete mode 100644 bundles/org.simantics.fastlz/native/lz4.h delete mode 100644 bundles/org.simantics.fastlz/native/lz4_format_description.txt delete mode 100644 bundles/org.simantics.fastlz/native/lz4hc.c delete mode 100644 bundles/org.simantics.fastlz/native/lz4hc.h create mode 100644 bundles/org.simantics.fastlz/native/vs2012/fastlz.sln create mode 100644 bundles/org.simantics.fastlz/native/vs2012/fastlz.vcxproj create mode 100644 bundles/org.simantics.fastlz/native/vs2012/fastlz.vcxproj.filters rename bundles/org.simantics.fastlz/src/{libfastlz-darwin-x86_64.jnilib => libfastlz-darwin-x86_64.dylib} (100%) diff --git a/bundles/org.simantics.compressions/src/org/simantics/compressions/impl/DecompressingInputStream.java b/bundles/org.simantics.compressions/src/org/simantics/compressions/impl/DecompressingInputStream.java index 8c7987177..9329d83c4 100644 --- a/bundles/org.simantics.compressions/src/org/simantics/compressions/impl/DecompressingInputStream.java +++ b/bundles/org.simantics.compressions/src/org/simantics/compressions/impl/DecompressingInputStream.java @@ -134,16 +134,20 @@ public abstract class DecompressingInputStream extends InputStream { return true; } - private static ByteBuffer ensureBufferSize(ByteBuffer buffer, int minCapacity) { + private ByteBuffer ensureBufferSize(ByteBuffer buffer, int minCapacity) { int oldCapacity = buffer != null ? buffer.capacity() : 0; if (buffer == null || oldCapacity < minCapacity) { int newCapacity = grow(oldCapacity, minCapacity); //System.out.println("ensureBufferSize(" + oldCapacity + ", " + minCapacity + "), new capacity " + newCapacity); - buffer = ByteBuffer.allocateDirect(newCapacity); + buffer = allocateBuffer(newCapacity); } return buffer; } + protected ByteBuffer allocateBuffer(int capacity) { + return ByteBuffer.allocateDirect(capacity); + } + /** * @param oldCapacity current capacity of a buffer * @param minCapacity diff --git a/bundles/org.simantics.fastlz/LICENSE b/bundles/org.simantics.fastlz/LICENSE index 299e8e19c..c7d105725 100644 --- a/bundles/org.simantics.fastlz/LICENSE +++ b/bundles/org.simantics.fastlz/LICENSE @@ -24,38 +24,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - -LZ4 native/lz4{,hc}.{c,h} ---------------------------------------------------------------------- - LZ4 - Fast LZ compression algorithm - Copyright (C) 2011-2012, Yann Collet. - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html - - LZ4 source repository : http://code.google.com/p/lz4/ +THE SOFTWARE. \ No newline at end of file diff --git a/bundles/org.simantics.fastlz/README.txt b/bundles/org.simantics.fastlz/README.txt index 134b4e111..8f9e06cd3 100644 --- a/bundles/org.simantics.fastlz/README.txt +++ b/bundles/org.simantics.fastlz/README.txt @@ -1,12 +1,12 @@ The native/ -directory contains the sources for the -native parts of the FastLZ and LZ4 compressions algorithms. +native parts of the FastLZ compression algorithm. To compile in the native libraries follow these instructions: == Windows == -* Install MS Visual Studio 2010 with C++ support and Microsoft SDK 7.1 to get 64-bit compiler -* Open native/vs2010/fastlz.sln in visual studio +* Install MS Visual Studio 2012 with C++ support and Microsoft Platform SDK for Windows Server 2003 R2 to get 64-bit compiler +* Open native/vs2012/fastlz.sln in Visual Studio 2012 * Select ''Batch Build'' from the solution context menu, select Win32 + x64 Release and press ''Rebuild'' * The build will copy the resulting fastlz-windows-{x86,x86_64}.dll into src/ diff --git a/bundles/org.simantics.fastlz/native/Makefile b/bundles/org.simantics.fastlz/native/Makefile deleted file mode 100644 index 8a2696aef..000000000 --- a/bundles/org.simantics.fastlz/native/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -OS := $(shell uname) - -ifeq ($(OS),Linux) - OUTPUT32 = lz4demo32 - OUTPUT64 = lz4demo64 -else - OUTPUT32 = LZ4Demo32.exe - OUTPUT64 = LZ4Demo64.exe -endif - -all: lz4demo64 lz4demo32 - -lz4demo64: lz4.c lz4.h lz4hc.c lz4hc.h bench.c lz4demo.c - gcc -O3 -I. -std=c99 -Wall -W -Wundef -Wno-implicit-function-declaration lz4hc.c lz4.c bench.c lz4demo.c -o $(OUTPUT64) - -lz4demo32: lz4.c lz4.h lz4hc.c lz4hc.h bench.c lz4demo.c - gcc -m32 -Os -march=native -I. -std=c99 -Wall -W -Wundef -Wno-implicit-function-declaration lz4hc.c lz4.c bench.c lz4demo.c -o $(OUTPUT32) - -clean: - rm -f core *.o $(OUTPUT32) $(OUTPUT64) diff --git a/bundles/org.simantics.fastlz/native/compile-x64.bat b/bundles/org.simantics.fastlz/native/compile-x64.bat index c8628b88a..2eb226eb0 100644 --- a/bundles/org.simantics.fastlz/native/compile-x64.bat +++ b/bundles/org.simantics.fastlz/native/compile-x64.bat @@ -11,6 +11,6 @@ @rem *************************************************************************** @echo off -cl /O2 /Oi /GL /I "%JAVA_HOME%/include/win32" /I "%JAVA_HOME%/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "VC64_EXPORTS" /D "_UNICODE" /D "UNICODE" /D "_WINDLL" /EHsc /LD /Gy /GS- /W3 /nologo /c /Zi /TC /errorReport:prompt fastlz.c lz4.c lz4hc.c jniWrapper.c +cl /O2 /Oi /GL /I "%JAVA_HOME%/include/win32" /I "%JAVA_HOME%/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "VC64_EXPORTS" /D "_UNICODE" /D "UNICODE" /D "_WINDLL" /EHsc /LD /Gy /GS- /W3 /nologo /c /Zi /TC /errorReport:prompt fastlz.c jniWrapper.c -link /OUT:"..\src\fastlz-windows-x86_64.dll" /INCREMENTAL:NO /NOLOGO /DLL /MANIFEST /MANIFESTFILE:"..\fastlz-windows-x86_64.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"fastlz-windows-x86_64.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /DYNAMICBASE /NXCOMPAT /MACHINE:X64 /ERRORREPORT:PROMPT kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fastlz.obj lz4.obj lz4hc.obj jniWrapper.obj +link /OUT:"..\src\fastlz-windows-x86_64.dll" /INCREMENTAL:NO /NOLOGO /DLL /MANIFEST /MANIFESTFILE:"..\fastlz-windows-x86_64.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"fastlz-windows-x86_64.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /DYNAMICBASE /NXCOMPAT /MACHINE:X64 /ERRORREPORT:PROMPT kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fastlz.obj jniWrapper.obj diff --git a/bundles/org.simantics.fastlz/native/compile-x86.bat b/bundles/org.simantics.fastlz/native/compile-x86.bat index 0e9570786..0141073b7 100644 --- a/bundles/org.simantics.fastlz/native/compile-x86.bat +++ b/bundles/org.simantics.fastlz/native/compile-x86.bat @@ -11,6 +11,6 @@ @rem *************************************************************************** @echo off -cl /O2 /Oi /GL /I "%JAVA_HOME%/include/win32" /I "%JAVA_HOME%/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "UNICODE" /D "_WINDLL" /EHsc /LD /Gy /GS- /W3 /nologo /c /Zi /TC /errorReport:prompt fastlz.c lz4.c lz4hc.c jniWrapper.c +cl /O2 /Oi /GL /I "%JAVA_HOME%/include/win32" /I "%JAVA_HOME%/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "UNICODE" /D "_WINDLL" /EHsc /LD /Gy /GS- /W3 /nologo /c /Zi /TC /errorReport:prompt fastlz.c jniWrapper.c -link /OUT:"..\src\fastlz-windows-x86.dll" /INCREMENTAL:NO /NOLOGO /DLL /MANIFEST /MANIFESTFILE:"..\fastlz-windows-x86.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"fastlz-windows-x86.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /DYNAMICBASE /NXCOMPAT /MACHINE:X86 /ERRORREPORT:PROMPT kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fastlz.obj lz4.obj lz4hc.obj jniWrapper.obj +link /OUT:"..\src\fastlz-windows-x86.dll" /INCREMENTAL:NO /NOLOGO /DLL /MANIFEST /MANIFESTFILE:"..\fastlz-windows-x86.dll.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"fastlz-windows-x86.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG /DYNAMICBASE /NXCOMPAT /MACHINE:X86 /ERRORREPORT:PROMPT kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib fastlz.obj jniWrapper.obj diff --git a/bundles/org.simantics.fastlz/native/compile.bat b/bundles/org.simantics.fastlz/native/compile.bat index 22968b87c..7904b5198 100644 --- a/bundles/org.simantics.fastlz/native/compile.bat +++ b/bundles/org.simantics.fastlz/native/compile.bat @@ -9,6 +9,6 @@ @rem Contributors: @rem VTT Technical Research Centre of Finland - initial API and implementation @rem *************************************************************************** -rem gcc -mno-cygwin "-I$jdk/include" "-I$jdk$jdk/include/win32" -Wl,--add-stdcall-alias -shared -o ../src/fastlz-windows-x86.dll fastlz.c lz4.c lz4hc.c jniWrapper.c -gcc -mno-cygwin "-I%JAVA_HOME%/include" "-I%JAVA_HOME%/include/win32" -Wl,--add-stdcall-alias -shared -o ../src/fastlz-windows-x86.dll fastlz.c lz4.c lz4hc.c jniWrapper.c +rem gcc -mno-cygwin "-I$jdk/include" "-I$jdk$jdk/include/win32" -Wl,--add-stdcall-alias -shared -o ../src/fastlz-windows-x86.dll fastlz.c jniWrapper.c +gcc -mno-cygwin "-I%JAVA_HOME%/include" "-I%JAVA_HOME%/include/win32" -Wl,--add-stdcall-alias -shared -o ../src/fastlz-windows-x86.dll fastlz.c jniWrapper.c gcc -o fastlz_test.exe fastlz.c fastlz_read.c fastlz_write.c fastlz_test.c diff --git a/bundles/org.simantics.fastlz/native/compile.sh b/bundles/org.simantics.fastlz/native/compile.sh index 05aac11f9..21899d5dd 100755 --- a/bundles/org.simantics.fastlz/native/compile.sh +++ b/bundles/org.simantics.fastlz/native/compile.sh @@ -54,7 +54,7 @@ output="../src/libfastlz-${kernel}-${arch}" case $kernel in darwin*) - output="${output}.jnilib" + output="${output}.dylib" ;; *) output="${output}.so" @@ -65,7 +65,7 @@ echo "Architecture: $arch" echo "Output library: $output" echo "Compiler options: $options" -gcc ${options} -o ${output} fastlz.c lz4.c lz4hc.c jniWrapper.c +gcc ${options} -o ${output} fastlz.c jniWrapper.c size=`ls -l $output | cut -d " " -f 5` echo "library size before stripping: $size" diff --git a/bundles/org.simantics.fastlz/native/jniWrapper.c b/bundles/org.simantics.fastlz/native/jniWrapper.c index 0c696e1f5..6f497627a 100644 --- a/bundles/org.simantics.fastlz/native/jniWrapper.c +++ b/bundles/org.simantics.fastlz/native/jniWrapper.c @@ -87,71 +87,3 @@ JNIEXPORT jint JNICALL Java_org_simantics_fastlz_FastLZ_decompressCluster(JNIEnv } -JNIEXPORT jint JNICALL Java_org_simantics_fastlz_LZ4_compress(JNIEnv* env, jclass clazz, - jobject input, jint inputOffset, jint length, - jobject output, jint outputOffset) { - void* inputAddress = (char*)(*env)->GetDirectBufferAddress(env, input) + inputOffset; - void* outputAddress = (char*)(*env)->GetDirectBufferAddress(env, output) + outputOffset; - return LZ4_compress(inputAddress, outputAddress, length); -} - -JNIEXPORT jint JNICALL Java_org_simantics_fastlz_LZ4_decompress(JNIEnv* env, jclass clazz, - jobject input, jint inputOffset, jint length, - jobject output, jint outputOffset, jint maxout) { - void* inputAddress = (char*)(*env)->GetDirectBufferAddress(env, input) + inputOffset; - void* outputAddress = (char*)(*env)->GetDirectBufferAddress(env, output) + outputOffset; - return LZ4_uncompress_unknownOutputSize(inputAddress, outputAddress, length, maxout); -} - -JNIEXPORT jint JNICALL Java_org_simantics_fastlz_LZ4_decompressCluster(JNIEnv* env, jclass clazz, jobject deflated, jint deflatedSize, jint inflatedSize, jobjectArray arrays) { - - static char *inflateBuffer = 0; - static int inflateBufferSize = 0; - - int ll, il, bl; - - jlongArray longs; - jintArray ints; - jbyteArray bytes; - - char *input = (char*)(*env)->GetDirectBufferAddress(env, deflated); - char *address; - - if(inflateBufferSize < inflatedSize) { - if(!inflateBuffer) { - if(inflatedSize < INITIAL_SIZE) inflatedSize = INITIAL_SIZE; - inflateBuffer = malloc(inflatedSize); - inflateBufferSize = inflatedSize; - } else { - if(inflateBuffer) free(inflateBuffer); - inflateBuffer = malloc(inflatedSize); - inflateBufferSize = inflatedSize; - } - } - - address = inflateBuffer; - - LZ4_uncompress_unknownOutputSize(input, inflateBuffer, deflatedSize, inflateBufferSize); - - ll = *(int *)address; - longs = (*env)->NewLongArray(env, ll); - (*env)->SetLongArrayRegion(env, longs, 0, ll, (const jlong *)(address + 4)); - (*env)->SetObjectArrayElement(env, arrays, 0, longs); - - address += 4 + 8 * ll; - - il = *(int *)address; - ints = (*env)->NewIntArray(env, il); - (*env)->SetIntArrayRegion(env, ints, 0, il, (const jint *)(address + 4)); - (*env)->SetObjectArrayElement(env, arrays, 1, ints); - - address += 4 * il + 4; - - bl = *(int *)address; - bytes = (*env)->NewByteArray(env, bl); - (*env)->SetByteArrayRegion(env, bytes, 0, bl, (const jbyte *)(address + 4)); - (*env)->SetObjectArrayElement(env, arrays, 2, bytes); - - return 0; - -} diff --git a/bundles/org.simantics.fastlz/native/lz4.c b/bundles/org.simantics.fastlz/native/lz4.c deleted file mode 100644 index 06e282970..000000000 --- a/bundles/org.simantics.fastlz/native/lz4.c +++ /dev/null @@ -1,819 +0,0 @@ -/* - LZ4 - Fast LZ compression algorithm - Copyright (C) 2011-2012, Yann Collet. - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html - - LZ4 source repository : http://code.google.com/p/lz4/ -*/ - -//************************************** -// Tuning parameters -//************************************** -// COMPRESSIONLEVEL : -// Increasing this value improves compression ratio -// Lowering this value reduces memory usage -// Reduced memory usage typically improves speed, due to cache effect (ex : L1 32KB for Intel, L1 64KB for AMD) -// Memory usage formula : N->2^(N+2) Bytes (examples : 12 -> 16KB ; 17 -> 512KB) -#define COMPRESSIONLEVEL 12 - -// NOTCOMPRESSIBLE_CONFIRMATION : -// Decreasing this value will make the algorithm skip faster data segments considered "incompressible" -// This may decrease compression ratio dramatically, but will be faster on incompressible data -// Increasing this value will make the algorithm search more before declaring a segment "incompressible" -// This could improve compression a bit, but will be slower on incompressible data -// The default value (6) is recommended -#define NOTCOMPRESSIBLE_CONFIRMATION 6 - -// LZ4_COMPRESSMIN : -// Compression function will *fail* if it is not successful at compressing input by at least LZ4_COMPRESSMIN bytes -// Since the compression function stops working prematurely, it results in a speed gain -// The output however is unusable. Compression function result will be zero. -// Default : 0 = disabled -#define LZ4_COMPRESSMIN 0 - -// BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE : -// This will provide a boost to performance for big endian cpu, but the resulting compressed stream will be incompatible with little-endian CPU. -// You can set this option to 1 in situations where data will stay within closed environment -// This option is useless on Little_Endian CPU (such as x86) -//#define BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE 1 - - - -//************************************** -// CPU Feature Detection -//************************************** -// 32 or 64 bits ? -#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || defined(__LP64__) || defined(_LP64) ) // Detects 64 bits mode -# define LZ4_ARCH64 1 -#else -# define LZ4_ARCH64 0 -#endif - -// Little Endian or Big Endian ? -// Note : overwrite the below #define if you know your architecture endianess -#if (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(_ARCH_PPC) || defined(__PPC__) || defined(__PPC) || defined(PPC) || defined(__powerpc__) || defined(__powerpc) || defined(powerpc) || ((defined(__BYTE_ORDER__)&&(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))) ) -# define LZ4_BIG_ENDIAN 1 -#else -// Little Endian assumed. PDP Endian and other very rare endian format are unsupported. -#endif - -// Unaligned memory access is automatically enabled for "common" CPU, such as x86. -// For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected -// If you know your target CPU supports unaligned memory access, you may want to force this option manually to improve performance -#if defined(__ARM_FEATURE_UNALIGNED) -# define LZ4_FORCE_UNALIGNED_ACCESS 1 -#endif - -// Define this parameter if your target system or compiler does not support hardware bit count -#if defined(_MSC_VER) && defined(_WIN32_WCE) // Visual Studio for Windows CE does not support Hardware bit count -# define LZ4_FORCE_SW_BITCOUNT -#endif - - -//************************************** -// Compiler Options -//************************************** -#if __STDC_VERSION__ >= 199901L // C99 -/* "restrict" is a known keyword */ -#else -# define restrict // Disable restrict -#endif - -#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) - -#ifdef _MSC_VER // Visual Studio -# define inline __forceinline // Visual is not C99, but supports some kind of inline -# if LZ4_ARCH64 // 64-bit -# pragma intrinsic(_BitScanForward64) // For Visual 2005 -# pragma intrinsic(_BitScanReverse64) // For Visual 2005 -# else -# pragma intrinsic(_BitScanForward) // For Visual 2005 -# pragma intrinsic(_BitScanReverse) // For Visual 2005 -# endif -#endif - -#ifdef _MSC_VER -# define lz4_bswap16(x) _byteswap_ushort(x) -#else -# define lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) -#endif - -#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__) -# define expect(expr,value) (__builtin_expect ((expr),(value)) ) -#else -# define expect(expr,value) (expr) -#endif - -#define likely(expr) expect((expr) != 0, 1) -#define unlikely(expr) expect((expr) != 0, 0) - - -//************************************** -// Includes -//************************************** -#include // for malloc -#include // for memset -#include "lz4.h" - - -//************************************** -// Basic Types -//************************************** -#if defined(_MSC_VER) // Visual Studio does not support 'stdint' natively -# define BYTE unsigned __int8 -# define U16 unsigned __int16 -# define U32 unsigned __int32 -# define S32 __int32 -# define U64 unsigned __int64 -#else -# include -# define BYTE uint8_t -# define U16 uint16_t -# define U32 uint32_t -# define S32 int32_t -# define U64 uint64_t -#endif - -#ifndef LZ4_FORCE_UNALIGNED_ACCESS -# pragma pack(push, 1) -#endif - -typedef struct _U16_S { U16 v; } U16_S; -typedef struct _U32_S { U32 v; } U32_S; -typedef struct _U64_S { U64 v; } U64_S; - -#ifndef LZ4_FORCE_UNALIGNED_ACCESS -# pragma pack(pop) -#endif - -#define A64(x) (((U64_S *)(x))->v) -#define A32(x) (((U32_S *)(x))->v) -#define A16(x) (((U16_S *)(x))->v) - - -//************************************** -// Constants -//************************************** -#define MINMATCH 4 - -#define HASH_LOG COMPRESSIONLEVEL -#define HASHTABLESIZE (1 << HASH_LOG) -#define HASH_MASK (HASHTABLESIZE - 1) - -#define SKIPSTRENGTH (NOTCOMPRESSIBLE_CONFIRMATION>2?NOTCOMPRESSIBLE_CONFIRMATION:2) -#define STACKLIMIT 13 -#define HEAPMODE (HASH_LOG>STACKLIMIT) // Defines if memory is allocated into the stack (local variable), or into the heap (malloc()). -#define COPYLENGTH 8 -#define LASTLITERALS 5 -#define MFLIMIT (COPYLENGTH+MINMATCH) -#define MINLENGTH (MFLIMIT+1) - -#define MAXD_LOG 16 -#define MAX_DISTANCE ((1 << MAXD_LOG) - 1) - -#define ML_BITS 4 -#define ML_MASK ((1U<> ((MINMATCH*8)-HASH_LOG)) -#define LZ4_HASH_VALUE(p) LZ4_HASH_FUNCTION(A32(p)) -#define LZ4_WILDCOPY(s,d,e) do { LZ4_COPYPACKET(s,d) } while (d>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_clzll(val) >> 3); - #else - int r; - if (!(val>>32)) { r=4; } else { r=0; val>>=32; } - if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; } - r += (!val); - return r; - #endif -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanForward64( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_ctzll(val) >> 3); - #else - static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 }; - return DeBruijnBytePos[((U64)((val & -val) * 0x0218A392CDABBD3F)) >> 58]; - #endif -#endif -} - -#else - -inline static int LZ4_NbCommonBytes (register U32 val) -{ -#if defined(LZ4_BIG_ENDIAN) - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanReverse( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_clz(val) >> 3); - #else - int r; - if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; } - r += (!val); - return r; - #endif -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanForward( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_ctz(val) >> 3); - #else - static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 }; - return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27]; - #endif -#endif -} - -#endif - - -//**************************** -// Public functions -//**************************** - -int LZ4_compressBound(int isize) -{ - return (isize + (isize/255) + 16); -} - - - -//****************************** -// Compression functions -//****************************** - -int LZ4_compressCtx(void** ctx, - const char* source, - char* dest, - int isize) -{ -#if HEAPMODE - struct refTables *srt = (struct refTables *) (*ctx); - HTYPE* HashTable; -#else - HTYPE HashTable[HASHTABLESIZE] = {0}; -#endif - - const BYTE* ip = (BYTE*) source; - INITBASE(base); - const BYTE* anchor = ip; - const BYTE* const iend = ip + isize; - const BYTE* const mflimit = iend - MFLIMIT; -#define matchlimit (iend - LASTLITERALS) - - BYTE* op = (BYTE*) dest; - - int len, length; - const int skipStrength = SKIPSTRENGTH; - U32 forwardH; - - - // Init - if (isizehashTable); - memset((void*)HashTable, 0, sizeof(srt->hashTable)); -#else - (void) ctx; -#endif - - - // First Byte - HashTable[LZ4_HASH_VALUE(ip)] = ip - base; - ip++; forwardH = LZ4_HASH_VALUE(ip); - - // Main Loop - for ( ; ; ) - { - int findMatchAttempts = (1U << skipStrength) + 3; - const BYTE* forwardIp = ip; - const BYTE* ref; - BYTE* token; - - // Find a match - do { - U32 h = forwardH; - int step = findMatchAttempts++ >> skipStrength; - ip = forwardIp; - forwardIp = ip + step; - - if unlikely(forwardIp > mflimit) { goto _last_literals; } - - forwardH = LZ4_HASH_VALUE(forwardIp); - ref = base + HashTable[h]; - HashTable[h] = ip - base; - - } while ((ref < ip - MAX_DISTANCE) || (A32(ref) != A32(ip))); - - // Catch up - while ((ip>anchor) && (ref>(BYTE*)source) && unlikely(ip[-1]==ref[-1])) { ip--; ref--; } - - // Encode Literal length - length = ip - anchor; - token = op++; - if (length>=(int)RUN_MASK) { *token=(RUN_MASK< 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; } - else *token = (length<=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; } - else *token += len; - - // Test end of chunk - if (ip > mflimit) { anchor = ip; break; } - - // Fill table - HashTable[LZ4_HASH_VALUE(ip-2)] = ip - 2 - base; - - // Test next position - ref = base + HashTable[LZ4_HASH_VALUE(ip)]; - HashTable[LZ4_HASH_VALUE(ip)] = ip - base; - if ((ref > ip - (MAX_DISTANCE + 1)) && (A32(ref) == A32(ip))) { token = op++; *token=0; goto _next_match; } - - // Prepare next loop - anchor = ip++; - forwardH = LZ4_HASH_VALUE(ip); - } - -_last_literals: - // Encode Last Literals - { - int lastRun = iend - anchor; - if ((LZ4_COMPRESSMIN>0) && (((op - (BYTE*)dest) + lastRun + 1 + ((lastRun-15)/255)) > isize - LZ4_COMPRESSMIN)) return 0; - if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun<> ((MINMATCH*8)-HASHLOG64K)) -#define LZ4_HASH64K_VALUE(p) LZ4_HASH64K_FUNCTION(A32(p)) -int LZ4_compress64kCtx(void** ctx, - const char* source, - char* dest, - int isize) -{ -#if HEAPMODE - struct refTables *srt = (struct refTables *) (*ctx); - U16* HashTable; -#else - U16 HashTable[HASH64KTABLESIZE] = {0}; -#endif - - const BYTE* ip = (BYTE*) source; - const BYTE* anchor = ip; - const BYTE* const base = ip; - const BYTE* const iend = ip + isize; - const BYTE* const mflimit = iend - MFLIMIT; -#define matchlimit (iend - LASTLITERALS) - - BYTE* op = (BYTE*) dest; - - int len, length; - const int skipStrength = SKIPSTRENGTH; - U32 forwardH; - - - // Init - if (isizehashTable); - memset((void*)HashTable, 0, sizeof(srt->hashTable)); -#else - (void) ctx; -#endif - - - // First Byte - ip++; forwardH = LZ4_HASH64K_VALUE(ip); - - // Main Loop - for ( ; ; ) - { - int findMatchAttempts = (1U << skipStrength) + 3; - const BYTE* forwardIp = ip; - const BYTE* ref; - BYTE* token; - - // Find a match - do { - U32 h = forwardH; - int step = findMatchAttempts++ >> skipStrength; - ip = forwardIp; - forwardIp = ip + step; - - if (forwardIp > mflimit) { goto _last_literals; } - - forwardH = LZ4_HASH64K_VALUE(forwardIp); - ref = base + HashTable[h]; - HashTable[h] = ip - base; - - } while (A32(ref) != A32(ip)); - - // Catch up - while ((ip>anchor) && (ref>(BYTE*)source) && (ip[-1]==ref[-1])) { ip--; ref--; } - - // Encode Literal length - length = ip - anchor; - token = op++; - if (length>=(int)RUN_MASK) { *token=(RUN_MASK< 254 ; len-=255) *op++ = 255; *op++ = (BYTE)len; } - else *token = (length<=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *op++ = 255; *op++ = 255; } if (len > 254) { len-=255; *op++ = 255; } *op++ = (BYTE)len; } - else *token += len; - - // Test end of chunk - if (ip > mflimit) { anchor = ip; break; } - - // Fill table - HashTable[LZ4_HASH64K_VALUE(ip-2)] = ip - 2 - base; - - // Test next position - ref = base + HashTable[LZ4_HASH64K_VALUE(ip)]; - HashTable[LZ4_HASH64K_VALUE(ip)] = ip - base; - if (A32(ref) == A32(ip)) { token = op++; *token=0; goto _next_match; } - - // Prepare next loop - anchor = ip++; - forwardH = LZ4_HASH64K_VALUE(ip); - } - -_last_literals: - // Encode Last Literals - { - int lastRun = iend - anchor; - if ((LZ4_COMPRESSMIN>0) && (((op - (BYTE*)dest) + lastRun + 1 + ((lastRun-15)/255)) > isize - LZ4_COMPRESSMIN)) return 0; - if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun<>ML_BITS)) == RUN_MASK) { for (;(len=*ip++)==255;length+=255){} length += len; } - - // copy literals - cpy = op+length; - if unlikely(cpy>oend-COPYLENGTH) - { - if (cpy > oend) goto _output_error; // Error : request to write beyond destination buffer - memcpy(op, ip, length); - ip += length; - break; // Necessarily EOF - } - LZ4_WILDCOPY(ip, op, cpy); ip -= (op-cpy); op = cpy; - - // get offset - LZ4_READ_LITTLEENDIAN_16(ref,cpy,ip); ip+=2; - if (ref < (BYTE* const)dest) goto _output_error; // Error : offset create reference outside destination buffer - - // get matchlength - if ((length=(token&ML_MASK)) == ML_MASK) { for (;*ip==255;length+=255) {ip++;} length += *ip++; } - - // copy repeated sequence - if unlikely(op-refoend-COPYLENGTH) - { - if (cpy > oend) goto _output_error; // Error : request to write beyond destination buffer - LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH)); - while(op>ML_BITS)) == RUN_MASK) { int s=255; while ((ipoend-COPYLENGTH) || (ip+length>iend-COPYLENGTH)) - { - if (cpy > oend) goto _output_error; // Error : request to write beyond destination buffer - if (ip+length > iend) goto _output_error; // Error : request to read beyond source buffer - memcpy(op, ip, length); - op += length; - ip += length; - if (ipoend-COPYLENGTH) - { - if (cpy > oend) goto _output_error; // Error : request to write outside of destination buffer - LZ4_SECURECOPY(ref, op, (oend-COPYLENGTH)); - while(op= 255 -- 10 : (=280 - 15 - 255) ) remaining length to reach 280 - -Example 3 : A length of 15 will be represented as : -- 15 : value for the 4-bits High field -- 0 : (=15-15) yes, the zero must be output - -Following the token and optional length bytes, are the literals themselves. -They are exactly as numerous as previously decoded (length of literals). -It's possible that there are zero literal. - - -Following the literals is the match copy operation. - -It starts by the offset. -This is a 2 bytes value, in little endian format : -the lower byte is the first one in the stream. - -The offset represents the position of the match to be copied from. -1 means "current position - 1 byte". -The maximum offset value is 65535, 65536 cannot be coded. -Note that 0 is an invalid value, not used. - -Then we need to extract the match length. -For this, we use the second token field, the low 4-bits. -Value, obviously, ranges from 0 to 15. -However here, 0 means that the copy operation will be minimal. -The minimum length of a match, called minmatch, is 4. -As a consequence, a 0 value means 4 bytes, and a value of 15 means 19+ bytes. -Similar to literal length, on reaching the highest possible value (15), -we output additional bytes, one at a time, with values ranging from 0 to 255. -They are added to total to provide the final match length. -A 255 value means there is another byte to read and add. -There is no limit to the number of optional bytes that can be output this way. -(This points towards a maximum achievable compression ratio of ~250). - -With the offset and the matchlength, -the decoder can now proceed to copy the data from the already decoded buffer. -On decoding the matchlength, we reach the end of the compressed sequence, -and therefore start another one. - - --- Parsing restrictions -- - -There are specific parsing rules to respect in order to remain compatible -with assumptions made by the decoder : -1) The last 5 bytes are always literals -2) The last match must start at least 12 bytes before end of stream -Consequently, a file with less than 13 bytes cannot be compressed. -These rules are in place to ensure that the decoder -will never read beyond the input buffer, nor write beyond the output buffer. - -Note that the last sequence is also incomplete, -and stops right after literals. - - --- Additional notes -- - -There is no assumption nor limits to the way the compressor -searches and selects matches within the source stream. -It could be a fast scan, a multi-probe, a full search using BST, -standard hash chains or MMC, well whatever. - -Advanced parsing strategies can also be implemented, such as lazy match, -or full optimal parsing. - -All these trade-off offer distinctive speed/memory/compression advantages. -Whatever the method used by the compressor, its result will be decodable -by any LZ4 decoder if it follows the format specification described above. - diff --git a/bundles/org.simantics.fastlz/native/lz4hc.c b/bundles/org.simantics.fastlz/native/lz4hc.c deleted file mode 100644 index cca755c26..000000000 --- a/bundles/org.simantics.fastlz/native/lz4hc.c +++ /dev/null @@ -1,663 +0,0 @@ -/* - LZ4 HC - High Compression Mode of LZ4 - Copyright (C) 2011-2012, Yann Collet. - BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following disclaimer - in the documentation and/or other materials provided with the - distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - You can contact the author at : - - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html - - LZ4 source repository : http://code.google.com/p/lz4/ -*/ - - -//************************************** -// CPU Feature Detection -//************************************** -// 32 or 64 bits ? -#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || defined(__LP64__) || defined(_LP64) ) // Detects 64 bits mode -#define LZ4_ARCH64 1 -#else -#define LZ4_ARCH64 0 -#endif - -// Little Endian or Big Endian ? -#if (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(_ARCH_PPC) || defined(__PPC__) || defined(__PPC) || defined(PPC) || defined(__powerpc__) || defined(__powerpc) || defined(powerpc) || ((defined(__BYTE_ORDER__)&&(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))) ) -#define LZ4_BIG_ENDIAN 1 -#else -// Little Endian assumed. PDP Endian and other very rare endian format are unsupported. -#endif - -// Unaligned memory access is automatically enabled for "common" CPU, such as x86. -// For others CPU, the compiler will be more cautious, and insert extra code to ensure aligned access is respected -// If you know your target CPU supports unaligned memory access, you may want to force this option manually to improve performance -#if defined(__ARM_FEATURE_UNALIGNED) -#define LZ4_FORCE_UNALIGNED_ACCESS 1 -#endif - - -//************************************** -// Compiler Options -//************************************** -#if __STDC_VERSION__ >= 199901L // C99 - /* "restrict" is a known keyword */ -#else -#define restrict // Disable restrict -#endif - -#ifdef _MSC_VER -#define inline __forceinline // Visual is not C99, but supports some kind of inline -#endif - -#ifdef _MSC_VER // Visual Studio -#define bswap16(x) _byteswap_ushort(x) -#else -#define bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) -#endif - - -//************************************** -// Includes -//************************************** -#include // calloc, free -#include // memset, memcpy -#include "lz4hc.h" - -#define ALLOCATOR(s) calloc(1,s) -#define FREEMEM free -#define MEM_INIT memset - - -//************************************** -// Basic Types -//************************************** -#if defined(_MSC_VER) // Visual Studio does not support 'stdint' natively -#define BYTE unsigned __int8 -#define U16 unsigned __int16 -#define U32 unsigned __int32 -#define S32 __int32 -#define U64 unsigned __int64 -#else -#include -#define BYTE uint8_t -#define U16 uint16_t -#define U32 uint32_t -#define S32 int32_t -#define U64 uint64_t -#endif - -#ifndef LZ4_FORCE_UNALIGNED_ACCESS -#pragma pack(push, 1) -#endif - -typedef struct _U16_S { U16 v; } U16_S; -typedef struct _U32_S { U32 v; } U32_S; -typedef struct _U64_S { U64 v; } U64_S; - -#ifndef LZ4_FORCE_UNALIGNED_ACCESS -#pragma pack(pop) -#endif - -#define A64(x) (((U64_S *)(x))->v) -#define A32(x) (((U32_S *)(x))->v) -#define A16(x) (((U16_S *)(x))->v) - - -//************************************** -// Constants -//************************************** -#define MINMATCH 4 - -#define DICTIONARY_LOGSIZE 16 -#define MAXD (1<> ((MINMATCH*8)-HASH_LOG)) -#define HASH_VALUE(p) HASH_FUNCTION(*(U32*)(p)) -#define HASH_POINTER(p) (HashTable[HASH_VALUE(p)] + base) -#define DELTANEXT(p) chainTable[(size_t)(p) & MAXD_MASK] -#define GETNEXT(p) ((p) - (size_t)DELTANEXT(p)) -#define ADD_HASH(p) { size_t delta = (p) - HASH_POINTER(p); if (delta>MAX_DISTANCE) delta = MAX_DISTANCE; DELTANEXT(p) = (U16)delta; HashTable[HASH_VALUE(p)] = (p) - base; } - - -//************************************** -// Private functions -//************************************** -#if LZ4_ARCH64 - -inline static int LZ4_NbCommonBytes (register U64 val) -{ -#if defined(LZ4_BIG_ENDIAN) - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanReverse64( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_clzll(val) >> 3); - #else - int r; - if (!(val>>32)) { r=4; } else { r=0; val>>=32; } - if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; } - r += (!val); - return r; - #endif -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanForward64( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_ctzll(val) >> 3); - #else - static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 }; - return DeBruijnBytePos[((U64)((val & -val) * 0x0218A392CDABBD3F)) >> 58]; - #endif -#endif -} - -#else - -inline static int LZ4_NbCommonBytes (register U32 val) -{ -#if defined(LZ4_BIG_ENDIAN) - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanReverse( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_clz(val) >> 3); - #else - int r; - if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; } - r += (!val); - return r; - #endif -#else - #if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT) - unsigned long r = 0; - _BitScanForward( &r, val ); - return (int)(r>>3); - #elif defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT) - return (__builtin_ctz(val) >> 3); - #else - static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 }; - return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27]; - #endif -#endif -} - -#endif - - -inline static int LZ4HC_Init (LZ4HC_Data_Structure* hc4, const BYTE* base) -{ - MEM_INIT((void*)hc4->hashTable, 0, sizeof(hc4->hashTable)); - MEM_INIT(hc4->chainTable, 0xFF, sizeof(hc4->chainTable)); - hc4->nextToUpdate = base + LZ4_ARCH64; - hc4->base = base; - return 1; -} - - -inline static void* LZ4HC_Create (const BYTE* base) -{ - void* hc4 = ALLOCATOR(sizeof(LZ4HC_Data_Structure)); - - LZ4HC_Init (hc4, base); - return hc4; -} - - -inline static int LZ4HC_Free (void** LZ4HC_Data) -{ - FREEMEM(*LZ4HC_Data); - *LZ4HC_Data = NULL; - return (1); -} - - -inline static void LZ4HC_Insert (LZ4HC_Data_Structure* hc4, const BYTE* ip) -{ - U16* chainTable = hc4->chainTable; - HTYPE* HashTable = hc4->hashTable; - INITBASE(base,hc4->base); - - while(hc4->nextToUpdate < ip) - { - ADD_HASH(hc4->nextToUpdate); - hc4->nextToUpdate++; - } -} - - -inline static int LZ4HC_InsertAndFindBestMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* const matchlimit, const BYTE** matchpos) -{ - U16* const chainTable = hc4->chainTable; - HTYPE* const HashTable = hc4->hashTable; - const BYTE* ref; - INITBASE(base,hc4->base); - int nbAttempts=MAX_NB_ATTEMPTS; - int ml=0; - - // HC4 match finder - LZ4HC_Insert(hc4, ip); - ref = HASH_POINTER(ip); - while ((ref > (ip-MAX_DISTANCE)) && (nbAttempts)) - { - nbAttempts--; - if (*(ref+ml) == *(ip+ml)) - if (*(U32*)ref == *(U32*)ip) - { - const BYTE* reft = ref+MINMATCH; - const BYTE* ipt = ip+MINMATCH; - - while (ipt ml) { ml = ipt-ip; *matchpos = ref; } - } - ref = GETNEXT(ref); - } - - return ml; -} - - -inline static int LZ4HC_InsertAndGetWiderMatch (LZ4HC_Data_Structure* hc4, const BYTE* ip, const BYTE* startLimit, const BYTE* matchlimit, int longest, const BYTE** matchpos, const BYTE** startpos) -{ - U16* const chainTable = hc4->chainTable; - HTYPE* const HashTable = hc4->hashTable; - INITBASE(base,hc4->base); - const BYTE* ref; - int nbAttempts = MAX_NB_ATTEMPTS; - int delta = ip-startLimit; - - // First Match - LZ4HC_Insert(hc4, ip); - ref = HASH_POINTER(ip); - - while ((ref > ip-MAX_DISTANCE) && (ref >= hc4->base) && (nbAttempts)) - { - nbAttempts--; - if (*(startLimit + longest) == *(ref - delta + longest)) - if (*(U32*)ref == *(U32*)ip) - { - const BYTE* reft = ref+MINMATCH; - const BYTE* ipt = ip+MINMATCH; - const BYTE* startt = ip; - - while (iptstartLimit) && (reft > hc4->base) && (startt[-1] == reft[-1])) {startt--; reft--;} - - if ((ipt-startt) > longest) - { - longest = ipt-startt; - *matchpos = reft; - *startpos = startt; - } - } - ref = GETNEXT(ref); - } - - return longest; -} - - -inline static int LZ4_encodeSequence(const BYTE** ip, BYTE** op, const BYTE** anchor, int ml, const BYTE* ref) -{ - int length, len; - BYTE* token; - - // Encode Literal length - length = *ip - *anchor; - token = (*op)++; - if (length>=(int)RUN_MASK) { *token=(RUN_MASK< 254 ; len-=255) *(*op)++ = 255; *(*op)++ = (BYTE)len; } - else *token = (length<=(int)ML_MASK) { *token+=ML_MASK; len-=ML_MASK; for(; len > 509 ; len-=510) { *(*op)++ = 255; *(*op)++ = 255; } if (len > 254) { len-=255; *(*op)++ = 255; } *(*op)++ = (BYTE)len; } - else *token += len; - - // Prepare next loop - *ip += ml; - *anchor = *ip; - - return 0; -} - - -//**************************** -// Compression CODE -//**************************** - -int LZ4_compressHCCtx(LZ4HC_Data_Structure* ctx, - const char* source, - char* dest, - int isize) -{ - const BYTE* ip = (const BYTE*) source; - const BYTE* anchor = ip; - const BYTE* const iend = ip + isize; - const BYTE* const mflimit = iend - MFLIMIT; - const BYTE* const matchlimit = (iend - LASTLITERALS); - - BYTE* op = (BYTE*) dest; - - int ml, ml2, ml3, ml0; - const BYTE* ref=NULL; - const BYTE* start2=NULL; - const BYTE* ref2=NULL; - const BYTE* start3=NULL; - const BYTE* ref3=NULL; - const BYTE* start0; - const BYTE* ref0; - - ip++; - - // Main Loop - while (ip < mflimit) - { - ml = LZ4HC_InsertAndFindBestMatch (ctx, ip, matchlimit, (&ref)); - if (!ml) { ip++; continue; } - - // saved, in case we would skip too much - start0 = ip; - ref0 = ref; - ml0 = ml; - -_Search2: - if (ip+ml < mflimit) - ml2 = LZ4HC_InsertAndGetWiderMatch(ctx, ip + ml - 2, ip + 1, matchlimit, ml, &ref2, &start2); - else ml2=ml; - - if (ml2 == ml) // No better match - { - LZ4_encodeSequence(&ip, &op, &anchor, ml, ref); - continue; - } - - if (start0 < ip) - { - if (start2 < ip + ml0) // empirical - { - ip = start0; - ref = ref0; - ml = ml0; - } - } - - // Here, start0==ip - if ((start2 - ip) < 3) // First Match too small : removed - { - ml = ml2; - ip = start2; - ref =ref2; - goto _Search2; - } - -_Search3: - // Currently we have : - // ml2 > ml1, and - // ip1+3 <= ip2 (usually < ip1+ml1) - if ((start2 - ip) < OPTIMAL_ML) - { - int correction; - int new_ml = ml; - if (new_ml > OPTIMAL_ML) new_ml = OPTIMAL_ML; - if (ip+new_ml > start2 + ml2 - MINMATCH) new_ml = start2 - ip + ml2 - MINMATCH; - correction = new_ml - (start2 - ip); - if (correction > 0) - { - start2 += correction; - ref2 += correction; - ml2 -= correction; - } - } - // Now, we have start2 = ip+new_ml, with new_ml=min(ml, OPTIMAL_ML=18) - - if (start2 + ml2 < mflimit) - ml3 = LZ4HC_InsertAndGetWiderMatch(ctx, start2 + ml2 - 3, start2, matchlimit, ml2, &ref3, &start3); - else ml3=ml2; - - if (ml3 == ml2) // No better match : 2 sequences to encode - { - // ip & ref are known; Now for ml - if (start2 < ip+ml) - { - if ((start2 - ip) < OPTIMAL_ML) - { - int correction; - if (ml > OPTIMAL_ML) ml = OPTIMAL_ML; - if (ip+ml > start2 + ml2 - MINMATCH) ml = start2 - ip + ml2 - MINMATCH; - correction = ml - (start2 - ip); - if (correction > 0) - { - start2 += correction; - ref2 += correction; - ml2 -= correction; - } - } - else - { - ml = start2 - ip; - } - } - // Now, encode 2 sequences - LZ4_encodeSequence(&ip, &op, &anchor, ml, ref); - ip = start2; - LZ4_encodeSequence(&ip, &op, &anchor, ml2, ref2); - continue; - } - - if (start3 < ip+ml+3) // Not enough space for match 2 : remove it - { - if (start3 >= (ip+ml)) // can write Seq1 immediately ==> Seq2 is removed, so Seq3 becomes Seq1 - { - if (start2 < ip+ml) - { - int correction = (ip+ml) - start2; - start2 += correction; - ref2 += correction; - ml2 -= correction; - if (ml2 < MINMATCH) - { - start2 = start3; - ref2 = ref3; - ml2 = ml3; - } - } - - LZ4_encodeSequence(&ip, &op, &anchor, ml, ref); - ip = start3; - ref = ref3; - ml = ml3; - - start0 = start2; - ref0 = ref2; - ml0 = ml2; - goto _Search2; - } - - start2 = start3; - ref2 = ref3; - ml2 = ml3; - goto _Search3; - } - - // OK, now we have 3 ascending matches; let's write at least the first one - // ip & ref are known; Now for ml - if (start2 < ip+ml) - { - if ((start2 - ip) < (int)ML_MASK) - { - int correction; - if (ml > OPTIMAL_ML) ml = OPTIMAL_ML; - if (ip + ml > start2 + ml2 - MINMATCH) ml = start2 - ip + ml2 - MINMATCH; - correction = ml - (start2 - ip); - if (correction > 0) - { - start2 += correction; - ref2 += correction; - ml2 -= correction; - } - } - else - { - ml = start2 - ip; - } - } - LZ4_encodeSequence(&ip, &op, &anchor, ml, ref); - - ip = start2; - ref = ref2; - ml = ml2; - - start2 = start3; - ref2 = ref3; - ml2 = ml3; - - goto _Search3; - - } - - // Encode Last Literals - { - int lastRun = iend - anchor; - if (lastRun>=(int)RUN_MASK) { *op++=(RUN_MASK< 254 ; lastRun-=255) *op++ = 255; *op++ = (BYTE) lastRun; } - else *op++ = (lastRun< + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2C249AD2-A0AE-4A88-8DCD-71F96133690E} + fastlz + Win32Proj + + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + true + v110 + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + Disabled + $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FASTLZ_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + copy "$(TargetPath)" "$(ProjectDir)..\..\src\fastlz-windows-x86.dll" + + + + + X64 + + + Disabled + $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FASTLZ_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + copy "$(TargetPath)" "$(ProjectDir)..\..\src\fastlz-windows-x86_64.dll" + + + + + MaxSpeed + true + $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FASTLZ_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + copy "$(TargetPath)" "$(ProjectDir)..\..\src\fastlz-windows-x86.dll" + + + + + X64 + + + MaxSpeed + true + $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FASTLZ_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + copy "$(TargetPath)" "$(ProjectDir)..\..\src\fastlz-windows-x86_64.dll" + + + + + + + + + + + + + \ No newline at end of file diff --git a/bundles/org.simantics.fastlz/native/vs2012/fastlz.vcxproj.filters b/bundles/org.simantics.fastlz/native/vs2012/fastlz.vcxproj.filters new file mode 100644 index 000000000..114e17494 --- /dev/null +++ b/bundles/org.simantics.fastlz/native/vs2012/fastlz.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/bundles/org.simantics.fastlz/src/libfastlz-darwin-x86_64.jnilib b/bundles/org.simantics.fastlz/src/libfastlz-darwin-x86_64.dylib similarity index 100% rename from bundles/org.simantics.fastlz/src/libfastlz-darwin-x86_64.jnilib rename to bundles/org.simantics.fastlz/src/libfastlz-darwin-x86_64.dylib diff --git a/bundles/org.simantics.fastlz/src/org/simantics/fastlz/java/FastLZJavaInputStream.java b/bundles/org.simantics.fastlz/src/org/simantics/fastlz/java/FastLZJavaInputStream.java index d6ac30896..290990b8d 100644 --- a/bundles/org.simantics.fastlz/src/org/simantics/fastlz/java/FastLZJavaInputStream.java +++ b/bundles/org.simantics.fastlz/src/org/simantics/fastlz/java/FastLZJavaInputStream.java @@ -43,6 +43,11 @@ public class FastLZJavaInputStream extends DecompressingInputStream { super(stream, channel); } + @Override + protected ByteBuffer allocateBuffer(int capacity) { + return ByteBuffer.allocate(capacity); + } + @Override public void decompress(ByteBuffer compressed, int compressedOffset, int compressedSize, ByteBuffer uncompressed, int uncompressedOffset, int uncompressedSize) throws IOException { diff --git a/bundles/org.simantics.fastlz/testcases/org/simantics/fastlz/FastLZBasicTests.java b/bundles/org.simantics.fastlz/testcases/org/simantics/fastlz/FastLZBasicTests.java index 177c8d1db..572ee1189 100644 --- a/bundles/org.simantics.fastlz/testcases/org/simantics/fastlz/FastLZBasicTests.java +++ b/bundles/org.simantics.fastlz/testcases/org/simantics/fastlz/FastLZBasicTests.java @@ -60,7 +60,6 @@ public class FastLZBasicTests { @Test public void validateCompress() throws IOException { validateCompress(testData1); - validateCompress(new File("grades.snp")); } private void validateCompress(File testData) throws IOException { -- 2.43.2 From b1fff5648205460ad11831d2a59860ee2c28e403 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 13 Sep 2016 11:21:04 +0300 Subject: [PATCH 09/16] Added com.fasterxml.jackson.core.jackson-core version 2.8.2 to ext-deps refs #6683 Change-Id: I187c6edff7e58e26093a879b4f184c38f02ac663 --- releng/org.simantics.sdk.build.p2.site/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index 4e17e3765..361c0cdcd 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -304,6 +304,10 @@ net.java.dev.jna:jna-platform:4.2.2 true + + com.fasterxml.jackson.core:jackson-core:2.8.2 + true + -- 2.43.2 From 6e42888ea3ca3d4ec25a76fe9a4f78ddec64afe7 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 13 Sep 2016 12:42:51 +0300 Subject: [PATCH 10/16] Added org.simantics.fileimport{,ui} to bundles POM. This fixes the SDK build. refs #6475 --- bundles/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bundles/pom.xml b/bundles/pom.xml index da82d2e0c..54ab690db 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -107,6 +107,8 @@ org.simantics.export.core org.simantics.export.ui org.simantics.fastlz + org.simantics.fileimport + org.simantics.fileimport.ui org.simantics.g2d org.simantics.g2d.ontology org.simantics.graph -- 2.43.2 From e92590c7c623e152404240d7a876c5d0a63812ad Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 13 Sep 2016 13:14:40 +0300 Subject: [PATCH 11/16] Add missing external dependency plug-ins to SDK build platform. refs #6475 --- ...imantics.sdk.build.targetdefinition.target | 78 ++++++++++--------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 34bfa95c2..7d5f0d45c 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,5 +1,5 @@ - + @@ -75,9 +75,29 @@ - + + + + + + + + + + + + + + + + + + + + + + - @@ -85,26 +105,24 @@ + - + - - - @@ -112,40 +130,52 @@ + + - + + - + + + - - + + + + + + + + + @@ -153,34 +183,12 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - -- 2.43.2 From 96d71ed20fadb92442031fda2b9606cfd79a7071 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Tue, 13 Sep 2016 13:40:43 +0300 Subject: [PATCH 12/16] Add missing external dependency plug-ins to SDK build platform. refs #6475 --- .../org.simantics.sdk.build.targetdefinition-semantum.target | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target index 5e8b79969..0410ad6e2 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target @@ -1,5 +1,5 @@ - + @@ -145,6 +145,7 @@ + @@ -156,6 +157,7 @@ + -- 2.43.2 From 402384bf9afa895e925d9d2593a81e99ab99eab9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Tue, 13 Sep 2016 16:29:17 +0300 Subject: [PATCH 13/16] An initial implementation of Json module. Change-Id: I33668d8cfdcafd91f7f205a49d5660337f2f0c46 --- .../META-INF/MANIFEST.MF | 3 +- .../org.simantics.scl.data/scl/Data/Json.md | 42 ++ .../org.simantics.scl.data/scl/Data/Json.scl | 421 ++++++++++++++++++ .../scl/Data/Writer.scl | 18 + 4 files changed, 483 insertions(+), 1 deletion(-) create mode 100644 bundles/org.simantics.scl.data/scl/Data/Json.md create mode 100644 bundles/org.simantics.scl.data/scl/Data/Json.scl create mode 100644 bundles/org.simantics.scl.data/scl/Data/Writer.scl diff --git a/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF b/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF index 950e59b42..52095a101 100644 --- a/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.scl.data/META-INF/MANIFEST.MF @@ -7,5 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.simantics.scl.runtime;bundle-version="0.4.0", org.simantics.scl.osgi;bundle-version="1.0.4", org.jdom2;bundle-version="2.0.6", - org.junit;bundle-version="4.12.0";resolution:=optional + org.junit;bundle-version="4.12.0";resolution:=optional, + com.fasterxml.jackson.core.jackson-core;bundle-version="2.8.2" Bundle-ClassPath: . diff --git a/bundles/org.simantics.scl.data/scl/Data/Json.md b/bundles/org.simantics.scl.data/scl/Data/Json.md new file mode 100644 index 000000000..fe8e7218f --- /dev/null +++ b/bundles/org.simantics.scl.data/scl/Data/Json.md @@ -0,0 +1,42 @@ +# Basic functions + +::value[toJsonString, fromJsonString] + +# Supported value types + +This module supports the following value types: + +``` +instance Json String +instance Json Short +instance Json Integer +instance Json Long +instance Json Float +instance Json Double + +instance (Json a) => Json [a] +instance (Json a) => Json (Maybe a) + +instance Json () +instance (Json a, Json b) => Json (a, b) +instance (Json a, Json b, Json c) => Json (a, b, c) +instance (Json a, Json b, Json c, Json d) => Json (a, b, c, d) +instance (Json a, Json b, Json c, Json d, Json e) => Json (a, b, c, d, e) + +instance Json Json +``` + +# Generic JSON Type + +::data[Json, JsonField] + +# Adding support for additional value types + +::data[JsonGenerator, JsonParser] +::class[Json] + +It is enough to implement `toJson` and `fromJson`. + +# Undocumented entities + +::undocumented[] \ No newline at end of file diff --git a/bundles/org.simantics.scl.data/scl/Data/Json.scl b/bundles/org.simantics.scl.data/scl/Data/Json.scl new file mode 100644 index 000000000..fb034cd57 --- /dev/null +++ b/bundles/org.simantics.scl.data/scl/Data/Json.scl @@ -0,0 +1,421 @@ +import "StandardLibrary" +import "Data/Writer" +import "JavaBuiltin" as Java + +importJava "com.fasterxml.jackson.core.JsonGenerator" where + data JsonGenerator + +@private +importJava "com.fasterxml.jackson.core.JsonGenerator" where + writeNull :: JsonGenerator -> () + + writeStartArray :: JsonGenerator -> () + @JavaName writeStartArray + writeStartArrayN :: JsonGenerator -> Integer -> () + writeEndArray :: JsonGenerator -> () + + writeStartObject :: JsonGenerator -> () + writeFieldName :: JsonGenerator -> String -> () + writeEndObject :: JsonGenerator -> () + + writeBoolean :: JsonGenerator -> Boolean -> () + + writeString :: JsonGenerator -> String -> () + + @JavaName writeNumber + writeNumberDouble :: JsonGenerator -> Double -> () + @JavaName writeNumber + writeNumberInteger :: JsonGenerator -> Integer -> () + @JavaName writeNumber + writeNumberLong :: JsonGenerator -> Long -> () + @JavaName writeNumber + writeNumberShort :: JsonGenerator -> Short -> () + @JavaName writeNumber + writeNumberFloat :: JsonGenerator -> Float -> () + + @JavaName close + closeGenerator :: JsonGenerator -> () + +@private +importJava "com.fasterxml.jackson.core.JsonToken" where + data JsonToken + END_ARRAY :: JsonToken + END_OBJECT :: JsonToken + FIELD_NAME :: JsonToken + NOT_AVAILABLE :: JsonToken + START_ARRAY :: JsonToken + START_OBJECT :: JsonToken + VALUE_EMBEDDED_OBJECT :: JsonToken + VALUE_FALSE :: JsonToken + VALUE_NULL :: JsonToken + VALUE_NUMBER_FLOAT :: JsonToken + VALUE_NUMBER_INT :: JsonToken + VALUE_STRING :: JsonToken + VALUE_TRUE :: JsonToken +instance Eq JsonToken where + (==) = Java.equals + +importJava "com.fasterxml.jackson.core.JsonParser" where + data JsonParser + +@private +importJava "com.fasterxml.jackson.core.JsonParser" where + nextToken :: JsonParser -> JsonToken + currentToken :: JsonParser -> JsonToken + getDoubleValue :: JsonParser -> Double + getIntValue :: JsonParser -> Integer + getText :: JsonParser -> String + getShortValue :: JsonParser -> Short + getFloatValue :: JsonParser -> Float + getLongValue :: JsonParser -> Long + nextFieldName :: JsonParser -> Maybe String + +@private +importJava "com.fasterxml.jackson.core.JsonFactory" where + data JsonFactory + + @JavaName "" + createJsonFactory :: JsonFactory + + @JavaName createGenerator + createWriterGenerator :: JsonFactory -> Writer -> JsonGenerator + + @JavaName createParser + createStringParser :: JsonFactory -> String -> JsonParser + +@private +defaultFactory = createJsonFactory + +@private +@inline +assertStartArray :: JsonParser -> () +assertStartArray p = if currentToken p == START_ARRAY + then () + else fail "Expected START_ARRAY token." + +@private +@inline +assertEndArray :: JsonParser -> () +assertEndArray p = if nextToken p == END_ARRAY + then () + else fail "Expected END_ARRAY token." + +// *** Json type class ******************************************************** + +class Json a where + writeJson :: JsonGenerator -> a -> () + readJson :: JsonParser -> a + toJson :: a -> Json + fromJson :: Json -> a + + writeJson g v = writeJson g (toJson v) + readJson p = fromJson (readJson p) + +@private +readNextJson :: Json a => JsonParser -> a +readNextJson p = do + nextToken p + readJson p + +""" +Converts the value to a string encoded with JSON +""" +toJsonString :: Json a => a -> String +toJsonString v = runProc do + writer = createStringWriter + generator = createWriterGenerator defaultFactory (toWriter writer) + writeJson generator v + closeGenerator generator + resultOfStringWriter writer + +""" +Parses a JSON encoded string into a value +""" +fromJsonString :: Json a => String -> a +fromJsonString str = runProc do + parser = createStringParser defaultFactory str + readNextJson parser + +instance Json String where + writeJson = writeString + readJson = getText + toJson = JsonString + fromJson (JsonString value) = value + +instance Json Boolean where + writeJson = writeBoolean + readJson p = + if currentToken p == VALUE_TRUE + then True + else False + toJson = JsonBoolean + fromJson (JsonBoolean value) = value + +instance Json Double where + writeJson = writeNumberDouble + readJson = getDoubleValue + toJson = JsonDouble + fromJson (JsonDouble value) = value + +instance Json Float where + writeJson = writeNumberFloat + readJson = getFloatValue + toJson = JsonDouble . toDouble + fromJson (JsonDouble value) = fromDouble value + +instance Json Integer where + writeJson = writeNumberInteger + readJson = getIntValue + toJson = JsonLong . fromInteger + fromJson (JsonLong value) = Java.l2i value + +instance Json Long where + writeJson = writeNumberLong + readJson = getLongValue + toJson = JsonLong + fromJson (JsonLong value) = value + +instance Json Short where + writeJson = writeNumberShort + readJson = getShortValue + toJson = JsonLong . Java.i2l . Java.s2i + fromJson (JsonLong value) = Java.i2s (Java.l2i value) + +instance (Json a) => Json (Maybe a) where + writeJson g (Just v) = writeJson g v + writeJson g Nothing = writeNull g + readJson p = + if currentToken p == VALUE_NULL + then Nothing + else Just (readJson p) + toJson (Just value) = toJson value + toJson Nothing = JsonNull + fromJson JsonNull = Nothing + fromJson json = Just (fromJson json) + +instance (Json a) => Json [a] where + writeJson g l = do + writeStartArray g + iter (writeJson g) l + writeEndArray g + readJson p = MList.freeze result + where + result = MList.create () + assertStartArray p + while (nextToken p != END_ARRAY) + (MList.add result $ readJson p) + toJson l = JsonArray (map toJson l) + fromJson (JsonArray l) = map fromJson l + +instance Json () where + writeJson g _ = do + writeStartArray g + writeEndArray g + readJson p = do + assertStartArray p + assertEndArray p + () + toJson _ = JsonArray [] + fromJson (JsonArray []) = () + +instance (Json a, Json b) => Json (a, b) where + writeJson g (a, b) = do + writeStartArray g + writeJson g a + writeJson g b + writeEndArray g + readJson p = (a, b) + where + assertStartArray p + a = readNextJson p + b = readNextJson p + assertEndArray p + toJson (a, b) = JsonArray [toJson a, toJson b] + fromJson (JsonArray [a, b]) = (fromJson a, fromJson b) + +instance (Json a, Json b, Json c) => Json (a, b, c) where + writeJson g (a, b, c) = do + writeStartArray g + writeJson g a + writeJson g b + writeJson g c + writeEndArray g + readJson p = (a, b, c) + where + assertStartArray p + a = readNextJson p + b = readNextJson p + c = readNextJson p + assertEndArray p + toJson (a, b, c) = JsonArray [toJson a, toJson b, toJson c] + fromJson (JsonArray [a, b, c]) = (fromJson a, fromJson b, fromJson c) + +instance (Json a, Json b, Json c, Json d) => Json (a, b, c, d) where + writeJson g (a, b, c, d) = do + writeStartArray g + writeJson g a + writeJson g b + writeJson g c + writeJson g d + writeEndArray g + readJson p = (a, b, c, d) + where + assertStartArray p + a = readNextJson p + b = readNextJson p + c = readNextJson p + d = readNextJson p + assertEndArray p + toJson (a, b, c, d) = JsonArray [toJson a, toJson b, toJson c, toJson d] + fromJson (JsonArray [a, b, c, d]) = (fromJson a, fromJson b, fromJson c, fromJson d) + +instance (Json a, Json b, Json c, Json d, Json e) => Json (a, b, c, d, e) where + writeJson g (a, b, c, d, e) = do + writeStartArray g + writeJson g a + writeJson g b + writeJson g c + writeJson g d + writeJson g e + writeEndArray g + readJson p = (a, b, c, d, e) + where + assertStartArray p + a = readNextJson p + b = readNextJson p + c = readNextJson p + d = readNextJson p + e = readNextJson p + assertEndArray p + toJson (a, b, c, d, e) = JsonArray [toJson a, toJson b, toJson c, toJson d, toJson e] + fromJson (JsonArray [a, b, c, d, e]) = (fromJson a, fromJson b, fromJson c, fromJson d, fromJson e) + +data Json = + JsonString String + | JsonDouble Double + | JsonLong Long + | JsonArray [Json] + | JsonBoolean Boolean + | JsonNull + | JsonObject [JsonField] +data JsonField = JsonField String Json + +deriving instance Show Json +deriving instance Eq Json +deriving instance Show JsonField +deriving instance Eq JsonField + +instance Json Json where + writeJson g (JsonString value) = writeString g value + writeJson g (JsonDouble value) = writeNumberDouble g value + writeJson g (JsonLong value) = writeNumberLong g value + writeJson g (JsonBoolean value) = writeBoolean g value + writeJson g JsonNull = writeNull g + writeJson g (JsonArray values) = do + writeStartArray g + iter (writeJson g) values + writeEndArray g + writeJson g (JsonObject fields) = do + writeStartObject g + iter (\(JsonField name value) -> do + writeFieldName g name + writeJson g value) fields + writeEndObject g + + readJson p = do + token = currentToken p + if token == VALUE_STRING + then JsonString (getText p) + else if token == VALUE_NUMBER_FLOAT + then JsonDouble (getDoubleValue p) + else if token == VALUE_NUMBER_INT + then JsonLong (getLongValue p) + else if token == VALUE_TRUE + then JsonBoolean True + else if token == VALUE_FALSE + then JsonBoolean False + else if token == VALUE_NULL + then JsonNull + else if token == START_ARRAY + then do + result = MList.create () + while (nextToken p != END_ARRAY) + (MList.add result $ readJson p) + JsonArray (MList.freeze result) + else if token == START_OBJECT + then do + result = MList.create () + readJsonObjectContents result p + JsonObject (MList.freeze result) + else fail "Unsupported token type." + toJson = id + fromJson = id + +@private +readJsonObjectContents :: MList.T JsonField -> JsonParser -> () +readJsonObjectContents result p = + match nextFieldName p with + Just name -> do + MList.add result $ JsonField name (readNextJson p) + readJsonObjectContents result p + Nothing -> () + +/* +@private +makeTypeEqual :: a -> a -> () +makeTypeEqual _ _ = () + +@private +testValue :: Json a => Show a => Eq a => a -> () +testValue v1 = do + v2 = toJsonString v1 + v3 = fromJsonString v2 + makeTypeEqual v1 v3 + print "\(v1) -> \(v2) -> \(v3)" + if v1 != v3 + then fail "Values differ" + else () + +testGenericJson :: String -> () +testGenericJson v1 = do + v2 = fromJsonString v1 :: Json + v3 = toJsonString v2 + print "\(v1) -> \(v2) -> \(v3)" + if v1 != v3 + then fail "Values differ" + else () + +testIt :: () +testIt = do + testValue "asd" + testValue True + testValue False + testValue (123 :: Short) + testValue (123 :: Integer) + testValue (123 :: Long) + testValue (123 :: Double) + testValue (123 :: Float) + testValue (Nothing :: Maybe String) + testValue (Just "asd") + testValue ["a", "b", "c"] + testValue [[],["a"],["b","c"]] + testValue () + testValue ("a", "b") + testValue ("a", "b", "c") + testValue ("a", "b", "c", "d") + testValue [Just "a", Nothing] + testValue [("a", "b"), ("c", "d")] + testValue (("a", "b"), ("c", "d")) + + testGenericJson "\"asd\"" + testGenericJson "123" + testGenericJson "123.0" + testGenericJson "true" + testGenericJson "false" + testGenericJson "null" + testGenericJson "[1,2,3]" + testGenericJson "[[1],[2,3],[]]" + testGenericJson "{}" + testGenericJson "{\"a\":123,\"b\":[]}" + testGenericJson "{\"a\":{}}" +*/ \ No newline at end of file diff --git a/bundles/org.simantics.scl.data/scl/Data/Writer.scl b/bundles/org.simantics.scl.data/scl/Data/Writer.scl new file mode 100644 index 000000000..4c526f2c1 --- /dev/null +++ b/bundles/org.simantics.scl.data/scl/Data/Writer.scl @@ -0,0 +1,18 @@ +import "JavaBuiltin" as Java + +importJava "java.io.Writer" where + data Writer + +importJava "java.io.StringWriter" where + data StringWriter + + @JavaName "" + createStringWriter :: StringWriter + + @JavaName toString + resultOfStringWriter :: StringWriter -> String + +class WriterLike a where + toWriter :: a -> Writer +instance WriterLike StringWriter where + toWriter = Java.unsafeCoerce \ No newline at end of file -- 2.43.2 From 2e00706ab0e92835dde7044c43ae569bdce8a074 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Tue, 13 Sep 2016 16:46:56 +0300 Subject: [PATCH 14/16] Removed standard xml packages from apache and import them from elsewhere Change-Id: I9499e63a4905bea38461d9ead48dcea68ea6f77b --- bundles/org.apache.batik/.classpath | 2 - bundles/org.apache.batik/META-INF/MANIFEST.MF | 62 +++++++++---------- bundles/org.apache.batik/build.properties | 2 - 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/bundles/org.apache.batik/.classpath b/bundles/org.apache.batik/.classpath index 4a8d60f3c..93684ddba 100644 --- a/bundles/org.apache.batik/.classpath +++ b/bundles/org.apache.batik/.classpath @@ -11,8 +11,6 @@ - - diff --git a/bundles/org.apache.batik/META-INF/MANIFEST.MF b/bundles/org.apache.batik/META-INF/MANIFEST.MF index aebf12801..b8a5093e8 100644 --- a/bundles/org.apache.batik/META-INF/MANIFEST.MF +++ b/bundles/org.apache.batik/META-INF/MANIFEST.MF @@ -9,16 +9,6 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: java_cup.runtime, - javax.xml, - javax.xml.datatype, - javax.xml.namespace, - javax.xml.parsers, - javax.xml.transform, - javax.xml.transform.dom, - javax.xml.transform.sax, - javax.xml.transform.stream, - javax.xml.validation, - javax.xml.xpath, org.apache.avalon.framework, org.apache.avalon.framework.activity, org.apache.avalon.framework.configuration, @@ -195,7 +185,6 @@ Export-Package: java_cup.runtime, org.apache.xml.serialize, org.apache.xml.utils, org.apache.xml.utils.res, - org.apache.xmlcommons, org.apache.xmlgraphics.fonts, org.apache.xmlgraphics.image, org.apache.xmlgraphics.image.codec.png, @@ -256,25 +245,7 @@ Export-Package: java_cup.runtime, org.mozilla.javascript.tools.jsc, org.mozilla.javascript.tools.shell, org.mozilla.javascript.xml, - org.mozilla.javascript.xmlimpl, - org.w3c.css.sac, - org.w3c.css.sac.helpers, - org.w3c.dom, - org.w3c.dom.bootstrap, - org.w3c.dom.css, - org.w3c.dom.events, - org.w3c.dom.html, - org.w3c.dom.ls, - org.w3c.dom.ranges, - org.w3c.dom.smil, - org.w3c.dom.stylesheets, - org.w3c.dom.svg, - org.w3c.dom.traversal, - org.w3c.dom.views, - org.w3c.dom.xpath, - org.xml.sax, - org.xml.sax.ext, - org.xml.sax.helpers + org.mozilla.javascript.xmlimpl Bundle-ClassPath: lib/batik-awt-util-1.8.jar, lib/batik-dom-1.8.jar, lib/batik-ext-1.8.jar, @@ -298,6 +269,33 @@ Bundle-ClassPath: lib/batik-awt-util-1.8.jar, lib/js.jar, lib/xalan-2.7.0.jar, lib/xerces_2_5_0.jar, - lib/xml-apis-1.3.04.jar, - lib/xml-apis-ext-1.3.04.jar, lib/fop-transcoder-allinone-svn-trunk.jar +Import-Package: javax.xml, + javax.xml.datatype, + javax.xml.namespace, + javax.xml.parsers, + javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.sax, + javax.xml.transform.stream, + javax.xml.validation, + javax.xml.xpath, + org.w3c.css.sac, + org.w3c.css.sac.helpers, + org.w3c.dom, + org.w3c.dom.bootstrap, + org.w3c.dom.css, + org.w3c.dom.events, + org.w3c.dom.html, + org.w3c.dom.ls, + org.w3c.dom.ranges, + org.w3c.dom.smil, + org.w3c.dom.stylesheets, + org.w3c.dom.svg, + org.w3c.dom.traversal, + org.w3c.dom.views, + org.w3c.dom.xpath, + org.xml.sax, + org.xml.sax.ext, + org.xml.sax.helpers, + org.apache.xmlcommons diff --git a/bundles/org.apache.batik/build.properties b/bundles/org.apache.batik/build.properties index 91aa3c77a..4dce108e6 100644 --- a/bundles/org.apache.batik/build.properties +++ b/bundles/org.apache.batik/build.properties @@ -25,6 +25,4 @@ bin.includes = META-INF/,\ lib/js.jar,\ lib/xalan-2.7.0.jar,\ lib/xerces_2_5_0.jar,\ - lib/xml-apis-1.3.04.jar,\ - lib/xml-apis-ext-1.3.04.jar,\ lib/fop-transcoder-allinone-svn-trunk.jar -- 2.43.2 From 0fef79ab46ef07e8f7af6ff211c2b884fc4b735d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Tue, 13 Sep 2016 16:49:01 +0300 Subject: [PATCH 15/16] Small SCL changes Removed error message from subsumption constraints that cannot be simplified away, because the simplification is not working correctly in certain standard cases. Removed Json2 from StandardLibrary Small efficiency fix in Prelude Check if the input block expression is empty in ExpressionEvalutor. Change-Id: I1b1843cb7847886618aea5063aff53fef35814cb --- .../compiler/internal/elaboration/subsumption/SubSolver.java | 2 +- .../src/org/simantics/scl/compiler/top/ExpressionEvaluator.java | 2 +- bundles/org.simantics.scl.runtime/scl/Prelude.scl | 2 +- bundles/org.simantics.scl.runtime/scl/StandardLibrary.scl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/subsumption/SubSolver.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/subsumption/SubSolver.java index 70adf524b..f9b5efc3b 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/subsumption/SubSolver.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/subsumption/SubSolver.java @@ -49,7 +49,7 @@ public class SubSolver { reduceChains(); propagateUpperBounds(); checkLowerBounds(); - errorFromUnsolvedEquations(); + //errorFromUnsolvedEquations(); //System.out.println("--"); //print(); } diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/top/ExpressionEvaluator.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/top/ExpressionEvaluator.java index 5c8f59bb2..39f0ac721 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/top/ExpressionEvaluator.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/top/ExpressionEvaluator.java @@ -182,7 +182,7 @@ public class ExpressionEvaluator { final Environment environment = runtimeEnvironment.getEnvironment(); // Parse expression - if(expressionText != null) { + if(expressionText != null && !expressionText.trim().isEmpty()) { try { switch(parseMode) { case BLOCK: { diff --git a/bundles/org.simantics.scl.runtime/scl/Prelude.scl b/bundles/org.simantics.scl.runtime/scl/Prelude.scl index b29b04a2f..84f8b91b6 100644 --- a/bundles/org.simantics.scl.runtime/scl/Prelude.scl +++ b/bundles/org.simantics.scl.runtime/scl/Prelude.scl @@ -1266,7 +1266,7 @@ instance MonadZero Maybe where mzero = Nothing instance MonadOr Maybe where - morelse (Just a) _ = Just a + morelse a@(Just _) _ = a morelse _ b = b "`execJust v f` executes the function `f` with parameter value `x`, if `v=Just x`. If `v=Nothing`, the function does nothing." diff --git a/bundles/org.simantics.scl.runtime/scl/StandardLibrary.scl b/bundles/org.simantics.scl.runtime/scl/StandardLibrary.scl index 6b43166e3..76ecece9c 100644 --- a/bundles/org.simantics.scl.runtime/scl/StandardLibrary.scl +++ b/bundles/org.simantics.scl.runtime/scl/StandardLibrary.scl @@ -15,7 +15,7 @@ include "MSet" as MSet include "MList" as MList include "MMultiMap" as MMultiMap include "Coercion" -include "Json2" +//include "Json2" include "IterN" as Extra -- 2.43.2 From 46a1aab05089b039b16eb3d7e340cd2744d679c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Tue, 13 Sep 2016 18:09:52 +0300 Subject: [PATCH 16/16] Added target-folders that Maven creates to .gitignore Change-Id: I1cb9ff5b0bee6cfd21f12e0a08d73dd3b989ac98 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0d0631b56..7d3880771 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /**/bin/ +/features/*/target/ +/bundles/*/target/ /**/.polyglot.build.properties -- 2.43.2